ajack 2004/06/16 12:42:02
Modified: python/gump/model Tag: CleanUp project.py module.py
builder.py
Log:
Running DOM-based gumpy on gump.xml (large W/S) giving it good exercise...
Revision Changes Path
No revision
No revision
1.85.2.6 +1 -1 gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.85.2.5
retrieving revision 1.85.2.6
diff -u -r1.85.2.5 -r1.85.2.6
--- project.py 14 Jun 2004 21:31:46 -0000 1.85.2.5
+++ project.py 16 Jun 2004 19:42:02 -0000 1.85.2.6
@@ -337,7 +337,7 @@
os.path.join(self.getModule().getWorkingDirectory(),
nested))
elif hasDomAttribute(home,'parent'):
- nested=getDomAttributeValue(home,'parent')
+ parent=getDomAttributeValue(home,'parent')
self.home=os.path.abspath(
os.path.join(workspace.getBaseDirectory(),parent))
else:
1.45.2.6 +10 -1 gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/module.py,v
retrieving revision 1.45.2.5
retrieving revision 1.45.2.6
diff -u -r1.45.2.5 -r1.45.2.6
--- module.py 11 Jun 2004 20:46:10 -0000 1.45.2.5
+++ module.py 16 Jun 2004 19:42:02 -0000 1.45.2.6
@@ -206,9 +206,18 @@
if owner.hasProject(name):
project=owner.getProject(name)
+
+ # Hmm, safe even if duplicate?
+ # Ought we detect before?
project.splice(pdom)
if not self.hasProject(name):
- self.addProject(project)
+ if not project.inModule() or (project.getModule() == self):
+ self.addProject(project)
+ else:
+ pass
+ # Duplicate project... Hmm
+ # :TODO:
+
else:
project=Project(name,pdom,self)
self.addProject(project)
1.1.2.3 +2 -2 gump/python/gump/model/builder.py
Index: builder.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/builder.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- builder.py 11 Jun 2004 17:09:50 -0000 1.1.2.2
+++ builder.py 16 Jun 2004 19:42:02 -0000 1.1.2.3
@@ -75,7 +75,7 @@
# Name the xmlproperty...
if hasDomAttribute(ddom,'property'):
pelement.setAttribute('name',getDomAttributeValue(ddom,'property'))
- elif not hasDomAttribute(pdom,'name'):
+ elif not hasDomAttribute(pelement,'name'):
# :TODO: Reconsider later, but default to project name for now...
pname=getDomAttributeValue(ddom,'project')
pelement.setAttribute('name',pname)
@@ -83,7 +83,7 @@
# :TODO: AJ added this, no idea if it is right/needed.
if hasDomAttribute(ddom,'id'):
- pelement.setAttribute('ids',getDomAttributeValue('id'))
+ pelement.setAttribute('ids',getDomAttributeValue(ddom,'id'))
# <depend wants the classpath, unless <noclasspath/> stated
# as a child element or attribute.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
