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

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-04-16 17:18:22 +0200 (Thu, 16 Apr 2009)
New Revision: 326

Modified:
   trunk/ChangeLog
   trunk/formed/formed/model/data.py
Log:
Fixed RepeatNode and added attribute 'digest'.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-16 15:08:53 UTC (rev 325)
+++ trunk/ChangeLog	2009-04-16 15:18:22 UTC (rev 326)
@@ -1,5 +1,10 @@
 2009-04-16	Sascha L. Teichmann <teichmann at intevation.de>
 
+	* formed/formed/model/data.py: Added 'digest' attribute to 
+	  RepeatNode. Removed needless methods
+
+2009-04-16	Sascha L. Teichmann <teichmann at intevation.de>
+
 	* formed/formed/model/exprtree.py: make 'equal' and 'not equal'
 	  more readable with '=' and '<>'.
 

Modified: trunk/formed/formed/model/data.py
===================================================================
--- trunk/formed/formed/model/data.py	2009-04-16 15:08:53 UTC (rev 325)
+++ trunk/formed/formed/model/data.py	2009-04-16 15:18:22 UTC (rev 326)
@@ -106,21 +106,28 @@
 class RepeatNode(GroupNode):
     def __init__(self):
         Node.__init__(self)
-        self.attributes["min"]  = ""
-        self.attributes["max"]  = ""
+        self.attributes["min"]    = ""
+        self.attributes["max"]    = ""
+        self.attributes["digest"] = ""
 
-    def isRepeat(self):
-        return True
+    def getDigest(self):
+        return self.getAttribute("digest")
 
-    def setRepeat(self, repeat):
-        pass
+    def setDigest(self, digest):
+        self.setAttribute("digest", digest)
 
-    def isInvisible(self):
-        return False 
+    def getMin(self):
+        return self.getAttribute("min")
 
-    def setInvisible(self, invisible):
-        pass
+    def setMin(self, min):
+        self.setAttribute("min", min)
 
+    def getMax(self):
+        return self.getAttribute("max")
+
+    def setMax(self, min):
+        self.setAttribute("max", max)
+
 class MatrixNode(GroupNode):
     def __init__(self):
         GroupNode.__init__(self)
@@ -171,6 +178,7 @@
         if self.choice: 
             return self.choice.children
         return None
+
 class InfoLeaf(Leaf):
     def __init__(self):
         Leaf.__init__(self)