Merging from trunk r1619093:1620329 in the Java tree

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

1 files changed, 32 insertions, 2 deletions

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 cb0cc792e8..c00c4d10e3 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
@@ -26,7 +26,7 @@ define(["dojo/_base/xhr",
         "dojo/dom-construct",
         "dojo/dom-geometry",
         "dojo/dom-style",
-        "dojo/window",
+        "dojo/_base/window",
         "dojo/query",
         "dojo/parser",
         "dojo/store/Memory",
@@ -683,7 +683,37 @@ define(["dojo/_base/xhr",
                return new Memory({ data: typeData });
            }
 
-           var singleContextVarRegexp = "(\\${[\\w\\.\\-]+})";
+           util.setMultiSelectOptions = function(multiSelectWidget, options)
+           {
+               util.addMultiSelectOptions(multiSelectWidget, options, true);
+           }
+
+           util.addMultiSelectOptions = function(multiSelectWidget, options, clearExistingOptions)
+           {
+               if (clearExistingOptions)
+               {
+                   var children = multiSelectWidget.children;
+                   var initialLength = children.length;
+                   for (var i = initialLength - 1; i >= 0 ; i--)
+                   {
+                       var child = children.item(i);
+                       multiSelectWidget.removeChild(child);
+                   }
+               }
+               for (var i = 0; i < options.length; i++)
+               {
+                   // construct new option for list
+                   var newOption = win.doc.createElement('option');
+                   var value = options[i];
+                   newOption.innerHTML = value;
+                   newOption.value = value;
+
+                   // add new option to list
+                   multiSelectWidget.appendChild(newOption);
+               }
+           }
+
+           var singleContextVarRegexp = "(\\${[\\w+\\.\\-:]+})";
 
            util.numericOrContextVarRegexp = function(constraints)
            {