[Pymerase-cvs-commit] pymerase/pymerase/input parseXMI.py,1.22,1.23

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/input
In directory sc8-pr-cvs1:/tmp/cvs-serv5871

Modified Files:
	parseXMI.py 
Log Message:
Switch back to using UUIDs for identifying classes
Try to handle parsing UML13 and UML14 files


Index: parseXMI.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/input/parseXMI.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** parseXMI.py	17 Jun 2003 01:11:44 -0000	1.22
--- parseXMI.py	19 Jun 2003 22:30:39 -0000	1.23
***************
*** 377,381 ****
      lower = multiplicity.range[0].lower
      upper = multiplicity.range[0].upper
-     print "%d..%d" %(lower, upper)
      if lower == 0 or lower == 1:
        if upper == 1:
--- 377,380 ----
***************
*** 535,539 ****
      """Return the unique id of a UML model element
      """
!     return model_element.name
        
  
--- 534,538 ----
      """Return the unique id of a UML model element
      """
!     return model_element.__uniqueID__
        
  
***************
*** 579,584 ****
    """Convert external UML model to pymerase's model classes.
    """
!   umlClass = UML14.Class
!   umlParser = uml14Parser(pymeraseConfig)
  
    classes = filter(lambda c: isinstance(c, umlClass), model.ownedElement)
--- 578,589 ----
    """Convert external UML model to pymerase's model classes.
    """
!   if isinstance(model, UML13.Model):
!     umlClass = UML13.Class
!     umlParser = uml13Parser(pymeraseConfig)
!   elif isinstance(model, UML14.Model):
!     umlClass = UML14.Class
!     umlParser = uml14Parser(pymeraseConfig)
!   else:
!     raise ValueError("Pymerase only supports UML 1.3 and 1.4 metamodel")
  
    classes = filter(lambda c: isinstance(c, umlClass), model.ownedElement)
***************
*** 589,594 ****
        classesInModel[parsedClass.getUUID()] = parsedClass
  
-   pprint.pprint(classesInModel)
-   print len(classesInModel)
    addForeignKeys(pymeraseConfig, classesInModel)
  
--- 594,597 ----
***************
*** 604,608 ****
    base, ext = os.path.splitext(filename)
  
!   model = loadModel(source, UML14)
  
    objects = parseXMI(pymeraseConfig, model, classesInModel)
--- 607,614 ----
    base, ext = os.path.splitext(filename)
  
!   model = loadModel(source)
!   #try:
!   #except AttributeError, e:
!   #  model = loadModel(source, UML14)
  
    objects = parseXMI(pymeraseConfig, model, classesInModel)