[rhmessaging-commits] rhmessaging commits: r1106 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-10-17 14:34:51 -0400 (Wed, 17 Oct 2007)
New Revision: 1106

Modified:
   mgmt/cumin/python/cumin/cluster.py
   mgmt/cumin/python/cumin/configproperty.py
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/realm.py
   mgmt/cumin/python/cumin/server.py
   mgmt/cumin/python/cumin/servergroup.py
   mgmt/cumin/python/cumin/serverprofile.py
   mgmt/cumin/python/cumin/virtualhost.py
Log:
Moves parameters to their own file.  This makes import dependencies a
little simpler.



Modified: mgmt/cumin/python/cumin/cluster.py
===================================================================
--- mgmt/cumin/python/cumin/cluster.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/cluster.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,6 +5,7 @@
 from virtualhost import *
 from server import *
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)

Modified: mgmt/cumin/python/cumin/configproperty.py
===================================================================
--- mgmt/cumin/python/cumin/configproperty.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/configproperty.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -2,6 +2,7 @@
 from wooly.widgets import *
 
 from widgets import *
+from parameters import *
 from util import *
 
 class ConfigPropertySet(ItemSet):
@@ -13,11 +14,3 @@
 
     def render_item_value(self, session, prop):
         return prop.value
-
-class ConfigPropertyParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_config_property(int(string))
-
-    def do_marshal(self, prop):
-        return str(prop.id)
-

Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/exchange.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,17 +5,11 @@
 
 from model import *
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)
 
-class ExchangeParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_exchange(int(string))
-
-    def do_marshal(self, exchange):
-        return str(exchange.id)
-
 class ExchangeInputSet(RadioInputSet):
     def __init__(self, app, name, form):
         super(ExchangeInputSet, self).__init__(app, name, form)

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/queue.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -3,9 +3,9 @@
 from wooly.forms import *
 from wooly.resources import *
 
-from model import *
-from widgets import *
 from exchange import ExchangeInputSet
+from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)
@@ -52,13 +52,6 @@
         return "%i messages in queue<br/>%i errors, %i warnings" \
                % (queue.message_count, queue.error_count, queue.warning_count)
 
-class QueueParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_queue(int(string))
-
-    def do_marshal(self, queue):
-        return str(queue.id)
-
 class QueueFrame(CuminFrame):
     def __init__(self, app, name):
         super(QueueFrame, self).__init__(app, name)

Modified: mgmt/cumin/python/cumin/realm.py
===================================================================
--- mgmt/cumin/python/cumin/realm.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/realm.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -3,8 +3,8 @@
 from wooly.forms import *
 from wooly.resources import *
 
-from model import *
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)

Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/server.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,6 +5,7 @@
 from configproperty import *
 from virtualhost import *
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)
@@ -33,13 +34,6 @@
         else:
             return none()
 
-class ServerParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_server(int(string))
-
-    def do_marshal(self, server):
-        return str(server.id)
-
 class ServerFrame(CuminFrame):
     def __init__(self, app, name):
         super(ServerFrame, self).__init__(app, name)

Modified: mgmt/cumin/python/cumin/servergroup.py
===================================================================
--- mgmt/cumin/python/cumin/servergroup.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/servergroup.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -2,6 +2,7 @@
 from wooly.widgets import *
 
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)
@@ -16,13 +17,6 @@
     def render_none(self, session, group):
         return none()
 
-class ServerGroupParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_server_group(int(string))
-
-    def do_marshal(self, group):
-        return str(group.id)
-
 class ServerGroupForm(CuminForm):
     def __init__(self, app, name):
         super(ServerGroupForm, self).__init__(app, name)

Modified: mgmt/cumin/python/cumin/serverprofile.py
===================================================================
--- mgmt/cumin/python/cumin/serverprofile.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/serverprofile.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -4,6 +4,7 @@
 from configproperty import *
 from server import *
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)
@@ -18,13 +19,6 @@
         frame.show_view(branch)
         return mlink(branch.marshal(), "ServerProfile", profile.name)
 
-class ServerProfileParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_server_profile(int(string))
-
-    def do_marshal(self, profile):
-        return str(profile.id)
-
 class ServerProfileFrame(CuminFrame):
     def __init__(self, app, name):
         super(ServerProfileFrame, self).__init__(app, name)

Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py	2007-10-17 18:24:40 UTC (rev 1105)
+++ mgmt/cumin/python/cumin/virtualhost.py	2007-10-17 18:34:51 UTC (rev 1106)
@@ -5,6 +5,7 @@
 from realm import *
 from exchange import *
 from widgets import *
+from parameters import *
 from util import *
 
 strings = StringCatalog(__file__)
@@ -22,13 +23,6 @@
 
         return mlink(branch.marshal(), "VirtualHost", vhost.name)
 
-class VirtualHostParameter(Parameter):
-    def do_unmarshal(self, string):
-        return self.app.model.get_virtual_host(int(string))
-
-    def do_marshal(self, vhost):
-        return str(vhost.id)
-
 class VirtualHostFrame(CuminFrame):
     def __init__(self, app, name):
         super(VirtualHostFrame, self).__init__(app, name)