QPID-6220: [Java Broker] BDB HA VH edit dialogue - ensure master/replica synch policy displayed reflects that that is in force

* Add missing tooltips too

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1637550 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 41 insertions, 14 deletions

diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
index 3a3107b01a..a8b68a0c16 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
@@ -19,11 +19,10 @@
 define(["qpid/common/util", "dijit/registry", "dojo/domReady!"],
    function (util, registry)
    {
-       var fieldNames = ["storeUnderfullSize", "storeOverfullSize", "storePath"];
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", fieldNames, data.data);
+              util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null);
 
               registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
               registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
index 8da0bafd06..771d29601e 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
@@ -572,11 +572,16 @@ define(["dojo/_base/xhr",
 
            util.applyMetadataToWidgets = function(domRoot, category, type)
            {
+             this.applyToWidgets(domRoot, category, type, null);
+           }
+
+           util.applyToWidgets = function(domRoot, category, type, data)
+           {
              var widgets = util.findAllWidgets(domRoot);
              array.forEach(widgets,
                function (widget)
                {
-                 widgetconfigurer.config(widget, category, type);
+                 widgetconfigurer.config(widget, category, type, data);
                });
            }
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js
index 2eb0a9b808..af8f1fc2fb 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js
@@ -95,26 +95,49 @@ define(["dojo/_base/xhr",
          }
        }
      },
-     _processWidgetValue: function (widget, category, type)
+     _processWidgetValue: function (widget, category, type, data)
      {
        var widgetName = widget.name;
 
-       if (widgetName && (widget instanceof dijit.form.FilteringSelect || widget instanceof dojox.form.CheckedMultiSelect))
+       if (widgetName)
        {
-           if (!widget.get("value"))
+         var defaultValue = metadata.getDefaultValueForAttribute(category, type, widgetName);
+         var dataValue = data && widgetName in data ? data[widgetName] : null;
+
+         // Stash the default value and initial value so we can later differentiate
+         // when sending updates to the server
+
+         if (defaultValue)
+         {
+           widget.defaultValue = defaultValue;
+         }
+
+         if (dataValue)
+         {
+           widget.initialValue = dataValue;
+         }
+
+         if (widget instanceof dijit.form.FilteringSelect || widget instanceof dojox.form.CheckedMultiSelect)
+         {
+           var widgetValue = dataValue ? dataValue : defaultValue;
+           if (widgetValue)
            {
-               var defaultValue = metadata.getDefaultValueForAttribute(category, type, widgetName);
-               if (defaultValue)
-               {
-                   widget.set("value", defaultValue);
-               }
+             widget.set("value", widgetValue);
+           }
+         }
+         else
+         {
+           if (dataValue)
+           {
+             widget.set("value", dataValue);
            }
+         }
        }
      },
-     config: function (widget, category, type)
+     config: function (widget, category, type, data)
      {
          this._processWidgetPrompt(widget, category, type);
-         this._processWidgetValue(widget, category, type);
+         this._processWidgetValue(widget, category, type, data);
      }
    };
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
index 5fca2d5523..849fd9378c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
@@ -191,7 +191,7 @@ define(["dojo/_base/xhr",
                     TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData});
                     that.form.connectChildren();
 
-                    util.applyMetadataToWidgets(that.allFieldsContainer, "VirtualHost", actualData.type);
+                    util.applyToWidgets(that.allFieldsContainer, "VirtualHost", actualData.type, actualData);
                 }
                 catch(e)
                 {