[Commits] (john) - Debug Chandler now launches

[commits at osafoundation.org]

Commit by: john
Modified files:
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py 1.6 1.7
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py 1.15 1.16

Log message:
- Debug Chandler now launches
- Removed __iter__ from Query to avoid colliding with the repository __iter__


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py.diff?r1=text&tr1=1.15&r2=text&tr2=1.16

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.15 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.16
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.15	Sat Mar 20 15:22:01 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py	Tue Mar 23 07:32:08 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.15 $"
-__date__ = "$Date: 2004/03/20 23:22:01 $"
+__version__ = "$Revision: 1.16 $"
+__date__ = "$Date: 2004/03/23 15:32:08 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -503,7 +503,8 @@
                 return
 
             self.LoadChildren(id)
-            self.Expand(id)
+            if self.IsVisible(id):
+                self.Expand(id)
             child, cookie = self.GetFirstChild (id, 0)
             while child.IsOk():
                 ExpandContainer (self, openedContainers, child)
@@ -569,7 +570,8 @@
             if parent:
                 id = ExpandTreeToItem (self, parent)
                 self.LoadChildren(id)
-                self.Expand (id)
+                if self.IsVisible(id):
+                    self.Expand(id)
                 itemUUID = item.getUUID()
                 child, cookie = self.GetFirstChild (id, 0)
                 while child.IsOk():

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py:1.6 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py:1.7
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py:1.6	Sat Mar 20 15:22:01 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py	Tue Mar 23 07:32:08 2004
@@ -24,11 +24,11 @@
 
         elif self.queryEnum == "Kind":
             self.results = []
-            for item in self:
+            for item in self.iterateResults():
                 self.results.append (item)
         self.resultsStale = False
 
-    def __iter__ (self):
+    def iterateResults (self):
         if self.queryEnum == "ContainerSearch":
             assert False, "This code isn't written"
 
@@ -54,7 +54,7 @@
         return self.results.index (item)
         """
         index = 0
-        for object in self:
+        for object in self.iterateResults():
             if object == item:
                 return index
             index = index + 1