[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.49, 1.50

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

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

Modified Files:
	Persistence.java 
Log Message:
Elliminated usage of Net

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Persistence.java	15 Oct 2007 12:41:24 -0000	1.49
--- Persistence.java	2 Nov 2007 13:14:17 -0000	1.50
***************
*** 31,35 ****
  import net.sourceforge.bprocessor.model.xml.ScaleType;
  import net.sourceforge.bprocessor.model.xml.SpaceType;
- import net.sourceforge.bprocessor.model.xml.NetType;
  import net.sourceforge.bprocessor.model.xml.StringType;
  import net.sourceforge.bprocessor.model.xml.SurfaceType;
--- 31,34 ----
***************
*** 64,68 ****
  import net.sourceforge.bprocessor.model.xml.impl.ScaleTypeImpl;
  import net.sourceforge.bprocessor.model.xml.impl.SpaceImpl;
- import net.sourceforge.bprocessor.model.xml.impl.NetTypeImpl;
  import net.sourceforge.bprocessor.model.xml.impl.StringTypeImpl;
  import net.sourceforge.bprocessor.model.xml.impl.SurfaceImpl;
--- 63,66 ----
***************
*** 262,270 ****
        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);
!     }
    }
    
--- 260,264 ----
        Map mapper, Collection xmls) {
      SpaceType type = xml.getValueObject();
!     return internalizeSpace(owner, type, mapper, xmls);
    }
    
***************
*** 917,931 ****
    /**
     * Create an xml SpaceImpl and place it in the map
-    * @param n The Net
-    * @param map The map
-    * @return The NetTypeImpl
-    */
-   private static NetType externalizeNet(Net n, Map map) {
-     NetType xml = new NetTypeImpl();
-     return (NetType)externalizeSpace(xml, n, map);
-   }
-   
-   /**
-    * Create an xml SpaceImpl and place it in the map
     * @param space The space
     * @param map The map
--- 911,914 ----
***************
*** 971,981 ****
          while (iter.hasNext()) {
            Object current = iter.next();
!           if (current instanceof Net) {
!             xml.getSpace().add(externalizeNet((Net)current, map));
!           } else if (current instanceof Space) {
!             xml.getSpace().add(externalizeSpace((Space)current, map));
!           } else  {
!             log.error("trying to externalize unsupported spacetype");
!           }         
          }
        }
--- 954,958 ----
          while (iter.hasNext()) {
            Object current = iter.next();
!           xml.getSpace().add(externalizeSpace((Space)current, map));     
          }
        }