Merge pull request #35 from isuruwan/master

wsdl compare minor fixes
wso2 · Mar 10, 2015 · ffe2f8f · ffe2f8f
2 parents dd0486a + 34c3787
commit ffe2f8f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/...governance.wsdltool.ui/src/main/resources/web/resourcecompare/js/resource_compare_util.js b/...governance.wsdltool.ui/src/main/resources/web/resourcecompare/js/resource_compare_util.js
@@ -29,7 +29,7 @@ function navigateToResourceDiffVisualizer(resourcePath1, resourcePath2, type) {
     sessionAwareFunction(function () {
         window.onload = function () {
             var dialog = $('dialog');
-            dialog.innerHTML = "<iframe frameborder='0' scrolling='no' width='1025px' height='650px' " +
+            dialog.innerHTML = "<iframe frameborder='0' scrolling='no' width='1025px' height='610px' " +
                 "src='resource_diff_visualizer_ajaxprocessor.jsp?resourcePath1=" + resourcePath1 +
                 "&resourcePath2=" + resourcePath2 + "&type=" + type + "'></iframe>";
         }

diff --git a/...rbon.governance.wsdltool.ui/src/main/resources/web/resourcecompare/regResourceCompare.jsp b/...rbon.governance.wsdltool.ui/src/main/resources/web/resourcecompare/regResourceCompare.jsp
@@ -106,12 +106,21 @@
 
             // Get registry full path for resources
             String resource1FullPath = "/_system/governance/trunk" + resource1Path;
-            String resource2FullPath = "/_system/governance/trunk" + resource2Path;
+            String resource2FullPath = "/_system/governance/trunk" + resource2Path; %>
+            <script type="text/javascript">
+            var resourcePath1 = '/_system/governance/trunk<%=resource1Path%>';
+            var resourcePath2 = '/_system/governance/trunk<%=resource2Path%>';
+            var resourceType = '<%=type%>';
+            // Get code-mirror diff view
+            visualizeResourceDiff(resourcePath1, resourcePath2, resourceType);
+            </script>
+    <%
             // Get membrane diff keys
         try {
-            membraneDiffsKeys = client.getMembraneDiffArrayResult(resource1FullPath, resource2FullPath, "key");
+            // un-comment these when enabling membrane
+            //membraneDiffsKeys = client.getMembraneDiffArrayResult(resource1FullPath, resource2FullPath, "key");
             // Get membrane diff values
-            membraneDiffsVals = client.getMembraneDiffArrayResult(resource1FullPath, resource2FullPath, "value");
+            //membraneDiffsVals = client.getMembraneDiffArrayResult(resource1FullPath, resource2FullPath, "value");
         } catch (Exception e) {
                 String cause;
                 if (e.getCause() != null) {
@@ -244,7 +253,7 @@
     <!--Start WSDL compare result div -->
             <div id="resourceContent" align="center">
                 <br><br>
-                <div align="left"><h2><%=lblDiffHeading%></h2></div>
+                <!--<div align="left"><h2><%=lblDiffHeading%></h2></div>-->
                 <br>
                 <table id="resourceOptionsTable" class="styledInner" cellspacing="0" width="80%">
                     <% for (int i = 0; i < membraneDiffsKeys.length; i++) { %>