Author: remi
Date: 2009-04-18 14:23:40 +0200 (Sat, 18 Apr 2009)
New Revision: 4557
Modified:
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/attitunes/AttitunesContainer.py
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/gadgets/GadgetsContainer.py
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/scheduler/TasksContainer.py
Log:
* fixed attitunes, gadgets and task order by name.
Modified:
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/attitunes/AttitunesContainer.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/attitunes/AttitunesContainer.py
2009-04-18 12:21:36 UTC (rev 4556)
+++
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/attitunes/AttitunesContainer.py
2009-04-18 12:23:40 UTC (rev 4557)
@@ -27,7 +27,6 @@
ApiBaseChildResource.__init__(self, apiBase, apiBaseServer)
self.__mutex = threading.Lock()
self.__attitunes = []
- self._update(structure)
#
--------------------------------------------------------------------------
# Update the container structure.
@@ -38,10 +37,16 @@
"""
self.__mutex.acquire()
self.__attitunes = []
- for key in structure.keys():
- if key.lower().find('data') == 0:
- self.__attitunes.append(Attitune(self.getParent(),
- self.getServer(), self, structure[key]))
+ keys = structure.keys()
+ keys.remove("result")
+ for i, key in enumerate(keys):
+ keys[i] = "%.3d" % int(key.replace("data", ""))
+ keys.sort()
+ for i, key in enumerate(keys):
+ keys[i] = "data%d" % int(key)
+ for key in keys:
+ self.__attitunes.append(Attitune(self.getParent(),
+ self.getServer(), self, structure[key]))
self.__mutex.release()
#
--------------------------------------------------------------------------
Modified:
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/gadgets/GadgetsContainer.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/gadgets/GadgetsContainer.py
2009-04-18 12:21:36 UTC (rev 4556)
+++
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/gadgets/GadgetsContainer.py
2009-04-18 12:23:40 UTC (rev 4557)
@@ -28,7 +28,7 @@
self.__locutor = "Ryan"
self.__pitch = 130
self.__mutex = threading.Lock()
- self._update(structure)
+ self.__gadgets = []
#
--------------------------------------------------------------------------
# Get the current container language.
@@ -87,7 +87,13 @@
"""
self.__mutex.acquire()
self.__gadgets = []
- for key in structure.keys():
+ keys = structure.keys()
+ for i, key in enumerate(keys):
+ keys[i] = "%.3d" % int(key.replace("data", ""))
+ keys.sort()
+ for i, key in enumerate(keys):
+ keys[i] = "data%d" % int(key)
+ for key in keys:
self.__gadgets.append(Gadget(self.getParent(), self.getServer(),
self,
structure[key]))
if len(self.__gadgets) > 0:
Modified:
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/scheduler/TasksContainer.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/scheduler/TasksContainer.py
2009-04-18 12:21:36 UTC (rev 4556)
+++
softwares_suite_v3/kysoh/tuxware/api/python/trunk/tuxisalive/api/scheduler/TasksContainer.py
2009-04-18 12:23:40 UTC (rev 4557)
@@ -25,7 +25,6 @@
ApiBaseChildResource.__init__(self, apiBase, apiBaseServer)
self.__tasks = []
self.__mutex = threading.Lock()
- self._update(structure)
#
--------------------------------------------------------------------------
# Update the container structure.
@@ -36,10 +35,16 @@
"""
self.__mutex.acquire()
self.__tasks = []
- for key in structure.keys():
- if key.lower().find('data') == 0:
- self.__tasks.append(Task(self.getParent(),
- self.getServer(), self, structure[key]))
+ keys = structure.keys()
+ keys.remove("result")
+ for i, key in enumerate(keys):
+ keys[i] = "%.3d" % int(key.replace("data", ""))
+ keys.sort()
+ for i, key in enumerate(keys):
+ keys[i] = "data%d" % int(key)
+ for key in keys:
+ self.__tasks.append(Task(self.getParent(),
+ self.getServer(), self, structure[key]))
self.__mutex.release()
#
--------------------------------------------------------------------------
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
