[rhmessaging-commits] rhmessaging commits: r3176 - in mgmt/trunk: wooly/python/wooly and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Mar 19 12:00:42 EDT 2009
Author: justi9
Date: 2009-03-19 12:00:42 -0400 (Thu, 19 Mar 2009)
New Revision: 3176
Modified:
mgmt/trunk/cumin/python/cumin/broker.py
mgmt/trunk/cumin/python/cumin/brokergroup.py
mgmt/trunk/cumin/python/cumin/brokerlink.py
mgmt/trunk/cumin/python/cumin/client.py
mgmt/trunk/cumin/python/cumin/exchange.py
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/pool.py
mgmt/trunk/cumin/python/cumin/queue.py
mgmt/trunk/wooly/python/wooly/__init__.py
mgmt/trunk/wooly/python/wooly/pages.py
Log:
Rename the XXX_current_frame methods on WidgetPage to just XXX_frame
Modified: mgmt/trunk/cumin/python/cumin/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/broker.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -691,8 +691,8 @@
class BrokerSetAdd(BrokerSetForm):
def process_cancel(self, session):
branch = session.branch()
- self.page.pop_current_frame(branch)
- self.page.get_current_frame(branch).show_view(branch)
+ self.page.pop_frame(branch)
+ self.page.get_frame(branch).show_view(branch)
self.page.set_redirect_url(session, branch.marshal())
def process_submit(self, session):
@@ -787,8 +787,8 @@
def process_cancel(self, session, reg):
branch = session.branch()
- self.page.pop_current_frame(branch)
- self.page.get_current_frame(branch).show_view(branch)
+ self.page.pop_frame(branch)
+ self.page.get_frame(branch).show_view(branch)
self.page.set_redirect_url(session, branch.marshal())
def process_submit(self, session, reg):
Modified: mgmt/trunk/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokergroup.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/brokergroup.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -188,7 +188,7 @@
def process_cancel(self, session, group):
branch = session.branch()
self.frame.show_view(branch)
- self.page.pop_current_frame(branch)
+ self.page.pop_frame(branch)
self.page.set_redirect_url(session, branch.marshal())
def process_submit(self, session, group):
@@ -197,8 +197,8 @@
branch = session.branch()
self.frame.frame.show_view(branch)
- self.page.pop_current_frame(branch)
- self.page.pop_current_frame(branch)
+ self.page.pop_frame(branch)
+ self.page.pop_frame(branch)
self.page.set_redirect_url(session, branch.marshal())
def render_title(self, session, group):
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -238,11 +238,11 @@
return super(PeerFrame, self).show_object(session, peer)
def show_bridge_add(self, session):
- self.page.set_current_frame(session, self.__bridge_add)
+ self.page.set_frame(session, self.__bridge_add)
return self.show_mode(session, self.__bridge_add)
def show_routes_close(self, session):
- self.page.set_current_frame(session, self.__routes_close)
+ self.page.set_frame(session, self.__routes_close)
return self.show_mode(session, self.__routes_close)
class LinkRemove(CuminConfirmForm):
@@ -663,7 +663,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
@@ -685,7 +685,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
Modified: mgmt/trunk/cumin/python/cumin/client.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/client.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/client.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -205,7 +205,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
@@ -283,7 +283,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch).show_sessions(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
@@ -301,7 +301,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch).show_sessions(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
@@ -368,7 +368,7 @@
branch = session.branch()
frame = self.frame.show_sessions_detach(branch)
frame.ids.set(branch, ids)
- self.page.set_current_frame(branch, frame)
+ self.page.set_frame(branch, frame)
self.page.set_redirect_url(session, branch.marshal())
class Close(FormButton):
@@ -382,7 +382,7 @@
branch = session.branch()
frame = self.frame.show_sessions_close(branch)
frame.ids.set(branch, ids)
- self.page.set_current_frame(branch, frame)
+ self.page.set_frame(branch, frame)
self.page.set_redirect_url(session, branch.marshal())
class NameColumn(SqlTableColumn):
Modified: mgmt/trunk/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/exchange.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -168,7 +168,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/job.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -558,19 +558,19 @@
self.add_mode(self.__system)
def show_ads_edit(self, session):
- self.page.set_current_frame(session, self.__edit_ads)
+ self.page.set_frame(session, self.__edit_ads)
return self.show_mode(session, self.__edit_ads)
def show_job_group(self, session, jobgroup):
self.__job.set_object(session, jobgroup)
- self.page.set_current_frame(session, self.__job)
+ self.page.set_frame(session, self.__job)
self.__job.set_switch(session, "group")
return self.show_mode(session, self.__job)
def show_system(self, session, system):
frame = self.show_mode(session, self.__system)
frame.set_object(session, system)
- return self.page.set_current_frame(session, frame)
+ return self.page.set_frame(session, frame)
class JobView(CuminView):
@@ -800,8 +800,8 @@
def process_cancel(self, session, job):
branch = session.branch()
self.ads.set(branch, None) # otherwise url is too long
- self.page.pop_current_frame(branch)
- self.page.get_current_frame(branch).show_view(branch)
+ self.page.pop_frame(branch)
+ self.page.get_frame(branch).show_view(branch)
self.page.set_redirect_url(session, branch.marshal())
def process_submit(self, session, job):
@@ -1209,7 +1209,7 @@
def process_return(self, session, *args):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def get_reason(self, session, verb):
Modified: mgmt/trunk/cumin/python/cumin/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/pool.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -136,31 +136,31 @@
self.add_mode(self.job_group_remove)
def show_job_frame(self, session):
- self.page.set_current_frame(session, self.job)
+ self.page.set_frame(session, self.job)
return self.show_mode(session, self.job)
def show_negs_start(self, session):
- self.page.set_current_frame(session, self.__startneg)
+ self.page.set_frame(session, self.__startneg)
return self.show_mode(session, self.__startneg)
def show_negs_stop(self, session):
- self.page.set_current_frame(session, self.__stopneg)
+ self.page.set_frame(session, self.__stopneg)
return self.show_mode(session, self.__stopneg)
def show_scheds_start(self, session):
- self.page.set_current_frame(session, self.__startsched)
+ self.page.set_frame(session, self.__startsched)
return self.show_mode(session, self.__startsched)
def show_scheds_stop(self, session):
- self.page.set_current_frame(session, self.__stopsched)
+ self.page.set_frame(session, self.__stopsched)
return self.show_mode(session, self.__stopsched)
def show_colls_start(self, session):
- self.page.set_current_frame(session, self.__startcoll)
+ self.page.set_frame(session, self.__startcoll)
return self.show_mode(session, self.__startcoll)
def show_colls_stop(self, session):
- self.page.set_current_frame(session, self.__stopcoll)
+ self.page.set_frame(session, self.__stopcoll)
return self.show_mode(session, self.__stopcoll)
class PoolView(CuminView):
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -648,7 +648,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
@@ -671,7 +671,7 @@
def process_return(self, session):
branch = session.branch()
self.frame.show_view(branch)
- self.page.set_current_frame(branch, self.frame)
+ self.page.set_frame(branch, self.frame)
self.page.set_redirect_url(session, branch.marshal())
def process_item(self, session, id):
Modified: mgmt/trunk/wooly/python/wooly/__init__.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/__init__.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/wooly/python/wooly/__init__.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -294,10 +294,10 @@
def show(self, session):
super(Frame, self).show(session)
- return self.page.set_current_frame(session, self)
+ return self.page.set_frame(session, self)
def save_parameters(self, session, params):
- frame = self.page.get_current_frame(session)
+ frame = self.page.get_frame(session)
if self is frame or self in frame.ancestors:
super(Frame, self).save_parameters(session, params)
Modified: mgmt/trunk/wooly/python/wooly/pages.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/pages.py 2009-03-19 15:45:47 UTC (rev 3175)
+++ mgmt/trunk/wooly/python/wooly/pages.py 2009-03-19 16:00:42 UTC (rev 3176)
@@ -12,8 +12,8 @@
self.widget_classes = set()
- self.__frame = self.FrameParameter(app, "frame")
- self.add_parameter(self.__frame)
+ self.page_frame = self.FrameParameter(app, "frame")
+ self.add_parameter(self.page_frame)
self.set_default_frame(self)
@@ -28,21 +28,20 @@
if cls is Widget:
break
- # XXX take "current" out of these
- def set_current_frame(self, session, frame):
- self.__frame.set(session, frame)
+ def set_frame(self, session, frame):
+ self.page_frame.set(session, frame)
return frame
- def get_current_frame(self, session):
- return self.__frame.get(session)
+ def get_frame(self, session):
+ return self.page_frame.get(session)
- def pop_current_frame(self, session):
- frame = self.get_current_frame(session)
+ def pop_frame(self, session):
+ frame = self.get_frame(session)
#print "Popping current frame", frame
- self.set_current_frame(session, frame.frame)
+ self.set_frame(session, frame.frame)
def set_default_frame(self, frame):
- self.__frame.default = frame
+ self.page_frame.default = frame
def get_page_parameters(self, session):
"""
@@ -55,7 +54,7 @@
of its ancestor frames.
"""
- frame = self.get_current_frame(session)
+ frame = self.get_frame(session)
try:
params = self.__saved_params[frame]
More information about the rhmessaging-commits
mailing list