[Formed-commits] r317 - in trunk: . formed/formed/model

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-03-16 14:47:57 +0100 (Mon, 16 Mar 2009)
New Revision: 317

Modified:
   trunk/ChangeLog
   trunk/formed/formed/model/data.py
Log:
ConditionalNode inherits from Node directly.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-16 13:21:37 UTC (rev 316)
+++ trunk/ChangeLog	2009-03-16 13:47:57 UTC (rev 317)
@@ -1,5 +1,9 @@
 2009-03-16	Sascha L. Teichmann <teichmann at intevation.de>
 
+	* formed/formed/model/data.py: ConditionalNode inherits from Node directly.
+
+2009-03-16	Sascha L. Teichmann <teichmann at intevation.de>
+
 	* formed/formed/model/data.py: Added ConditionalNode
 
 	* formed/formed/io/document.py: Make ConditionalNode loadable.

Modified: trunk/formed/formed/model/data.py
===================================================================
--- trunk/formed/formed/model/data.py	2009-03-16 13:21:37 UTC (rev 316)
+++ trunk/formed/formed/model/data.py	2009-03-16 13:47:57 UTC (rev 317)
@@ -83,11 +83,12 @@
         self.visit(collector.visitor, mode, allModes)
         return collector.widgets
 
-class ConditionalNode(GroupNode):
+class ConditionalNode(Node):
 
     def __init__(self):
-        GroupNode.__init__(self)
-        self.attributes["expr"] = ""
+        Node.__init__(self)
+        self.attributes["expr"]      = ""
+        self.attributes["invisible"] = ""
         self.expr = None
 
     def setAttribute(self, attrib, value, broadcast=True):
@@ -95,7 +96,7 @@
             newExpr = Expr(value)
             newExpr.compile()
             self.expr = newExpr
-        GroupNode.setAttribute(self, attrib, value, broadcast)
+        Node.setAttribute(self, attrib, value, broadcast)
 
     def setExpr(self, expr):
         self.setAttribute('expr', expr)
@@ -103,7 +104,6 @@
     def getExpr(self):
         return self.expr
 
-
 class RepeatNode(GroupNode):
     def __init__(self):
         Node.__init__(self)