[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/xml PersistenceManager.java,1.18,1.19

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19555/src/net/sourceforge/bprocessor/model/xml

Modified Files:
	PersistenceManager.java 
Log Message:
Some name cleanup

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PersistenceManager.java	13 Jan 2006 11:29:25 -0000	1.18
--- PersistenceManager.java	16 Jan 2006 10:07:32 -0000	1.19
***************
*** 122,127 ****
          new net.sourceforge.bprocessor.model.Attribute(a.getName(), a.getType(), a.getValue());
  
-       Project.getInstance().intern(am);
- 
        mapper.put(new Long(a.getId()), am.getId());
  
--- 122,125 ----
***************
*** 244,249 ****
  
        Long id = (Long)mapper.get(new Long(cs.getId()));
!       ConstructionSpace csm =
!         Project.getInstance().findConstructionSpaceById(id);
  
        List as = cs.getAttributeref();
--- 242,247 ----
  
        Long id = (Long)mapper.get(new Long(cs.getId()));
!       Space csm =
!         Project.getInstance().findSpaceById(id);
  
        List as = cs.getAttributeref();
***************
*** 285,290 ****
  
        Long id = (Long)mapper.get(new Long(fs.getId()));
!       FunctionalSpace fsm =
!         Project.getInstance().findFunctionalSpaceById(id);
  
        List as = fs.getAttributeref();
--- 283,288 ----
  
        Long id = (Long)mapper.get(new Long(fs.getId()));
!       Space fsm =
!         Project.getInstance().findSpaceById(id);
  
        List as = fs.getAttributeref();
***************
*** 357,365 ****
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
        if (bid != null) {
!         sm.setBackDomain((Space) Project.getInstance().findDomainById(bid));
        }
        Long fid = (Long)(mapper.get(new Long(s.getFrontdomainref())));
        if (fid != null) {
!         sm.setFrontDomain((Space) Project.getInstance().findDomainById(fid));
        }
        Long eid = (Long)(mapper.get(new Long(s.getExteriorref())));
--- 355,363 ----
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
        if (bid != null) {
!         sm.setBackDomain((Space) Project.getInstance().findSpaceById(bid));
        }
        Long fid = (Long)(mapper.get(new Long(s.getFrontdomainref())));
        if (fid != null) {
!         sm.setFrontDomain((Space) Project.getInstance().findSpaceById(fid));
        }
        Long eid = (Long)(mapper.get(new Long(s.getExteriorref())));