[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.71, 1.72

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

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

Modified Files:
	Persistence.java 
Log Message:
refactored persistence to handle space/container/instance

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Persistence.java	13 Dec 2007 12:15:40 -0000	1.71
--- Persistence.java	17 Dec 2007 10:24:27 -0000	1.72
***************
*** 255,259 ****
    
    
!   private static Space internalizeElement(Container owner, 
        net.sourceforge.bprocessor.model.xml.Space xml,
        Map mapper, Collection xmls) {
--- 255,259 ----
    
    
!   private static Space internalizeSpace(Container owner, 
        net.sourceforge.bprocessor.model.xml.Space xml,
        Map mapper, Collection xmls) {
***************
*** 340,344 ****
          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);
        }
--- 340,344 ----
          net.sourceforge.bprocessor.model.xml.Space current = 
            (net.sourceforge.bprocessor.model.xml.Space) iter.next();
!         Space element = internalizeSpace(space, current, mapper, xmls);
          elements.put(element.getId(), element);
        }
***************
*** 957,972 ****
     */
    private static SpaceType externalizeSpace(Space space, Map map) {
!     SpaceType xml = new SpaceImpl();
!     return externalizeSpace(xml, space, map);
    }
    
    /**
     * Create content
-    * @param xml the space xml
     * @param space The space
     * @param map The map
     * @return The SpaceImpl
     */
!   private static SpaceType externalizeSpace(SpaceType xml, Space space, Map map) {
      xml.setId(counter++);
      if (space.getId() != null) {
--- 957,977 ----
     */
    private static SpaceType externalizeSpace(Space space, Map map) {
!     SpaceType xml = null;
!     if (space instanceof Container) {
!       xml = externalizeContainer((Container) space, map);
!     } else if (space instanceof Instance) {
!       xml = externalizeInstance((Instance) space, map);
!     }
!     return xml;
    }
    
    /**
     * Create content
     * @param space The space
     * @param map The map
     * @return The SpaceImpl
     */
!   private static SpaceType externalizeContainer(Container space, Map map) {
!     SpaceType xml = new SpaceImpl();
      xml.setId(counter++);
      if (space.getId() != null) {
***************
*** 989,1042 ****
      }
      map.put(space, xml);
!     if (!space.isInstance()) {
!       Container container = (Container) space;
!       //Only save geometry if space isn't a instance
!       {
!         List elements = new LinkedList(container.getElements());
!         Entity.sort(elements);
!         Iterator iter = elements.iterator();
!         while (iter.hasNext()) {
!           Object current = iter.next();
!           xml.getSpace().add(externalizeSpace((Space)current, map));     
!         }
        }
!       {
!         List surfaces = new LinkedList(container.getSurfaces());
!         Entity.sort(surfaces);
!         Iterator iter = surfaces.iterator();
!         while (iter.hasNext()) {
!           Surface current = (Surface) iter.next();
!           xml.getSurface().add(externalizeSurface(current, map)); 
!         }
        }
!       {
!         List edges = new LinkedList(container.getEdges());
!         Entity.sort(edges);
!         Iterator iter = edges.iterator();
!         while (iter.hasNext()) {
!           Edge current = (Edge) iter.next();
!           xml.getEdge().add(externalizeEdge(current, map));
!         }
        }
!       {
!         List vertices = new LinkedList(container.getVertices());
!         Entity.sort(vertices);
!         Iterator iter = vertices.iterator();
!         while (iter.hasNext()) {
!           Vertex current = (Vertex) iter.next();
!           xml.getVertex().add(externalizeVertex(current, map));
!         }
        }
!       {
!         Iterator iter = container.getConstructors().iterator();
!         while (iter.hasNext()) {
!           Constructor current = (Constructor) iter.next();
!           xml.getConstructor().add(externalizeConstructor(current, map));
!         }
        }
-     } else {
-       Instance instance = (Instance) space;
-       xml.setAnchor(externalizeCoordinateSystem(instance.getInstanceAnchor(), map));
      }
      {
        if (space.getModellor() != null) {
--- 994,1041 ----
      }
      map.put(space, xml);
!     {
!       List elements = new LinkedList(space.getElements());
!       Entity.sort(elements);
!       Iterator iter = elements.iterator();
!       while (iter.hasNext()) {
!         Object current = iter.next();
!         xml.getSpace().add(externalizeSpace((Space)current, map));     
        }
!     }
!     {
!       List surfaces = new LinkedList(space.getSurfaces());
!       Entity.sort(surfaces);
!       Iterator iter = surfaces.iterator();
!       while (iter.hasNext()) {
!         Surface current = (Surface) iter.next();
!         xml.getSurface().add(externalizeSurface(current, map)); 
        }
!     }
!     {
!       List edges = new LinkedList(space.getEdges());
!       Entity.sort(edges);
!       Iterator iter = edges.iterator();
!       while (iter.hasNext()) {
!         Edge current = (Edge) iter.next();
!         xml.getEdge().add(externalizeEdge(current, map));
        }
!     }
!     {
!       List vertices = new LinkedList(space.getVertices());
!       Entity.sort(vertices);
!       Iterator iter = vertices.iterator();
!       while (iter.hasNext()) {
!         Vertex current = (Vertex) iter.next();
!         xml.getVertex().add(externalizeVertex(current, map));
        }
!     }
!     {
!       Iterator iter = space.getConstructors().iterator();
!       while (iter.hasNext()) {
!         Constructor current = (Constructor) iter.next();
!         xml.getConstructor().add(externalizeConstructor(current, map));
        }
      }
+ 
      {
        if (space.getModellor() != null) {
***************
*** 1048,1051 ****
--- 1047,1083 ----
    
    /**
+    * Create content
+    * @param space The space
+    * @param map The map
+    * @return The SpaceImpl
+    */
+   private static SpaceType externalizeInstance(Instance space, Map map) {
+     SpaceType xml = new SpaceImpl();
+     xml.setId(counter++);
+     if (space.getId() != null) {
+       xml.setProgid(space.getId());
+     }
+     xml.setName(space.getName());
+     xml.setType(space.getType());
+     xml.setTransparent(space.isTransparent());
+     xml.setDescription(space.getDescription().toString());
+     xml.setUnion(space.isUnion());
+     xml.setNet(space.isNet());
+     if (space.getClassification() != null) {
+       if (space.getClassification().getId().equalsIgnoreCase("-1")) {
+         xml.setClassification(space.getClassification().getName());
+       } else {
+         xml.setClassification(space.getClassification().getFullId(space));
+       }
+     } else {
+       xml.setClassification("unassigned");
+     }
+     map.put(space, xml);
+     xml.setAnchor(externalizeCoordinateSystem(space.getInstanceAnchor(), map));
+     return xml;
+   }
+   
+   
+   /**
     * Externalize a transformation
     * @param current the original object