[rhmessaging-commits] rhmessaging commits: r1840 - mgmt/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Fri Apr 4 12:48:11 EDT 2008
Author: justi9
Date: 2008-04-04 12:48:11 -0400 (Fri, 04 Apr 2008)
New Revision: 1840
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/brokercluster.py
mgmt/cumin/python/cumin/brokergroup.py
mgmt/cumin/python/cumin/brokerprofile.py
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/system.py
mgmt/cumin/python/cumin/virtualhost.py
mgmt/cumin/python/cumin/widgets.py
Log:
Clean up frame's handling of attributes
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/broker.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -168,59 +168,58 @@
def __init__(self, app, name):
super(BrokerFrame, self).__init__(app, name)
- self.param = BrokerParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = BrokerParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = BrokerView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = BrokerView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
- self.edit = BrokerEdit(app, "edit")
- self.add_mode(self.edit)
- self.set_edit_mode(self.edit)
+ edit = BrokerEdit(app, "edit")
+ self.add_mode(edit)
+ self.set_edit_mode(edit)
- self.remove = BrokerRemove(app, "remove")
- self.add_mode(self.remove)
- self.set_remove_mode(self.remove)
+ remove = BrokerRemove(app, "remove")
+ self.add_mode(remove)
+ self.set_remove_mode(remove)
- self.queue = QueueFrame(app, "queue")
- self.add_mode(self.queue)
+ self.__queue = QueueFrame(app, "queue")
+ self.add_mode(self.__queue)
- self.queues_purge = QueueSetPurge(app, "queuespurge")
- self.add_mode(self.queues_purge)
+ self.__queues_purge = QueueSetPurge(app, "queuespurge")
+ self.add_mode(self.__queues_purge)
- self.exchange = ExchangeFrame(app, "exchange")
- self.add_mode(self.exchange)
+ self.__exchange = ExchangeFrame(app, "exchange")
+ self.add_mode(self.__exchange)
- self.client = ClientFrame(app, "client")
- self.add_mode(self.client)
+ self.__client = ClientFrame(app, "client")
+ self.add_mode(self.__client)
- self.clients_close = ClientSetClose(app, "clientsclose")
- self.add_mode(self.clients_close)
+ self.__clients_close = ClientSetClose(app, "clientsclose")
+ self.add_mode(self.__clients_close)
def show_queue(self, session, queue):
- self.queue.set_object(session, queue)
- self.page.set_current_frame(session, self.queue)
- return self.show_mode(session, self.queue)
+ self.__queue.set_object(session, queue)
+ self.page.set_current_frame(session, self.__queue)
+ return self.show_mode(session, self.__queue)
def show_queues_purge(self, session):
- self.page.set_current_frame(session, self.queues_purge)
- return self.show_mode(session, self.queues_purge)
+ self.page.set_current_frame(session, self.__queues_purge)
+ return self.show_mode(session, self.__queues_purge)
def show_exchange(self, session, exchange):
- self.exchange.set_object(session, exchange)
- self.page.set_current_frame(session, self.exchange)
- return self.show_mode(session, self.exchange)
+ self.__exchange.set_object(session, exchange)
+ self.page.set_current_frame(session, self.__exchange)
+ return self.show_mode(session, self.__exchange)
def show_client(self, session, client):
- self.client.set_object(session, client)
- self.page.set_current_frame(session, self.client)
- return self.show_mode(session, self.client)
+ self.__client.set_object(session, client)
+ self.page.set_current_frame(session, self.__client)
+ return self.show_mode(session, self.__client)
def show_clients_close(self, session):
- self.page.set_current_frame(session, self.clients_close)
- return self.show_mode(session, self.clients_close)
+ self.page.set_current_frame(session, self.__clients_close)
+ return self.show_mode(session, self.__clients_close)
def render_title(self, session, broker):
return "Broker '%s'" % broker.name
@@ -656,7 +655,7 @@
def init(self):
super(BrokerEdit, self).init()
- self.broker_name.set_object_attr(self.frame.get_object_parameter())
+ self.broker_name.set_object_attr(self.frame.object)
def get_args(self, session):
return self.frame.get_args(session)
Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/brokercluster.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -44,21 +44,20 @@
def __init__(self, app, name):
super(BrokerClusterFrame, self).__init__(app, name)
- self.param = BrokerClusterParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = BrokerClusterParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = BrokerClusterView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = BrokerClusterView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
- self.edit = BrokerClusterEdit(app, "edit")
- self.add_mode(self.edit)
- self.set_edit_mode(self.edit)
+ edit = BrokerClusterEdit(app, "edit")
+ self.add_mode(edit)
+ self.set_edit_mode(edit)
- self.remove = BrokerClusterRemove(app, "remove")
- self.add_mode(self.remove)
- self.set_remove_mode(self.remove)
+ remove = BrokerClusterRemove(app, "remove")
+ self.add_mode(remove)
+ self.set_remove_mode(remove)
self.broker = BrokerFrame(app, "broker")
self.add_mode(self.broker)
Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/brokergroup.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -75,9 +75,8 @@
def __init__(self, app, name):
super(BrokerGroupFrame, self).__init__(app, name)
- param = BrokerGroupParameter(app, "id")
- self.add_parameter(param)
- self.set_object_parameter(param)
+ self.object = BrokerGroupParameter(app, "id")
+ self.add_parameter(self.object)
view = BrokerGroupView(app, "view")
self.add_child(view)
@@ -154,7 +153,7 @@
def init(self):
super(BrokerGroupForm, self).init()
- self.group_name.set_object_attr(self.frame.get_object_parameter())
+ self.group_name.set_object_attr(self.frame.object)
class BrokerGroupAdd(BrokerGroupForm):
def process_cancel(self, session):
Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/brokerprofile.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -32,21 +32,20 @@
def __init__(self, app, name):
super(BrokerProfileFrame, self).__init__(app, name)
- self.param = BrokerProfileParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = BrokerProfileParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = BrokerProfileView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = BrokerProfileView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
- self.edit = BrokerProfileEdit(app, "edit")
- self.add_mode(self.edit)
- self.set_edit_mode(self.edit)
+ edit = BrokerProfileEdit(app, "edit")
+ self.add_mode(edit)
+ self.set_edit_mode(edit)
- self.remove = BrokerProfileRemove(app, "remove")
- self.add_mode(self.remove)
- self.set_remove_mode(self.remove)
+ remove = BrokerProfileRemove(app, "remove")
+ self.add_mode(remove)
+ self.set_remove_mode(remove)
def render_title(self, session, profile):
return "Broker Profile '%s'" % profile.name
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/client.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -109,35 +109,35 @@
def __init__(self, app, name):
super(ClientFrame, self).__init__(app, name)
- self.param = ClientParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = ClientParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = ClientView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = ClientView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
- self.close = ClientClose(app, "close")
- self.add_mode(self.close)
+ self.__close = ClientClose(app, "close")
+ self.add_mode(self.__close)
- self.sessions_detach = ClientSessionSetDetach(app, "sessionsdetach")
- self.add_mode(self.sessions_detach)
+ self.__sessions_detach = ClientSessionSetDetach(app, "sessionsdetach")
+ self.add_mode(self.__sessions_detach)
- self.sessions_close = ClientSessionSetClose(app, "sessionsclose")
- self.add_mode(self.sessions_close)
+ self.__sessions_close = ClientSessionSetClose(app, "sessionsclose")
+ self.add_mode(self.__sessions_close)
def show_close(self, session):
- return self.show_mode(session, self.close)
+ return self.show_mode(session, self.__close)
def show_sessions_detach(self, session):
- return self.show_mode(session, self.sessions_detach)
+ return self.show_mode(session, self.__sessions_detach)
def show_sessions_close(self, session):
- return self.show_mode(session, self.sessions_close)
+ return self.show_mode(session, self.__sessions_close)
def render_title(self, session, client):
return "Client %s" % client.address
+# XXX get rid of this
def doit(error, args):
pass
#print error, args
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/exchange.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -158,13 +158,12 @@
def __init__(self, app, name):
super(ExchangeFrame, self).__init__(app, name)
- self.param = ExchangeParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = ExchangeParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = ExchangeView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = ExchangeView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
def render_title(self, session, exchange):
return exchange.name and "Exchange '%s'" % exchange.name \
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/page.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -67,9 +67,9 @@
self.__tabs = MainFrameTabs(app, "tabs")
self.add_child(self.__tabs)
- self.__view = MainView(app, "view")
- self.add_mode(self.__view)
- self.set_view_mode(self.__view)
+ view = MainView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
self.__broker = BrokerFrame(app, "broker")
self.add_mode(self.__broker)
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/queue.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -165,17 +165,16 @@
def __init__(self, app, name):
super(QueueFrame, self).__init__(app, name)
- self.param = QueueParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = QueueParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = QueueView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = QueueView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
- self.add = QueueAdd(app, "add")
- self.add_mode(self.add)
- self.set_add_mode(self.add)
+ add = QueueAdd(app, "add")
+ self.add_mode(add)
+ self.set_add_mode(add)
self.purge = QueuePurge(app, "purge")
self.add_mode(self.purge)
Modified: mgmt/cumin/python/cumin/system.py
===================================================================
--- mgmt/cumin/python/cumin/system.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/system.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -38,13 +38,12 @@
def __init__(self, app, name):
super(SystemFrame, self).__init__(app, name)
- self.param = SystemParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = SystemParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = SystemView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = SystemView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
def render_title(self, session, system):
return "System '%s'" % system.sysId
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/virtualhost.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -28,34 +28,33 @@
def __init__(self, app, name):
super(VirtualHostFrame, self).__init__(app, name)
- self.param = VirtualHostParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.object = VirtualHostParameter(app, "id")
+ self.add_parameter(self.object)
- self.view = VirtualHostView(app, "view")
- self.add_mode(self.view)
- self.set_view_mode(self.view)
+ view = VirtualHostView(app, "view")
+ self.add_mode(view)
+ self.set_view_mode(view)
- self.queue = QueueFrame(app, "queue")
- self.add_mode(self.queue)
+ self.__queue = QueueFrame(app, "queue")
+ self.add_mode(self.__queue)
- self.exchange = ExchangeFrame(app, "exchange")
- self.add_mode(self.exchange)
+ self.__exchange = ExchangeFrame(app, "exchange")
+ self.add_mode(self.__exchange)
- self.client = ClientFrame(app, "client")
- self.add_mode(self.client)
+ self.__client = ClientFrame(app, "client")
+ self.add_mode(self.__client)
def show_queue(self, session, queue):
- self.queue.set_object(session, queue)
- return self.show_mode(session, self.queue)
+ self.__queue.set_object(session, queue)
+ return self.show_mode(session, self.__queue)
def show_exchange(self, session, exchange):
- self.exchange.set_object(session, exchange)
- return self.show_mode(session, self.exchange)
+ self.__exchange.set_object(session, exchange)
+ return self.show_mode(session, self.__exchange)
def show_client(self, session, client):
- self.client.set_object(session, client)
- return self.show_mode(session, self.client)
+ self.__client.set_object(session, client)
+ return self.show_mode(session, self.__client)
def render_title(self, session, vhost):
return "Functional Host '%s'" % vhost.name
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2008-04-04 16:15:02 UTC (rev 1839)
+++ mgmt/cumin/python/cumin/widgets.py 2008-04-04 16:48:11 UTC (rev 1840)
@@ -18,32 +18,24 @@
def __init__(self, app, name):
super(CuminFrame, self).__init__(app, name)
- self.__param = None
+ self.object = None
self.__view = None
self.__add = None
self.__edit = None
self.__remove = None
def get_args(self, session):
- if self.__param:
+ if self.object:
return (self.get_object(session),)
else:
return ()
- # XXX these should be object_attr, not _parameter
- def set_object_parameter(self, param):
- self.__param = param
- return param
-
- def get_object_parameter(self):
- return self.__param
-
def get_object(self, session):
- if self.__param:
- return self.__param.get(session)
+ if self.object:
+ return self.object.get(session)
def set_object(self, session, object):
- return self.__param.set(session, object)
+ return self.object.set(session, object)
def set_view_mode(self, mode):
self.__view = mode
More information about the rhmessaging-commits
mailing list