[Modeling-cvs] ProjectModeling/Modeling ChangeLog,1.6,1.7 ModelSet.py,1.14,1.15

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27955/Modeling

Modified Files:
	ChangeLog ModelSet.py 
Log Message:
ModelSet.py (ModelSet.addModelFromXML): Fixed: loadXMLModel() belongs to the module 'Model', not the class

Index: ChangeLog
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog	30 Nov 2004 17:24:23 -0000	1.6
--- ChangeLog	3 May 2005 15:12:05 -0000	1.7
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-05-03  Sebastien Bigaret  <sbi...@us...>
+ 
+ 	* ModelSet.py (ModelSet.addModelFromXML): Fixed: loadXMLModel
+ 	belongs to the module 'Model', not the class.
+ 
  2004-11-30  Sebastien Bigaret  <sbi...@us...>
  

Index: ModelSet.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/ModelSet.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ModelSet.py	30 Nov 2004 17:07:37 -0000	1.14
--- ModelSet.py	3 May 2005 15:12:06 -0000	1.15
***************
*** 38,42 ****
  
  from Modeling.utils import isaValidName, base_persistent_object
! from Modeling.Model import ModelError, Model
  from Modeling.ClassDescription import ClassDescriptionNeededForEntityNameNotification
  from NotificationFramework import NotificationCenter
--- 38,42 ----
  
  from Modeling.utils import isaValidName, base_persistent_object
! from Modeling.Model import ModelError, Model, loadXMLModel
  from Modeling.ClassDescription import ClassDescriptionNeededForEntityNameNotification
  from NotificationFramework import NotificationCenter
***************
*** 166,170 ****
        raise AttributeError, "xmlSource parameter has no key 'string' or 'file'"
  
!     model=Model.loadXMLModel(xml_content)
      self.addModel(model)
      return model
--- 166,170 ----
        raise AttributeError, "xmlSource parameter has no key 'string' or 'file'"
  
!     model=loadXMLModel(xml_content)
      self.addModel(model)
      return model