QPID-5413: Add functionality to close the deleted tab of virtual host node.

           Display user friendly values for BDB HA VHN priority and quorum override
           Fix tree view

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

5 files changed, 23 insertions, 10 deletions

diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js
index d72b41d0c4..5272e76e4c 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js
@@ -29,8 +29,10 @@ define(["dojo/_base/xhr",
         "dojo/domReady!"],
   function (xhr, lang, connect, parser, json, entities, query, json)
   {
-    function DerbyNode(containerNode)
+    function DerbyNode(data)
     {
+      var containerNode = data.containerNode;
+      this.parent = data.parent;
       var that = this;
       xhr.get({url: "virtualhostnode/derby/show.html",
         sync: true,
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
index 20637da6c2..eb58b3e7c7 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
@@ -31,8 +31,10 @@ define(["dojo/_base/xhr",
   {
     var fieldNames = ["connectionUrl", "bigIntType", "varBinaryType", "blobType", "bytesForBlob", "connectionPoolType"];
 
-    function JdbcNode(containerNode)
+    function JdbcNode(data)
     {
+      var containerNode = data.containerNode;
+      this.parent = data.parent;
       var that = this;
       xhr.get({url: "virtualhostnode/jdbc/show.html",
         sync: true,
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
index e2cd763fba..b608663512 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
@@ -57,7 +57,7 @@ define(["dojo/_base/xhr",
                             contentPane.containerNode.innerHTML = data;
                             parser.parse(contentPane.containerNode);
 
-                            that.vhostNodeUpdater = new Updater(contentPane.containerNode, that.modelObj, that.controller);
+                            that.vhostNodeUpdater = new Updater(contentPane.containerNode, that.modelObj, that);
                             that.vhostNodeUpdater.update();
 
                             updater.add( that.vhostNodeUpdater );
@@ -70,13 +70,22 @@ define(["dojo/_base/xhr",
                updater.remove( this.vhostNodeUpdater );
            };
 
-           function Updater(node, vhost, controller)
+           VirtualHostNode.prototype.destroy = function()
            {
+             this.close();
+             this.contentPane.onClose()
+             this.controller.tabContainer.removeChild(this.contentPane);
+             this.contentPane.destroyRecursive();
+           }
+
+           function Updater(domNode, nodeObject, virtualHostNode)
+           {
+               this.virtualHostNode = virtualHostNode;
                var that = this;
 
                function findNode(name)
                {
-                   return query("." + name, node)[0];
+                   return query("." + name, domNode)[0];
                }
 
                function storeNodes(names)
@@ -90,7 +99,7 @@ define(["dojo/_base/xhr",
                storeNodes(["name", "state", "type", "messageStoreProviderYes","messageStoreProviderNo"]);
                this.detailsDiv = findNode("virtualhostnodedetails");
 
-               this.query = "api/latest/virtualhostnode/" + encodeURIComponent(vhost.name);
+               this.query = "api/latest/virtualhostnode/" + encodeURIComponent(nodeObject.name);
           }
 
            Updater.prototype.update = function()
@@ -117,7 +126,7 @@ define(["dojo/_base/xhr",
                require(["qpid/management/virtualhostnode/" + data.type.toLowerCase() + "/show"],
                  function(VirtualHostNodeDetails)
                  {
-                   that.details = new VirtualHostNodeDetails(that.detailsDiv);
+                   that.details = new VirtualHostNodeDetails({containerNode:that.detailsDiv, parent: that.virtualHostNode});
                    that.details.update(data);
                  }
                );
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
index 3b65ffaacf..06faf3c9da 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
@@ -229,8 +229,6 @@ define(["dojo/_base/xhr",
                        details[ type ] = object.name;
                        details.parent = parent;
                    } else {
-                       details[ type ] = object.name;
-
                        var parentObject ={
                                type: type,
                                name: object.name
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/show.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/show.js
index e912cf2fb0..bbff43c706 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/show.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/show.js
@@ -29,8 +29,10 @@ define(["dojo/_base/xhr",
         "dojo/domReady!"],
   function (xhr, lang, connect, parser, json, entities, query, json)
   {
-    function JsonNode(containerNode)
+    function JsonNode(data)
     {
+      var containerNode = data.containerNode;
+      this.parent = data.parent;
       var that = this;
       xhr.get({url: "virtualhostnode/json/show.html",
         sync: true,