[Commits] (john) Mostly fixed bug #1418

[commits at osafoundation.org]

Commit by: john
Modified files:
osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py 1.8 1.9
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py 1.18 1.19

Log message:
Mostly fixed bug #1418


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py.diff?r1=text&tr1=1.18&r2=text&tr2=1.19

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.18 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.19
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.18	Thu Apr 15 15:55:49 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py	Tue Apr 20 12:35:46 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.18 $"
-__date__ = "$Date: 2004/04/15 22:55:49 $"
+__version__ = "$Revision: 1.19 $"
+__date__ = "$Date: 2004/04/20 19:35:46 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -538,6 +538,10 @@
                                    -1,
                                    -1,
                                    wx.TreeItemData (root.itsUUID))        
+        index = 1
+        for value in cellValues:
+            self.SetItemText (rootNodeId, value, index)
+            index += 1
         self.SetItemHasChildren (rootNodeId, self.ElementHasChildren (root))
         self.LoadChildren(rootNodeId)
         ExpandContainer (self, counterpart.openedContainers, self.GetRootItem ())

Index: osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py
diff -u osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py:1.8 osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py:1.9
--- osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py:1.8	Tue Mar 23 21:08:22 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py	Tue Apr 20 12:35:45 2004
@@ -1,8 +1,8 @@
 """ Classes used by the repository view
 """
 
-__version__ = "$Revision: 1.8 $"
-__date__ = "$Date: 2004/03/24 05:08:22 $"
+__version__ = "$Revision: 1.9 $"
+__date__ = "$Date: 2004/04/20 19:35:45 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -14,10 +14,7 @@
     """
     
     def ElementParent(self, element):
-        try:
-            return element.itsParent
-        except AttributeError:
-            return None
+        return element.itsParent
 
     def ElementChildren(self, element):
         if element:
@@ -26,16 +23,16 @@
             return Globals.repository.view
 
     def ElementCellValues(self, element):
-        cellValues = []
-        if element == Globals.repository.view:
-            cellValues.append ("//")
-        else:
-            cellValues.append (element.itsName)
-            cellValues.append (str (element.getItemDisplayName()))
+        cellValues = [element.itsName]
+        if True or element != Globals.repository.view:
+            try:
+                cellValues.append (str (element.getItemDisplayName()))
+            except AttributeError:
+                cellValues.append ('')
             try:
                 cellValues.append (element.itsKind.itsName)
             except AttributeError:
-                cellValues.append ('(kindless)')
+                cellValues.append ('')
             cellValues.append (str (element.itsUUID))
             cellValues.append (str (element.itsPath))
         return cellValues