You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/05/24 16:08:57 UTC
svn commit: r1745375 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid:
common/ common/grid/ management/ management/accesscontrolprovider/
management/group/ management/logger/ management/logger/brokerlogger/memory/
ma...
Author: lquack
Date: Tue May 24 16:08:56 2016
New Revision: 1745375
URL: http://svn.apache.org/viewvc?rev=1745375&view=rev
Log:
QPID-7213: [Java Broker, WMC] Only transmit data for visible tab
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/CategoryTabExtension.js Tue May 24 16:08:56 2016
@@ -28,6 +28,7 @@ define(["qpid/common/util", "dojo/query"
this.management = params.management;
this.typeSpecificDetailsContainer = params.typeSpecificDetailsNode;
this.modelObj = params.modelObj;
+ this.contentPane = params.contentPane;
util.parse(params.containerNode, params.template, function ()
{
that.typeSpecificAttributesContainer =
@@ -55,6 +56,7 @@ define(["qpid/common/util", "dojo/query"
that.details = new Details({
containerNode: that.typeSpecificAttributesContainer,
typeSpecificDetailsNode: that.typeSpecificDetailsContainer,
+ contentPane: that.contentPane,
metadata: that.metadata,
data: data,
management: that.management,
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/grid/GridUpdater.js Tue May 24 16:08:56 2016
@@ -37,6 +37,7 @@ define(["dojo/_base/xhr",
function GridUpdater(args, store)
{
+ this.checkVisibilityFunc = args.hasOwnProperty("checkVisibilityFunc") ? args.checkVisibilityFunc : false;
this.updatable = args.hasOwnProperty("updatable") ? args.updatable : true;
this.serviceUrl = args.serviceUrl;
this.userPreferences = args.userPreferences;
@@ -248,7 +249,7 @@ define(["dojo/_base/xhr",
GridUpdater.prototype.update = function ()
{
- if (this.updatable)
+ if (this.updatable && (!this.checkVisibilityFunc || this.checkVisibilityFunc()))
{
this.performUpdate();
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/updater.js Tue May 24 16:08:56 2016
@@ -67,6 +67,13 @@ define([], function ()
return;
}
}
+ },
+
+ restartTimer: function()
+ {
+ clearInterval(timer);
+ invokeUpdates();
+ timer = setInterval(invokeUpdates, 1000 * updatePeriod);
}
};
-});
\ No newline at end of file
+});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js Tue May 24 16:08:56 2016
@@ -109,14 +109,11 @@ define(["dojo/parser",
function AccessControlProviderUpdater(aclTab)
{
- this.tabObject = aclTab;
var node = aclTab.contentPane.containerNode;
- var groupProviderObj = aclTab.modelObj;
- var controller = aclTab.controller;
-
- this.controller = controller;
- this.management = controller.management;
- this.modelObj = groupProviderObj;
+ this.contentPane = aclTab.contentPane;
+ this.controller = aclTab.controller;
+ this.management = this.controller.management;
+ this.modelObj = aclTab.modelObj;
this.name = query(".name", node)[0];
this.type = query(".type", node)[0];
this.state = query(".state", node)[0];
@@ -136,14 +133,14 @@ define(["dojo/parser",
require(["qpid/management/accesscontrolprovider/" + ui], function (SpecificProvider)
{
that.details = new SpecificProvider(query(".providerDetails",
- node)[0], groupProviderObj, controller, aclTab);
+ node)[0], that.modelObj, that.controller, aclTab);
});
}, function (error)
{
util.tabErrorHandler(error, {
updater: that,
- contentPane: that.tabObject.contentPane,
- tabContainer: that.tabObject.controller.tabContainer,
+ contentPane: that.contentPane,
+ tabContainer: that.controller.tabContainer,
name: that.modelObj.name,
category: "Access Control Provider"
});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js Tue May 24 16:08:56 2016
@@ -81,7 +81,7 @@ define(["dojo/parser",
.then(function (instances)
{
- var authProviderUpdater = new AuthProviderUpdater(contentPane.containerNode, that.modelObj, that.controller, that);
+ var authProviderUpdater = new AuthProviderUpdater(that);
that.authProviderUpdater = authProviderUpdater;
var editButtonNode = query(".editAuthenticationProviderButton", contentPane.containerNode)[0];
@@ -165,11 +165,13 @@ define(["dojo/parser",
}
};
- function AuthProviderUpdater(node, authProviderObj, controller, authenticationProvider)
+ function AuthProviderUpdater(authenticationProvider)
{
- this.controller = controller;
+ var node = authenticationProvider.contentPane.containerNode;
+ this.controller = authenticationProvider.controller;
this.management = management;
- this.modelObj = authProviderObj;
+ this.modelObj = authenticationProvider.modelObj;
+ this.contentPane = authenticationProvider.contentPane;
this.name = query(".name", node)[0];
this.type = query(".type", node)[0];
this.state = query(".state", node)[0];
@@ -220,6 +222,10 @@ define(["dojo/parser",
AuthProviderUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var that = this;
this.management.load(this.modelObj,
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Tue May 24 16:08:56 2016
@@ -113,8 +113,7 @@ define(["dojo/parser",
parser.parse(contentPane.containerNode)
.then(function (instances)
{
- that.brokerUpdater =
- new BrokerUpdater(contentPane.containerNode, that.modelObj, that.controller);
+ that.brokerUpdater = new BrokerUpdater(that);
var addProviderButton = query(".addAuthenticationProvider", contentPane.containerNode)[0];
connect.connect(registry.byNode(addProviderButton), "onClick", function (evt)
@@ -311,12 +310,14 @@ define(["dojo/parser",
updater.remove(this.brokerUpdater);
};
- function BrokerUpdater(node, brokerObj, controller)
+ function BrokerUpdater(brokerTab)
{
- this.controller = controller;
+ var node = brokerTab.contentPane.containerNode;
+ this.controller = brokerTab.controller;
+ this.brokerObj = brokerTab.modelObj;
+ this.contentPane = brokerTab.contentPane;
this.accessControlProvidersWarn = query(".broker-access-control-providers-warning", node)[0];
- this.management = controller.management;
- this.brokerObj = brokerObj;
+ this.management = this.controller.management;
var that = this;
var gridProperties = {
@@ -405,7 +406,7 @@ define(["dojo/parser",
var idx = evt.rowIndex, theItem = this.getItem(idx);
if (theItem.vhId)
{
- that.showVirtualHost(theItem, brokerObj);
+ that.showVirtualHost(theItem, that.brokerObj);
}
});
}, gridProperties, EnhancedGrid, true);
@@ -436,7 +437,7 @@ define(["dojo/parser",
var data = that.vhostsGrid.grid.selection.getSelected();
if (data.length == 1)
{
- that.showVirtualHost(data[0], brokerObj);
+ that.showVirtualHost(data[0], that.brokerObj);
that.vhostsGrid.grid.selection.clear();
}
});
@@ -447,7 +448,7 @@ define(["dojo/parser",
if (data.length == 1)
{
var item = data[0];
- that.controller.show("virtualhostnode", item.name, brokerObj, item.id);
+ that.controller.show("virtualhostnode", item.name, that.brokerObj, item.id);
that.vhostsGrid.grid.selection.clear();
}
});
@@ -589,7 +590,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("port", name, brokerObj, theItem.id);
+ that.controller.show("port", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
@@ -642,7 +643,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("authenticationprovider", name, brokerObj, theItem.id);
+ that.controller.show("authenticationprovider", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
@@ -669,7 +670,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("keystore", name, brokerObj, theItem.id);
+ that.controller.show("keystore", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
@@ -704,7 +705,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("truststore", name, brokerObj, theItem.id);
+ that.controller.show("truststore", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
this.groupProvidersGrid =
@@ -726,7 +727,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("groupprovider", name, brokerObj, theItem.id);
+ that.controller.show("groupprovider", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
this.accessControlProvidersGrid =
@@ -748,7 +749,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("accesscontrolprovider", name, brokerObj, theItem.id);
+ that.controller.show("accesscontrolprovider", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
@@ -786,7 +787,7 @@ define(["dojo/parser",
{
var idx = evt.rowIndex, theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem, "name");
- that.controller.show("brokerlogger", name, brokerObj, theItem.id);
+ that.controller.show("brokerlogger", name, that.brokerObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
this.update(function ()
@@ -872,6 +873,10 @@ define(["dojo/parser",
BrokerUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var that = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js Tue May 24 16:08:56 2016
@@ -107,6 +107,7 @@ define(["dojo/parser",
{
var that = this;
this.tabObject = connectionTab;
+ this.contentPane = connectionTab.contentPane;
this.management = connectionTab.controller.management;
this.modelObj = connectionTab.modelObj;
var containerNode = connectionTab.contentPane.containerNode;
@@ -222,6 +223,10 @@ define(["dojo/parser",
ConnectionUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var that = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js Tue May 24 16:08:56 2016
@@ -149,6 +149,7 @@ define(["dojo/_base/xhr",
this.tabObject = exchangeTab;
this.management = exchangeTab.controller.management;
this.modelObj = exchangeTab.modelObj;
+ this.contentPane = exchangeTab.contentPane;
var containerNode = exchangeTab.contentPane.containerNode;
function findNode(name)
@@ -230,6 +231,10 @@ define(["dojo/_base/xhr",
ExchangeUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var thisObj = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js Tue May 24 16:08:56 2016
@@ -83,7 +83,6 @@ define(["dojo/parser",
GroupProvider.prototype.onOpen = function ()
{
var that = this;
- var contentPane = this.contentPane;
this.groupProviderUpdater = new GroupProviderUpdater(this);
this.groupProviderUpdater.update(function ()
{
@@ -180,6 +179,7 @@ define(["dojo/parser",
function GroupProviderUpdater(groupProviderTab)
{
this.tabObject = groupProviderTab;
+ this.contentPane = groupProviderTab.contentPane;
var controller = groupProviderTab.controller;
var groupProviderObj = groupProviderTab.modelObj;
var node = groupProviderTab.contentPane.containerNode;
@@ -202,6 +202,11 @@ define(["dojo/parser",
GroupProviderUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
+
var that = this;
var management = this.controller.management;
management.load(this.modelObj, {excludeInheritedContext: true})
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js Tue May 24 16:08:56 2016
@@ -104,7 +104,8 @@ define(["dojo/dom",
this.keyStoreDetailsContainer = query(".typeFieldsContainer", containerNode)[0];
this.management = tabObject.controller.management;
this.modelObj = tabObject.modelObj;
- this.tabObject = tabObject
+ this.tabObject = tabObject;
+ this.contentPane = tabObject.contentPane;
function findNode(name)
{
return query("." + name, containerNode)[0];
@@ -130,6 +131,10 @@ define(["dojo/dom",
KeyStoreUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var that = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Logger.js Tue May 24 16:08:56 2016
@@ -214,6 +214,7 @@ define(["dojo/parser",
{
var domNode = logger.contentPane.containerNode;
this.tabObject = logger;
+ this.contentPane = logger.contentPane;
this.modelObj = logger.modelObj;
var that = this;
@@ -243,6 +244,11 @@ define(["dojo/parser",
Updater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
+
var that = this;
that.tabObject.management.load(this.modelObj,
{
@@ -286,6 +292,7 @@ define(["dojo/parser",
{
that.details = new Details({
containerNode: that.loggerAttributes,
+ contentPane: that.contentPane,
typeSpecificDetailsNode: that.loggerTypeSpecificDetails,
metadata: that.tabObject.management.metadata,
data: data,
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js Tue May 24 16:08:56 2016
@@ -22,14 +22,13 @@ define(["dojo/parser",
"dojo/query",
"dojo/_base/connect",
"qpid/common/properties",
- "qpid/common/updater",
"qpid/common/util",
"dijit/registry",
"dojo/_base/event",
"dojox/html/entities",
"dojo/text!showPlugin.html",
"dojo/domReady!"],
- function (parser, query, connect, properties, updater, util, registry, event, entities, template)
+ function (parser, query, connect, properties, util, registry, event, entities, template)
{
function Plugin(name, parent, controller)
@@ -57,21 +56,25 @@ define(["dojo/parser",
parser.parse(contentPane.containerNode)
.then(function (instances)
{
- that.pluginUpdater = new PluginUpdater(contentPane, that.modelObj, that.controller);
+ that.pluginUpdater = new PluginUpdater(that);
});
};
Plugin.prototype.close = function ()
{
- updater.remove(this.pluginUpdater);
+ if (this.pluginUpdater.details)
+ {
+ this.pluginUpdater.details.close();
+ }
};
- function PluginUpdater(contentPane, pluginObject, controller)
+ function PluginUpdater(tabObject)
{
- this.controller = controller;
- this.modelObj = pluginObject;
- this.management = controller.management;
- var node = contentPane.containerNode;
+ this.contentPane = tabObject.contentPane;
+ this.controller = tabObject.controller;
+ this.modelObj = tabObject.modelObj;
+ this.management = this.controller.management;
+ var node = this.contentPane.containerNode;
this.name = query(".name", node)[0];
this.type = query(".type", node)[0];
@@ -88,7 +91,7 @@ define(["dojo/parser",
.replace('-', '')], function (SpecificPlugin)
{
that.details =
- new SpecificPlugin(query(".pluginDetails", node)[0], pluginObject, controller, contentPane);
+ new SpecificPlugin(query(".pluginDetails", node)[0], that.modelObj, that.controller, that.contentPane);
});
}, util.xhrErrorHandler);
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js Tue May 24 16:08:56 2016
@@ -124,6 +124,7 @@ define(["dojo/dom",
{
var that = this;
this.tabObject = portTab;
+ this.contentPane = portTab.contentPane;
this.management = portTab.controller.management;
this.modelObj = portTab.modelObj;
var containerNode = portTab.contentPane.containerNode;
@@ -246,6 +247,10 @@ define(["dojo/dom",
PortUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var thisObj = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js Tue May 24 16:08:56 2016
@@ -219,10 +219,15 @@ define(["dojo/parser",
function PreferencesProviderUpdater(preferencesProvider)
{
this.preferencesProvider = preferencesProvider;
+ this.contentPane = preferencesProvider.contentPane;
};
PreferencesProviderUpdater.prototype.update = function ()
{
+ if (!this.contentPane.selected)
+ {
+ return;
+ }
this.preferencesProvider.reload();
};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Tue May 24 16:08:56 2016
@@ -347,6 +347,7 @@ define(["dojo/_base/declare",
this.management = tabObject.management;
this.modelObj = tabObject.modelObj;
this.tabObject = tabObject;
+ this.contentPane = tabObject.contentPane;
var containerNode = tabObject.contentPane.containerNode;
function findNode(name)
@@ -501,6 +502,10 @@ define(["dojo/_base/declare",
QueueUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var thisObj = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Tue May 24 16:08:56 2016
@@ -105,6 +105,7 @@ define(["dojo/dom",
this.management = tabObject.management;
this.modelObj = tabObject.modelObj;
this.tabObject = tabObject;
+ this.contentPane = tabObject.contentPane;
function findNode(name)
{
@@ -134,6 +135,11 @@ define(["dojo/dom",
KeyStoreUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
+
var that = this;
this.management.load(this.modelObj, {excludeInheritedContext: true})
.then(function (data)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Tue May 24 16:08:56 2016
@@ -229,6 +229,7 @@ define(["dojo/parser",
var node = virtualHost.contentPane.containerNode;
this.tabObject = virtualHost;
+ this.contentPane = virtualHost.contentPane;
this.management = controller.management;
this.modelObj = vhost;
var that = this;
@@ -445,6 +446,11 @@ define(["dojo/parser",
Updater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
+
var thisObj = this;
thisObj.connectionsGrid.refresh();
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js Tue May 24 16:08:56 2016
@@ -182,6 +182,7 @@ define(["dojo/parser",
{
var domNode = virtualHostNode.contentPane.containerNode;
this.tabObject = virtualHostNode;
+ this.contentPane = virtualHostNode.contentPane;
this.modelObj = virtualHostNode.modelObj;
var that = this;
@@ -204,6 +205,11 @@ define(["dojo/parser",
Updater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
+
var that = this;
that.tabObject.management.load(this.modelObj,
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Tue May 24 16:08:56 2016
@@ -99,6 +99,7 @@ define(["dojo/_base/xhr",
function AclFileUpdater(node, tabObject)
{
this.tabObject = tabObject;
+ this.contentPane = tabObject.contentPane;
var aclProviderObj = tabObject.modelObj;
var controller = tabObject.controller;
this.controller = controller;
@@ -112,6 +113,11 @@ define(["dojo/_base/xhr",
AclFileUpdater.prototype.update = function ()
{
+ if (!this.contentPane.selected)
+ {
+ return;
+ }
+
var that = this;
this.management.load(this.modelObj, {excludeInheritedContext: true})
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js Tue May 24 16:08:56 2016
@@ -23,6 +23,7 @@ define(["dojo/dom",
"dijit/layout/ContentPane",
"dijit/form/CheckBox",
"dojox/html/entities",
+ "qpid/common/updater",
"qpid/management/Broker",
"qpid/management/VirtualHost",
"qpid/management/Exchange",
@@ -48,6 +49,7 @@ define(["dojo/dom",
ContentPane,
CheckBox,
entities,
+ updater,
Broker,
VirtualHost,
Exchange,
@@ -90,11 +92,12 @@ define(["dojo/dom",
queryTab: QueryTab
};
- var tabDiv = dom.byId("managedViews");
-
ready(function ()
{
controller.tabContainer = registry.byId("managedViews");
+ controller.tabContainer.watch("selectedChildWidget", function(name, oval, nval){
+ updater.restartTimer();
+ });
});
controller.viewedObjects = {};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js Tue May 24 16:08:56 2016
@@ -133,6 +133,7 @@ define(["dojo/parser",
function GroupUpdater(tabObject)
{
this.tabObject = tabObject;
+ this.contentPane = tabObject.contentPane;
this.management = tabObject.controller.management;
this.modelObj = {
type: "groupmember",
@@ -192,6 +193,10 @@ define(["dojo/parser",
GroupUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
var that = this;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/LogViewer.js Tue May 24 16:08:56 2016
@@ -41,7 +41,7 @@ define(["dojo/_base/xhr",
return data;
}
- function LogViewer(loggerModelObj, management, containerNode)
+ function LogViewer(loggerModelObj, management, containerNode, contentPane)
{
var that = this;
this.management = management;
@@ -52,6 +52,7 @@ define(["dojo/_base/xhr",
};
this.lastLogId = 0;
this.containerNode = containerNode;
+ this.contentPane = contentPane;
containerNode.innerHTML = template;
parser.parse(containerNode)
.then(function (instances)
@@ -134,6 +135,7 @@ define(["dojo/_base/xhr",
var updater = new GridUpdater({
userPreferences: userPreferences,
updatable: false,
+ checkVisibilityFunc: function() {return that.contentPane.selected;},
serviceUrl: function ()
{
return that.management.buildObjectURL(that.modelObj, {lastLogId: that.lastLogId});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js Tue May 24 16:08:56 2016
@@ -28,7 +28,7 @@ define(["qpid/common/util",
{
function BrokerMemoryLogger(params)
{
- this.logViewer = new LogViewer(params.modelObj, params.management, params.typeSpecificDetailsNode);
+ this.logViewer = new LogViewer(params.modelObj, params.management, params.typeSpecificDetailsNode, params.contentPane);
TypeTabExtension.call(this,
params.containerNode,
template,
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1745375&r1=1745374&r2=1745375&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Tue May 24 16:08:56 2016
@@ -55,22 +55,25 @@ define(["dojo/dom",
function ManagementHttp(containerNode, pluginObject, controller, contentPane)
{
- var node = construct.create("div", null, containerNode, "last");
var that = this;
+ this.node = construct.create("div", null, containerNode, "last");
this.name = pluginObject.name;
+ this.contentPane = contentPane;
+ this.pluginObject = pluginObject;
this.modelObj = pluginObject;
+ this.controller = controller;
this.management = controller.management;
- node.innerHTML = template;
- parser.parse(node)
+ this.node.innerHTML = template;
+ parser.parse(this.node)
.then(function (instances)
{
- that.managementHttpUpdater = new ManagementHttpUpdater(node, pluginObject, controller, contentPane);
+ that.managementHttpUpdater = new ManagementHttpUpdater(that);
that.managementHttpUpdater.update(function ()
{
updater.add(that.managementHttpUpdater)
});
- var editButton = query(".editPluginButton", node)[0];
+ var editButton = query(".editPluginButton", that.node)[0];
connect.connect(registry.byNode(editButton), "onClick", function (evt)
{
that.edit();
@@ -88,23 +91,29 @@ define(["dojo/dom",
editor.show(this.management, this.modelObj, this.managementHttpUpdater.pluginData);
};
- function ManagementHttpUpdater(node, pluginObject, controller, contentPane)
+ function ManagementHttpUpdater(tabObject)
{
- this.contentPane = contentPane;
- this.controller = controller;
- this.modelObj = pluginObject;
- this.name = pluginObject.name;
+ var node = tabObject.node;
+ this.contentPane = tabObject.contentPane;
+ this.controller = tabObject.controller;
+ this.modelObj = tabObject.pluginObject;
+ this.name = tabObject.pluginObject.name;
this.httpBasicAuthenticationEnabled = query(".httpBasicAuthenticationEnabled", node)[0];
this.httpsBasicAuthenticationEnabled = query(".httpsBasicAuthenticationEnabled", node)[0];
this.sessionTimeout = query(".sessionTimeout", node)[0];
this.httpsSaslAuthenticationEnabled = query(".httpsSaslAuthenticationEnabled", node)[0];
this.httpSaslAuthenticationEnabled = query(".httpSaslAuthenticationEnabled", node)[0];
this.compressResponses = query(".compressResponses", node)[0];
- this.management = controller.management;
+ this.management = this.controller.management;
}
ManagementHttpUpdater.prototype.update = function (callback)
{
+ if (!this.contentPane.selected && !callback)
+ {
+ return;
+ }
+
var that = this;
function showBoolean(val)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org