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

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7132/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.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Persistence.java	28 Jun 2007 12:18:57 -0000	1.41
--- Persistence.java	28 Jun 2007 12:36:07 -0000	1.42
***************
*** 235,238 ****
--- 235,250 ----
    }
    
+   
+   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;
+     }
+   }
+   
    /**
     * @param owner Space
***************
*** 271,282 ****
            current = ((net.sourceforge.bprocessor.model.xml.Space)current).getValueObject();
          }
!         Space element = null;
!         if (current instanceof NetType) {
!           element = internalizeNet(space, (SpaceType)current, mapper, xmls);
!         } else if (current instanceof SpaceType) { 
!           element = internalizeSpace(space, (SpaceType)current, mapper, xmls);
!         } else {
!           log.error("unsupported spacetype");
!         }
          elements.put(element.getId(), element);
        }
--- 283,287 ----
            current = ((net.sourceforge.bprocessor.model.xml.Space)current).getValueObject();
          }
!         Space element = internalizeElement(space, (SpaceType) current, mapper, xmls);
          elements.put(element.getId(), element);
        }