[rhmessaging-commits] rhmessaging commits: r3635 - in mgmt/trunk/cumin/python/cumin: inventory and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-09-15 13:40:48 -0400 (Tue, 15 Sep 2009)
New Revision: 3635

Modified:
   mgmt/trunk/cumin/python/cumin/grid/pool.py
   mgmt/trunk/cumin/python/cumin/inventory/system.py
Log:
Remove some unnecessary setters

Modified: mgmt/trunk/cumin/python/cumin/grid/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/pool.py	2009-09-15 15:57:38 UTC (rev 3634)
+++ mgmt/trunk/cumin/python/cumin/grid/pool.py	2009-09-15 17:40:48 UTC (rev 3635)
@@ -103,11 +103,6 @@
         self.negotiator = NegotiatorFrame(app, "neg")
         self.add_mode(self.negotiator)
 
-    # XXX this shouldn't be necessary
-    def show_job_frame(self, session):
-        self.page.set_frame(session, self.job)
-        return self.job.show(session)
-
 class PoolView(CuminView):
     def __init__(self, app, name, pool):
         super(PoolView, self).__init__(app, name, pool)
@@ -129,32 +124,23 @@
         self.slots = PoolSlotSet(app, "slots", self.pool)
         self.tabs.add_tab(self.slots)
 
-        self.scheds = PoolSchedulerSet(app, "scheds", self.pool)
-        self.tabs.add_tab(self.scheds)
+        self.schedulers = PoolSchedulerSet(app, "schedulers", self.pool)
+        self.tabs.add_tab(self.schedulers)
 
-        self.negs = PoolNegotiatorSet(app, "negs", self.pool)
-        self.tabs.add_tab(self.negs)
+        self.negotiators = PoolNegotiatorSet(app, "negotiators", self.pool)
+        self.tabs.add_tab(self.negotiators)
 
-        self.colls = PoolCollectorSet(app, "colls", self.pool)
-        self.tabs.add_tab(self.colls)
+        self.collectors = PoolCollectorSet(app, "collectors", self.pool)
+        self.tabs.add_tab(self.collectors)
 
         self.limits = LimitSet(app, "limits", negotiator)
         self.tabs.add_tab(self.limits)
 
     def do_process(self, session):
         self.limits.limit_count.process(session)
+
         super(PoolView, self).do_process(session)
 
-    # XXX get rid of these
-    def set_collector_tab(self, session):
-        self.colls.show(session)
-
-    def set_negotiator_tab(self, session):
-        self.negs.show(session)
-
-    def set_scheduler_tab(self, session):
-        self.scheds.show(session)
-
 class PoolSubmissionSet(SubmissionSet):
     def __init__(self, app, name, pool):
         super(PoolSubmissionSet, self).__init__(app, name)

Modified: mgmt/trunk/cumin/python/cumin/inventory/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/inventory/system.py	2009-09-15 15:57:38 UTC (rev 3634)
+++ mgmt/trunk/cumin/python/cumin/inventory/system.py	2009-09-15 17:40:48 UTC (rev 3635)
@@ -245,15 +245,15 @@
             #self.page.main.show_grid_tab(session)
             daemon = Identifiable(item.id)
             if isinstance(item, Collector):
-                self.page.main.grid.pool.view.set_collector_tab(session)
+                self.page.main.grid.pool.view.collectors.show(session)
                 href = self.page.main.grid.pool.collector.get_href \
                     (session, daemon)
             elif isinstance(item, Scheduler):
-                self.page.main.grid.pool.view.set_scheduler_tab(session)
+                self.page.main.grid.pool.view.schedulers.show(session)
                 href = self.page.main.grid.pool.scheduler.get_href \
                     (session, daemon)
             elif isinstance(item, Negotiator):
-                self.page.main.grid.pool.view.set_negotiator_tab(session)
+                self.page.main.grid.pool.view.negotiators.show(session)
                 href = self.page.main.grid.pool.negotiator.get_href \
                     (session, daemon)
             return fmt_link(href, item.Name)