ajack 2004/02/09 16:43:19
Modified: python/gump/model rawmodel.py property.py project.py
Log:
Darn <script wasn't as similar to <ant |<maven as I'd hoped...
Revision Changes Path
1.13 +4 -3 jakarta-gump/python/gump/model/rawmodel.py
Index: rawmodel.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/rawmodel.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rawmodel.py 1 Feb 2004 18:44:44 -0000 1.12
+++ rawmodel.py 10 Feb 2004 00:43:19 -0000 1.13
@@ -200,6 +200,7 @@
class XMLScript(GumpXMLModelObject):
def init(self):
self.arg=Multiple(GumpXMLModelObject)
+ self.property=Multiple(XMLProperty)
# represents an <ant/> element
class XMLAnt(GumpXMLModelObject):
1.12 +6 -5 jakarta-gump/python/gump/model/property.py
Index: property.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/property.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- property.py 2 Feb 2004 12:37:30 -0000 1.11
+++ property.py 10 Feb 2004 00:43:19 -0000 1.12
@@ -198,8 +198,9 @@
return self.properties.values()
def importProperties(self,xml):
- for xmlproperty in xml.property:
- self.importProperty(xmlproperty)
+ if xml.property:
+ for xmlproperty in xml.property:
+ self.importProperty(xmlproperty)
def importProperty(self,xmlproperty):
self.addProperty(Property(xmlproperty,self))
1.37 +5 -3 jakarta-gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- project.py 10 Feb 2004 00:32:09 -0000 1.36
+++ project.py 10 Feb 2004 00:43:19 -0000 1.37
@@ -516,7 +516,9 @@
self.buildDependenciesMap(workspace)
+ #
# complete properties
+ #
if self.ant:
self.ant.complete(self,workspace)
transferAnnotations(self.ant, self)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
