[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.65, 1.66

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

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

Modified Files:
	Persistence.java 
Log Message:
intermediate step in space/instance refactoring

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Persistence.java	12 Dec 2007 12:02:21 -0000	1.65
--- Persistence.java	12 Dec 2007 12:34:58 -0000	1.66
***************
*** 259,263 ****
        Map mapper, Collection xmls) {
      SpaceType type = xml.getValueObject();
!     return internalizeSpace(owner, type, mapper, xmls);
    }
    
--- 259,296 ----
        Map mapper, Collection xmls) {
      SpaceType type = xml.getValueObject();
!     if (type.getProtoref() != 0) {
!       return internalizeInstance(owner, type, mapper, xmls);
!     } else {
!       return internalizeSpace(owner, type, mapper, xmls);
!     }
!   }
!   
!   private static Space internalizeInstance(Space owner, SpaceType xml,
!       Map mapper, Collection xmls) {
!     String name = xml.getName();
!     int type = xml.getType();
!     
!     Instance space = new Instance(name);
!     
!     space.setTransparent(xml.isTransparent());
!     space.setId(new Long(xml.getProgid()));
!     space.setDescription(xml.getDescription());
!     space.setUnion(xml.isUnion());
!     space.setNet(xml.isNet());
!     space.setClassification(internalizeClassifaction(xml.getClassification(), type));
!     ClassificationType classType = internalizeClassificationType(xml.getClassification(), type);
!     if (classType != null) {
!       space.setClassificationType(classType);
!     }
!     mapper.put(new Long(xml.getId()), space);
! 
!     xmls.add(xml);
!     if (xml.getAnchor() != null) {
!       CoordinateSystem anchor;
!       anchor = internalizeCoordinateSystem(xml.getAnchor(), mapper, xmls);
!       space.setInstanceAnchor(anchor);
!     }
!     space.setOwner(owner);
!     return space;
    }
    
***************
*** 279,283 ****
      
      long proto = xml.getProtoref();
-     boolean instance = (proto != 0);
      
      // Alternative:
--- 312,315 ----
***************
*** 303,394 ****
  
      xmls.add(xml);
!     if (!instance) {
!       {
!         HashMap elements = new HashMap();
!         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);
!         }
!         space.setElements(elements);
!       }
!       if (empty != 0) {
!         space.setEmpty((Space) mapper.get(new Long(empty)));
        }
!       { 
!         HashMap surfaces = new HashMap();
!         Iterator iter = xml.getSurface().iterator();
!         while (iter.hasNext()) {
!           SurfaceType current = (SurfaceType) iter.next();
!           Surface surface = internalizeSurface(space, current, mapper, xmls);
!           surfaces.put(surface.getId(), surface);
!         }
!         space.setSurfaces(surfaces);
        }
!       {
!         HashMap edges = new HashMap();
!         Iterator iter = xml.getEdge().iterator();
!         while (iter.hasNext()) {
!           EdgeType current = (EdgeType) iter.next();
!           Edge edge = internalizeEdge(space, current, mapper, xmls);
!           edges.put(edge.getId(), edge);
!         }
!         space.setEdges(edges);
        }
!       {
!         HashMap vertices = new HashMap();
!         Iterator iter = xml.getVertex().iterator();
!         while (iter.hasNext()) {
!           VertexType current = (VertexType) iter.next();
!           Vertex vertex = internalizeVertex(space, current, mapper, xmls);
!           vertices.put(vertex.getId(), vertex);
!         }
!         space.setVertices(vertices);
        }
!       /*{
!         Iterator iter = xml.getMaterial().iterator();
!         while (iter.hasNext()) {
!           MaterialType current = (MaterialType) iter.next();
!           space.add(internalizeMaterial(current, mapper, xmls));
          }
!       }*/
! 
!       {
!         Iterator iter = xml.getConstructor().iterator();
!         while (iter.hasNext()) {
!           Object current = iter.next();
!           Constructor c = null;
!           if (current instanceof CoordinateSystemType) {
!             c = internalizeCoordinateSystem((CoordinateSystemType)current, mapper, xmls);
!           } else if (current instanceof PointType) {
!             c = internalizePoint((PointType)current, mapper, xmls);
!           } else if (current instanceof LineType) {
!             c = internalizeLine((LineType)current, mapper, xmls);
!           } else {
!             log.info("Const were " + current.getClass());
!           }
!           if (c != null) {
!             Set connected = new HashSet();
!             Iterator cs = ((ConstructorType)current).getConnected().iterator();
!             while (cs.hasNext()) {
!               Long l = (Long)cs.next();
!               Object g = get(l.longValue(), mapper);
!               if (g instanceof Geometric) {
!                 connected.add(g);
!               }
              }
-             c.connect(connected);
-             space.add(c);
            }
          }
        }
-     } else {
-       if (xml.getAnchor() != null) {
-         CoordinateSystem anchor;
-         anchor = internalizeCoordinateSystem(xml.getAnchor(), mapper, xmls);
-         space.setInstanceAnchor(anchor);
-       }
      }
      space.setOwner(owner);
--- 335,411 ----
  
      xmls.add(xml);
! 
!     {
!       HashMap elements = new HashMap();
!       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);
        }
!       space.setElements(elements);
!     }
!     if (empty != 0) {
!       space.setEmpty((Space) mapper.get(new Long(empty)));
!     }
!     { 
!       HashMap surfaces = new HashMap();
!       Iterator iter = xml.getSurface().iterator();
!       while (iter.hasNext()) {
!         SurfaceType current = (SurfaceType) iter.next();
!         Surface surface = internalizeSurface(space, current, mapper, xmls);
!         surfaces.put(surface.getId(), surface);
        }
!       space.setSurfaces(surfaces);
!     }
!     {
!       HashMap edges = new HashMap();
!       Iterator iter = xml.getEdge().iterator();
!       while (iter.hasNext()) {
!         EdgeType current = (EdgeType) iter.next();
!         Edge edge = internalizeEdge(space, current, mapper, xmls);
!         edges.put(edge.getId(), edge);
        }
!       space.setEdges(edges);
!     }
!     {
!       HashMap vertices = new HashMap();
!       Iterator iter = xml.getVertex().iterator();
!       while (iter.hasNext()) {
!         VertexType current = (VertexType) iter.next();
!         Vertex vertex = internalizeVertex(space, current, mapper, xmls);
!         vertices.put(vertex.getId(), vertex);
        }
!       space.setVertices(vertices);
!     }
!     {
!       Iterator iter = xml.getConstructor().iterator();
!       while (iter.hasNext()) {
!         Object current = iter.next();
!         Constructor c = null;
!         if (current instanceof CoordinateSystemType) {
!           c = internalizeCoordinateSystem((CoordinateSystemType)current, mapper, xmls);
!         } else if (current instanceof PointType) {
!           c = internalizePoint((PointType)current, mapper, xmls);
!         } else if (current instanceof LineType) {
!           c = internalizeLine((LineType)current, mapper, xmls);
!         } else {
!           log.info("Const were " + current.getClass());
          }
!         if (c != null) {
!           Set connected = new HashSet();
!           Iterator cs = ((ConstructorType)current).getConnected().iterator();
!           while (cs.hasNext()) {
!             Long l = (Long)cs.next();
!             Object g = get(l.longValue(), mapper);
!             if (g instanceof Geometric) {
!               connected.add(g);
              }
            }
+           c.connect(connected);
+           space.add(c);
          }
        }
      }
      space.setOwner(owner);
***************
*** 742,745 ****
--- 759,763 ----
    private static void internalizeReferences(Space object, SpaceType xml, Map map) {
      object.setProto((Space) get(xml.getProtoref(), map));
+     
      object.setEnvelope(asSet(xml.getBoundary(), map));
      {
***************
*** 1000,1010 ****
          }
        }
-       /*{
-         Iterator iter = space.getMaterials().iterator();
-         while (iter.hasNext()) {
-           Material current = (Material) iter.next();
-           xml.getMaterial().add(externalizeMaterial(current, map));
-         }
-       }*/
        {
          Iterator iter = space.getConstructors().iterator();
--- 1018,1021 ----