[rhmessaging-commits] rhmessaging commits: r2033 - mgmt/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Fri May 9 15:05:16 EDT 2008
Author: justi9
Date: 2008-05-09 15:05:15 -0400 (Fri, 09 May 2008)
New Revision: 2033
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/model.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:
Use model methods to uniformly control object titles.
Use fmt_shorten by default for object names.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/broker.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -222,9 +222,6 @@
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
-
class BrokerStatus(CuminStatus):
pass
Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/brokercluster.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -66,9 +66,6 @@
self.broker.set_object(session, broker)
return self.show_mode(session, self.broker)
- def render_title(self, session, cluster):
- return "Broker Cluster '%s'" % cluster.name
-
class BrokerClusterStatus(CuminStatus):
pass
@@ -85,12 +82,6 @@
self.tabs.add_tab(self.ClusterBrokerTab(app, "brokers"))
self.tabs.add_tab(self.ClusterStatsTab(app, "stats"))
- def render_title(self, session, cluster):
- return "Broker Cluster '%s'" % cluster.name
-
- def render_name(self, session, cluster):
- return cluster.name
-
class ClusterBrokerTab(BrokerSet):
def get_args(self, session):
return self.frame.get_args(session)
Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/brokergroup.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -97,12 +97,10 @@
def render_title(self, session, group):
if group:
- title = "Broker Group '%s'" % group.name
+ return super(BrokerGroupFrame, self).render_title(session, group)
else:
- title = "Broker Group"
+ return "Broker Group"
- return title
-
def render_href(self, session, group):
if group:
return super(BrokerGroupFrame, self).render_href(session, group)
Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/brokerprofile.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -47,9 +47,6 @@
self.add_mode(remove)
self.set_remove_mode(remove)
- def render_title(self, session, profile):
- return "Broker Profile '%s'" % profile.name
-
class BrokerProfileView(CuminView):
def __init__(self, app, name):
super(BrokerProfileView, self).__init__(app, name)
@@ -60,12 +57,6 @@
self.tabs.add_tab(self.ProfileConfigTab(app, "config"))
self.tabs.add_tab(self.ProfileBrokerTab(app, "brokers"))
- def render_title(self, session, profile):
- return "Broker Profile '%s'" % profile.name
-
- def render_name(self, session, profile):
- return profile.name
-
class ProfileConfigTab(ConfigPropertySet):
def get_args(self, session):
return self.frame.get_args(session)
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/client.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -135,9 +135,6 @@
def show_sessions_close(self, session):
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
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/exchange.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -167,8 +167,10 @@
self.set_view_mode(view)
def render_title(self, session, exchange):
- return exchange.name and "Exchange '%s'" % exchange.name \
- or "Default Exchange"
+ if exchange.name:
+ return super(ExchangeFrame, self).render_title(session, exchange)
+ else:
+ return "Default Exchange"
class ExchangeStatus(CuminStatus):
def render_messages_received(self, session, exchange):
Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/model.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -333,7 +333,7 @@
def get_object_title(self, session, object):
title = self.get_title(session)
name = self.get_object_name(object)
- return "%s '%s'" % (title, name)
+ return "%s '%s'" % (title, fmt_shorten(name))
def get_object_name(self, object):
return object.name
@@ -697,7 +697,7 @@
def get_title(self, session):
return "Queue"
-
+
def get_icon_href(self, session):
return "resource?name=queue-36.png"
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/queue.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -189,7 +189,7 @@
def render_title(self, session, queue):
if queue:
- return "Queue '%s'" % queue.name
+ return super(QueueFrame, self).render_title(session, queue)
else:
return "Queue"
Modified: mgmt/cumin/python/cumin/system.py
===================================================================
--- mgmt/cumin/python/cumin/system.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/system.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -45,9 +45,6 @@
self.add_mode(view)
self.set_view_mode(view)
- def render_title(self, session, system):
- return "System '%s'" % system.sysId
-
class SystemStatus(CuminStatus):
pass
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/virtualhost.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -56,9 +56,6 @@
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
-
class VirtualHostView(CuminView):
def __init__(self, app, name):
super(VirtualHostView, self).__init__(app, name)
@@ -70,12 +67,6 @@
self.tabs.add_tab(ExchangeSet(app, "exchanges"))
self.tabs.add_tab(ClientSet(app, "clients"))
- def render_title(self, session, vhost):
- return "Functional Host '%s'" % vhost.name
-
- def render_name(self, session, vhost):
- return vhost.name
-
def render_broker_link(self, session, vhost):
broker = vhost.get_broker()
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2008-05-09 17:58:50 UTC (rev 2032)
+++ mgmt/cumin/python/cumin/widgets.py 2008-05-09 19:05:15 UTC (rev 2033)
@@ -80,6 +80,15 @@
self.show_view(branch)
return branch.marshal()
+ def render_title(self, session, *args):
+ obj = self.get_object(session)
+
+ assert obj
+
+ cls = self.app.model.get_class_by_object(obj)
+
+ return cls.get_object_title(session, obj)
+
class CuminView(Widget):
def __init__(self, app, name):
super(CuminView, self).__init__(app, name)
More information about the rhmessaging-commits
mailing list