[esb-java-dev] svn commit r10611 - trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators

[svn at wso2.org]

Author: indika
Date: Thu Dec  6 02:06:51 2007
New Revision: 10611

Log:

fixed ESB-JAVA 324


Modified:
   trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
   trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js

Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js	(original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js	Thu Dec  6 02:06:51 2007
@@ -28,6 +28,20 @@
 var namespaces = new Array();
 var needthforprop = true;
 var state = 1
+var existpropertynames = new Array();
+
+function addpropertyname(name) {
+    existpropertynames[existpropertynames.length] = name;
+}
+
+function containspropertyname(name) {
+    for (var i = 0; i < existpropertynames.length; i++) {
+        if (existpropertynames[i] != null && existpropertynames[i].toString() == name.toString()) {
+            return true;
+        }
+    }
+    return false;
+}
 function addnamespace(position, namespase) {
     var found = false;
     if (namespaces.length > 0) {
@@ -235,6 +249,7 @@
     resultindexes = new Array();
     namespaces = new Array();
     needthforprop = true;
+    existpropertynames = new Array();
 }
 function initdbmediator(mediator) {
     resetstatesofdbmediator();
@@ -1229,6 +1244,13 @@
                 if (tbody[0].childNodes[i].getAttribute("id") == id) {
                     found = true;
                     var name = tbody[0].childNodes[i].childNodes[0].childNodes[0].value;
+                    if (containspropertyname(name)) {
+                        tbody[0].childNodes[i].childNodes[0].childNodes[0].options.selectedIndex = 0;
+                        esbwarning("The property with a name ' " + name + " ' has already been" +
+                                   "defined. Adding the same property twice isn't allowed.", TYPE_INFO);
+                        return;
+                    }
+                    addpropertyname(name);
                     var oldchild = tbody[0].childNodes[i].childNodes[1];
                     if (name == "autocommit" || name == "poolstatements" || name == "testonborrow" || name == "testonreturn"
                         || name == "testwhileidle") {
@@ -1261,6 +1283,13 @@
             for (var i = 0; i < propertys.childNodes.length; i++) {
                 if (propertys.childNodes[i].getAttribute("id") == id) {
                     var name = propertys.childNodes[i].childNodes[0].childNodes[0].value;
+                    if (containspropertyname(name)) {
+                        propertys.childNodes[i].childNodes[0].childNodes[0].options.selectedIndex = 0;
+                        esbwarning("The property with a name ' " + name + " ' has already been "
+                            + "defined. Adding the same property twice isn't allowed.", TYPE_INFO);
+                        return;
+                    }
+                    addpropertyname(name);
                     var oldchild = propertys.childNodes[i].childNodes[1];
                     if (name == "autocommit" || name == "poolstatements" || name == "testonborrow" || name == "testonreturn"
                         || name == "testwhileidle") {

Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js	(original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js	Thu Dec  6 02:06:51 2007
@@ -28,6 +28,20 @@
 var namespaces = new Array();
 var needthforprop = true;
 var state = 1;
+var existpropertynamesdbr = new Array();
+
+function addpropertynamedbr(name) {
+    existpropertynamesdbr[existpropertynamesdbr.length] = name;
+}
+
+function containspropertynamedbr(name) {
+    for (var i = 0; i < existpropertynamesdbr.length; i++) {
+        if (existpropertynamesdbr[i] != null && existpropertynamesdbr[i].toString() == name.toString()) {
+            return true;
+        }
+    }
+    return false;
+}
 function addnamespacedbr(position, namespase) {
     var found = false;
     if (namespaces.length > 0) {
@@ -219,6 +233,7 @@
     resultindexes = new Array();
     namespaces = new Array();
     needthforprop = true;
+    existpropertynamesdbr = new Array();
 }
 initedit["dbreport"] = function initdbreportedit(mediator) {
     initdbreportmediator(mediator);
@@ -1222,6 +1237,13 @@
                 if (tbody[0].childNodes[i].getAttribute("id") == id) {
                     found = true;
                     var name = tbody[0].childNodes[i].childNodes[0].childNodes[0].value;
+                    if (containspropertynamedbr(name)) {
+                        tbody[0].childNodes[i].childNodes[0].childNodes[0].options.selectedIndex = 0;
+                        esbwarning("The property with a name ' " + name + " ' has already been" +
+                                   "defined. Adding the same property twice isn't allowed.", TYPE_INFO);
+                        return;
+                    }
+                    addpropertynamedbr(name);
                     var oldchild = tbody[0].childNodes[i].childNodes[1];
                     if (name == "autocommit" || name == "poolstatements" || name == "testonborrow" || name == "testonreturn"
                         || name == "testwhileidle") {
@@ -1254,6 +1276,13 @@
             for (var i = 0; i < propertys.childNodes.length; i++) {
                 if (propertys.childNodes[i].getAttribute("id") == id) {
                     var name = propertys.childNodes[i].childNodes[0].childNodes[0].value;
+                    if (containspropertynamedbr(name)) {
+                        propertys.childNodes[i].childNodes[0].childNodes[0].options.selectedIndex = 0;
+                        esbwarning("The property with a name ' " + name + " ' has already been "
+                            + "defined. Adding the same property twice isn't allowed.", TYPE_INFO);
+                        return;
+                    }
+                    addpropertynamedbr(name);
                     var oldchild = propertys.childNodes[i].childNodes[1];
                     if (name == "autocommit" || name == "poolstatements" || name == "testonborrow" || name == "testonreturn"
                         || name == "testwhileidle") {