[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.219, 1.220 Persistence.java, 1.67, 1.68

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

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

Modified Files:
	Space.java Persistence.java 
Log Message:
another step in instance/container refactor

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** Persistence.java	12 Dec 2007 12:48:23 -0000	1.67
--- Persistence.java	12 Dec 2007 14:12:11 -0000	1.68
***************
*** 125,129 ****
      Collection xmls = new LinkedList();
  
!     Space world = internalizeSpace(null, 
        (SpaceType) document.getSpace().iterator().next(), mapper, xmls);
      
--- 125,129 ----
      Collection xmls = new LinkedList();
  
!     Space world = internalizeContainer(null, 
        (SpaceType) document.getSpace().iterator().next(), mapper, xmls);
      
***************
*** 262,266 ****
        return internalizeInstance(owner, type, mapper, xmls);
      } else {
!       return internalizeSpace(owner, type, mapper, xmls);
      }
    }
--- 262,266 ----
        return internalizeInstance(owner, type, mapper, xmls);
      } else {
!       return internalizeContainer(owner, type, mapper, xmls);
      }
    }
***************
*** 302,306 ****
     * @return The Space
     */
!   private static Space internalizeSpace(Space owner, SpaceType xml, 
        Map mapper, Collection xmls) {
      
--- 302,306 ----
     * @return The Space
     */
!   private static Container internalizeContainer(Space owner, SpaceType xml, 
        Map mapper, Collection xmls) {
      
***************
*** 317,321 ****
      //space.setContainer(container);
      
!     Space space = new Container(name, type, container);
      
      
--- 317,321 ----
      //space.setContainer(container);
      
!     Container space = new Container(name, type, container);
      
      
***************
*** 668,673 ****
     */
    private static void internalizeReferences(Object object, EntityType xml, Map map) {
!     if (object instanceof Space) {
!       internalizeReferences((Space) object, (SpaceType) xml, map);
      } else if (object instanceof Surface) {
        internalizeReferences((Surface) object, (SurfaceType) xml, map);
--- 668,675 ----
     */
    private static void internalizeReferences(Object object, EntityType xml, Map map) {
!     if (object instanceof Container) {
!       internalizeReferences((Container) object, (SpaceType) xml, map);
!     } else if (object instanceof Instance) {
!       internalizeReferences((Instance) object, (SpaceType) xml, map);
      } else if (object instanceof Surface) {
        internalizeReferences((Surface) object, (SurfaceType) xml, map);
***************
*** 755,761 ****
     * @param map The map
     */
!   private static void internalizeReferences(Space object, SpaceType xml, Map map) {
!     object.setProto((Space) get(xml.getProtoref(), map));
!     
      object.setEnvelope(asSet(xml.getBoundary(), map));
      {
--- 757,761 ----
     * @param map The map
     */
!   private static void internalizeReferences(Container object, SpaceType xml, Map map) {
      object.setEnvelope(asSet(xml.getBoundary(), map));
      {
***************
*** 771,774 ****
--- 771,785 ----
     * @param map The map
     */
+   private static void internalizeReferences(Instance object, SpaceType xml, Map map) {
+     object.setProto((Space) get(xml.getProtoref(), map));
+   }
+   
+   
+   /**
+    * 
+    * @param object The object
+    * @param xml The xml
+    * @param map The map
+    */
    private static void internalizeReferences(Surface object, SurfaceType xml, Map map) {
      object.setEdges(asList(xml.getEdgeref(), map));
***************
*** 1294,1299 ****
     */
    private static void externalizeReferences(Object object, EntityType xml, Map map) {
!     if (object instanceof Space) {
!       externalizeReferences((Space) object, (SpaceType) xml, map);
      } else if (object instanceof Surface) {
        externalizeReferences((Surface) object, (SurfaceType) xml, map);
--- 1305,1312 ----
     */
    private static void externalizeReferences(Object object, EntityType xml, Map map) {
!     if (object instanceof Container) {
!       externalizeReferences((Container) object, (SpaceType) xml, map);
!     } else if (object instanceof Instance) {
!       externalizeReferences((Instance) object, (SpaceType) xml, map);
      } else if (object instanceof Surface) {
        externalizeReferences((Surface) object, (SurfaceType) xml, map);
***************
*** 1317,1321 ****
     * @param map The map
     */
!   private static void externalizeReferences(Space object, SpaceType xml, Map map) {
      if (object.getEmpty() != null) {
        xml.setVoidref(id(map, object.getEmpty()));
--- 1330,1347 ----
     * @param map The map
     */
!   private static void externalizeReferences(Container object, SpaceType xml, Map map) {
!     if (object.getEmpty() != null) {
!       xml.setVoidref(id(map, object.getEmpty()));
!     }
!     xml.getBoundary().addAll(ids(map, sorted(object.getEnvelope())));
!   }
!   
!   /**
!    * Externalize references
!    * @param object The object
!    * @param xml The xml entity
!    * @param map The map
!    */
!   private static void externalizeReferences(Instance object, SpaceType xml, Map map) {
      if (object.getEmpty() != null) {
        xml.setVoidref(id(map, object.getEmpty()));
***************
*** 1324,1330 ****
        xml.setProtoref(id(map, object.getProto()));
      }
-     xml.getBoundary().addAll(ids(map, sorted(object.getEnvelope())));
    }
    
    /**
     * Externalize references
--- 1350,1356 ----
        xml.setProtoref(id(map, object.getProto()));
      }
    }
    
+   
    /**
     * Externalize references
***************
*** 1691,1695 ****
      lo.setLocked(lot.isLocked());
      lo.setId(lot.getProgid());
!     lo.setSpace(internalizeSpace(null, lot.getSpace(), map, xmls));
      return lo;
    }
--- 1717,1721 ----
      lo.setLocked(lot.isLocked());
      lo.setId(lot.getProgid());
!     lo.setSpace(internalizeContainer(null, lot.getSpace(), map, xmls));
      return lo;
    }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.219
retrieving revision 1.220
diff -C2 -d -r1.219 -r1.220
*** Space.java	12 Dec 2007 12:48:23 -0000	1.219
--- Space.java	12 Dec 2007 14:12:11 -0000	1.220
***************
*** 549,557 ****
        return vertices.values();
      } else {
!       if (proto != null) {
!         return proto.getVertices();
!       } else {
!         return Collections.emptyList();
!       }
      }
    }
--- 549,553 ----
        return vertices.values();
      } else {
!       return Collections.emptyList();
      }
    }
***************
*** 678,686 ****
        return edges.values();
      } else {
!       if (proto != null) {
!         return proto.getEdges();
!       } else {
!         return Collections.emptyList();
!       }
      }
    }
--- 674,678 ----
        return edges.values();
      } else {
!       return Collections.emptyList();
      }
    }
***************
*** 793,801 ****
        return surfaces.values();
      } else {
!       if (proto != null) {
!         return proto.getSurfaces();
!       } else {
!         return Collections.emptyList();
!       }
      }
    }
--- 785,789 ----
        return surfaces.values();
      } else {
!       return Collections.emptyList();
      }
    }
***************
*** 1123,1131 ****
        return elements.values();
      } else {
!       if (proto != null) {
!         return proto.getElements();
!       } else {
!         return Collections.EMPTY_LIST;
!       }
      }
    }
--- 1111,1115 ----
        return elements.values();
      } else {
!       return Collections.EMPTY_LIST;
      }
    }
***************
*** 1296,1300 ****
    /** {@inheritDoc} */
    public String getGeneralName() {
!     if (proto != null) {
        return "Instance";
      }
--- 1280,1284 ----
    /** {@inheritDoc} */
    public String getGeneralName() {
!     if (isInstance()) {
        return "Instance";
      }