QPID-6034: [Java Broker] Refactor Port UI feedback changes from code review

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

4 files changed, 27 insertions, 29 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index 56d50dc7a6..81a21cf736 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -543,8 +543,7 @@ define(["dojo/_base/xhr",
                                                             var idx = evt.rowIndex,
                                                                 theItem = this.getItem(idx);
                                                             var name = obj.dataStore.getValue(theItem,"name");
-                                                            var type = obj.dataStore.getValue(theItem,"type");
-                                                            that.controller.show("port", name, brokerObj, theItem.id, type);
+                                                            that.controller.show("port", name, brokerObj, theItem.id);
                                                         });
                                                 }, gridProperties, EnhancedGrid);
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
index b7e68a0201..54391c78f6 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
@@ -34,10 +34,9 @@ define(["dojo/dom",
         "dojo/domReady!"],
        function (dom, xhr, parser, query, connect, registry, entities, properties, updater, util, formatter, addPort, metadata) {
 
-           function Port(name, parent, controller, type) {
+           function Port(name, parent, controller) {
                this.name = name;
                this.controller = controller;
-               this.type = type;
                this.modelObj = { type: "port", name: name, parent: parent};
            }
 
@@ -106,7 +105,7 @@ define(["dojo/dom",
                .then(function(data)
                      {
                          var brokerData= data[0];
-                         addPort.show(that.name, that.type, brokerData.authenticationproviders, brokerData.keystores, brokerData.truststores);
+                         addPort.show(that.name, that.portUpdater.portData.type, brokerData.authenticationproviders, brokerData.keystores, brokerData.truststores);
                      }
                );
            }
@@ -149,7 +148,7 @@ define(["dojo/dom",
 
                xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data)
                                {
-                                  that.keyStoreData = data[0];
+                                  that.portData = data[0];
                                   that.updateHeader();
                                });
 
@@ -169,20 +168,20 @@ define(["dojo/dom",
                    return data + "</div>";
                }
 
-              this.nameValue.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
-              this.stateValue.innerHTML = entities.encode(String(this.keyStoreData[ "state" ]));
-              this.typeValue.innerHTML = entities.encode(String(this.keyStoreData[ "type" ]));
-              this.portValue.innerHTML = entities.encode(String(this.keyStoreData[ "port" ]));
-              this.authenticationProviderValue.innerHTML = this.keyStoreData[ "authenticationProvider" ] ? entities.encode(String(this.keyStoreData[ "authenticationProvider" ])) : "";
-              this.protocolsValue.innerHTML = printArray( "protocols", this.keyStoreData);
-              this.transportsValue.innerHTML = printArray( "transports", this.keyStoreData);
-              this.bindingAddressValue.innerHTML = this.keyStoreData[ "bindingAddress" ] ? entities.encode(String(this.keyStoreData[ "bindingAddress" ])) : "" ;
-              this.keyStoreValue.innerHTML = this.keyStoreData[ "keyStore" ] ? entities.encode(String(this.keyStoreData[ "keyStore" ])) : "";
-              this.needClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.keyStoreData[ "needClientAuth" ] ? "checked='checked'": "")+" />" ;
-              this.wantClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.keyStoreData[ "wantClientAuth" ] ? "checked='checked'": "")+" />" ;
-              this.trustStoresValue.innerHTML = printArray( "trustStores", this.keyStoreData);
-
-              var typeMetaData = metadata.getMetaData("Port", this.keyStoreData["type"]);
+              this.nameValue.innerHTML = entities.encode(String(this.portData[ "name" ]));
+              this.stateValue.innerHTML = entities.encode(String(this.portData[ "state" ]));
+              this.typeValue.innerHTML = entities.encode(String(this.portData[ "type" ]));
+              this.portValue.innerHTML = entities.encode(String(this.portData[ "port" ]));
+              this.authenticationProviderValue.innerHTML = this.portData[ "authenticationProvider" ] ? entities.encode(String(this.portData[ "authenticationProvider" ])) : "";
+              this.protocolsValue.innerHTML = printArray( "protocols", this.portData);
+              this.transportsValue.innerHTML = printArray( "transports", this.portData);
+              this.bindingAddressValue.innerHTML = this.portData[ "bindingAddress" ] ? entities.encode(String(this.portData[ "bindingAddress" ])) : "" ;
+              this.keyStoreValue.innerHTML = this.portData[ "keyStore" ] ? entities.encode(String(this.portData[ "keyStore" ])) : "";
+              this.needClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.portData[ "needClientAuth" ] ? "checked='checked'": "")+" />" ;
+              this.wantClientAuthValue.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.portData[ "wantClientAuth" ] ? "checked='checked'": "")+" />" ;
+              this.trustStoresValue.innerHTML = printArray( "trustStores", this.portData);
+
+              var typeMetaData = metadata.getMetaData("Port", this.portData["type"]);
 
               this.bindingAddress.style.display = "bindingAddress" in typeMetaData.attributes ? "block" : "none";
               this.keyStore.style.display = "keyStore" in typeMetaData.attributes ? "block" : "none";
@@ -198,7 +197,7 @@ define(["dojo/dom",
 
               xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data)
                    {
-                      thisObj.keyStoreData = data[0];
+                      thisObj.portData = data[0];
                       thisObj.updateHeader();
                    });
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
index e3b861d2ea..8a862693cf 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
@@ -329,14 +329,14 @@ define(["dojo/_base/xhr",
                 truststoreWidget.startup();
             }
 
-            if (portName)
+            // Editing existing port, de-register existing on change handler if set
+            if (this.typeChangeHandler)
             {
-                // Editing existing port, de-register existing on change handler if set
-                if (this.typeChangeHandler)
-                {
-                    this.typeChangeHandler.remove();
-                }
+                this.typeChangeHandler.remove();
+            }
 
+            if (portName)
+            {
                 editWarning.style.display = "block";
 
                 xhr.get({
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
index b4c34ab2e8..4b8e9db4b0 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
@@ -63,7 +63,7 @@ define(["dojo/dom",
 
            controller.viewedObjects = {};
 
-           controller.show = function(objType, name, parent, objectId, type) {
+           controller.show = function(objType, name, parent, objectId) {
 
                function generateName(obj)
                {
@@ -87,7 +87,7 @@ define(["dojo/dom",
                } else {
                    var Constructor = constructors[ objType ];
                    if(Constructor) {
-                       obj = new Constructor(name, parent, this, type);
+                       obj = new Constructor(name, parent, this);
                        obj.tabData = {
                            objectId: objectId,
                            objectType: objType