[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.42, 1.43

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18013/src/net/sourceforge/bprocessor/model

Modified Files:
	Persistence.java 
Log Message:
Refactored a bit

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Persistence.java	28 Jun 2007 12:36:07 -0000	1.42
--- Persistence.java	28 Jun 2007 13:03:42 -0000	1.43
***************
*** 236,247 ****
    
    
!   private static Space internalizeElement(Space owner, SpaceType xml,
        Map mapper, Collection xmls) {
!     if (xml instanceof NetType) {
!       return internalizeNet(owner, xml, mapper, xmls);
!     } else if (xml instanceof SpaceType) {
!       return internalizeSpace(owner, xml, mapper, xmls);
      } else {
!       return null;
      }
    }
--- 236,247 ----
    
    
!   private static Space internalizeElement(Space owner, 
!       net.sourceforge.bprocessor.model.xml.Space xml,
        Map mapper, Collection xmls) {
!     SpaceType type = xml.getValueObject();
!     if (type instanceof NetType) {
!       return internalizeNet(owner, type, mapper, xmls);
      } else {
!       return internalizeSpace(owner, type, mapper, xmls);
      }
    }
***************
*** 279,287 ****
        Iterator iter = xml.getSpace().iterator();
        while (iter.hasNext()) {
!         Object current = iter.next();
!         if (current instanceof net.sourceforge.bprocessor.model.xml.Space) {
!           current = ((net.sourceforge.bprocessor.model.xml.Space)current).getValueObject();
!         }
!         Space element = internalizeElement(space, (SpaceType) current, mapper, xmls);
          elements.put(element.getId(), element);
        }
--- 279,285 ----
        Iterator iter = xml.getSpace().iterator();
        while (iter.hasNext()) {
!         net.sourceforge.bprocessor.model.xml.Space current = 
!           (net.sourceforge.bprocessor.model.xml.Space) iter.next();
!         Space element = internalizeElement(space, current, mapper, xmls);
          elements.put(element.getId(), element);
        }