[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.92, 1.93 Persistence.java, 1.16, 1.17 Entity.java, 1.9, 1.10

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

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

Modified Files:
	Space.java Persistence.java Entity.java 
Log Message:
Fixed a few style errors
Refactored persistence-code

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Persistence.java	24 Oct 2006 20:40:48 -0000	1.16
--- Persistence.java	6 Nov 2006 11:00:54 -0000	1.17
***************
*** 100,104 ****
      Collection xmls = new LinkedList();
  
!     Space world = internalizeSpace((SpaceType) document.getSpace().iterator().next(), mapper, xmls);
      
      {
--- 100,105 ----
      Collection xmls = new LinkedList();
  
!     Space world = internalizeSpace(null, 
!       (SpaceType) document.getSpace().iterator().next(), mapper, xmls);
      
      {
***************
*** 143,147 ****
    
    /**
!    * 
     * @param xml The SpaceType
     * @param mapper The mapper
--- 144,148 ----
    
    /**
!    * @param owner Space
     * @param xml The SpaceType
     * @param mapper The mapper
***************
*** 149,155 ****
     * @return The Space
     */
!   private static Space internalizeSpace(SpaceType xml, Map mapper, Collection xmls) {
      String name = xml.getName();
-     Collection elements = new LinkedList();
      int type = xml.getType();
      int level = xml.getLevel();
--- 150,156 ----
     * @return The Space
     */
!   private static Space internalizeSpace(Space owner, SpaceType xml, 
!       Map mapper, Collection xmls) {
      String name = xml.getName();
      int type = xml.getType();
      int level = xml.getLevel();
***************
*** 169,212 ****
      xmls.add(xml);
      {
        Iterator iter = xml.getSpace().iterator();
        while (iter.hasNext()) {
          SpaceType current = (SpaceType) iter.next();
!         elements.add(internalizeSpace(current, mapper, xmls));
        }
      }
-     Space e = null;
      if (empty != 0) {
!       e = (Space) mapper.get(new Long(empty));
!       space.setEmpty(e);
!     }
!     {
!       Iterator iter = elements.iterator();
!       while (iter.hasNext()) {
!         Space current = (Space) iter.next();
!         if (current != e) {
!           space.add(current);
!         }
!       }
      }
!     {
        Iterator iter = xml.getSurface().iterator();
        while (iter.hasNext()) {
          SurfaceType current = (SurfaceType) iter.next();
!         space.add(internalizeSurface(current, mapper, xmls));
        }
      }
      {
        Iterator iter = xml.getEdge().iterator();
        while (iter.hasNext()) {
          EdgeType current = (EdgeType) iter.next();
!         space.add(internalizeEdge(current, mapper, xmls));
        }
      }
      {
        Iterator iter = xml.getVertex().iterator();
        while (iter.hasNext()) {
          VertexType current = (VertexType) iter.next();
!         space.add(internalizeVertex(current, mapper, xmls));
        }
      }
      {
--- 170,214 ----
      xmls.add(xml);
      {
+       HashMap elements = new HashMap();
        Iterator iter = xml.getSpace().iterator();
        while (iter.hasNext()) {
          SpaceType current = (SpaceType) iter.next();
!         Space element = internalizeSpace(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);
      }
      {
***************
*** 250,253 ****
--- 252,256 ----
        }
      }
+     space.setOwner(owner);
      return space;
    }
***************
*** 349,353 ****
      res.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), res);
!     res.setOrigin(internalizeVertex(xml.getVertex(), new HashMap(), new LinkedList()));
      xmls.add(xml);
      return res;
--- 352,356 ----
      res.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), res);
!     res.setOrigin(internalizeVertex(null, xml.getVertex(), new HashMap(), new LinkedList()));
      xmls.add(xml);
      return res;
***************
*** 364,368 ****
          Map mapper, Collection xmls) {
      Line res = new Line();
!     res.setDirection(internalizeVertex(
            (VertexType)((LineType)xml).getDirection().getVertex().get(0), 
            new HashMap(), new LinkedList()));
--- 367,371 ----
          Map mapper, Collection xmls) {
      Line res = new Line();
!     res.setDirection(internalizeVertex(null,
            (VertexType)((LineType)xml).getDirection().getVertex().get(0), 
            new HashMap(), new LinkedList()));
***************
*** 371,375 ****
      res.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), res);
!     res.setOrigin(internalizeVertex(xml.getVertex(), new HashMap(), new LinkedList()));
      xmls.add(xml);
      return res;
--- 374,378 ----
      res.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), res);
!     res.setOrigin(internalizeVertex(null, xml.getVertex(), new HashMap(), new LinkedList()));
      xmls.add(xml);
      return res;
***************
*** 389,395 ****
      res.onlyPlane(cst.isOnlyplane());
      List ijn = cst.getIjn().getVertex();
!     Vertex i = internalizeVertex((VertexType)ijn.get(0), new HashMap(), new LinkedList());
!     Vertex j = internalizeVertex((VertexType)ijn.get(1), new HashMap(), new LinkedList());
!     Vertex n = internalizeVertex((VertexType)ijn.get(2), new HashMap(), new LinkedList());
      res.setIJN(i, j, n);
      res.setActive(xml.isActive());
--- 392,398 ----
      res.onlyPlane(cst.isOnlyplane());
      List ijn = cst.getIjn().getVertex();
!     Vertex i = internalizeVertex(null, (VertexType)ijn.get(0), new HashMap(), new LinkedList());
!     Vertex j = internalizeVertex(null, (VertexType)ijn.get(1), new HashMap(), new LinkedList());
!     Vertex n = internalizeVertex(null, (VertexType)ijn.get(2), new HashMap(), new LinkedList());
      res.setIJN(i, j, n);
      res.setActive(xml.isActive());
***************
*** 397,401 ****
      res.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), res);
!     res.setOrigin(internalizeVertex(xml.getVertex(), new HashMap(), new LinkedList()));
      xmls.add(xml);
      return res;
--- 400,404 ----
      res.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), res);
!     res.setOrigin(internalizeVertex(null, xml.getVertex(), new HashMap(), new LinkedList()));
      xmls.add(xml);
      return res;
***************
*** 404,407 ****
--- 407,411 ----
    /**
     * 
+    * @param owner Space
     * @param xml The SurfaceType
     * @param mapper The mapper
***************
*** 409,422 ****
     * @return The Surface
     */
!   private static Surface internalizeSurface(SurfaceType xml, Map mapper, Collection xmls) {
      Surface surface = new Surface();
      surface.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), surface);
      xmls.add(xml);
      return surface;
    }
    
    /**
!    * 
     * @param xml The EdgeType
     * @param mapper The mapper
--- 413,428 ----
     * @return The Surface
     */
!   private static Surface internalizeSurface(Space owner, SurfaceType xml,
!       Map mapper, Collection xmls) {
      Surface surface = new Surface();
      surface.setId(new Long(xml.getProgid()));
      mapper.put(new Long(xml.getId()), surface);
      xmls.add(xml);
+     surface.setOwner(owner);
      return surface;
    }
    
    /**
!    * @param owner Space
     * @param xml The EdgeType
     * @param mapper The mapper
***************
*** 424,428 ****
     * @return The Edge
     */
!   private static Edge internalizeEdge(EdgeType xml, Map mapper, Collection xmls) {
      Edge edge = new Edge();
      edge.setId(new Long(xml.getProgid()));
--- 430,434 ----
     * @return The Edge
     */
!   private static Edge internalizeEdge(Space owner, EdgeType xml, Map mapper, Collection xmls) {
      Edge edge = new Edge();
      edge.setId(new Long(xml.getProgid()));
***************
*** 430,438 ****
      xmls.add(xml);
      edge.setStrippled(xml.isConstructor());
      return edge;
    }
    
    /**
!    * 
     * @param xml The VertexType
     * @param mapper The mapper
--- 436,445 ----
      xmls.add(xml);
      edge.setStrippled(xml.isConstructor());
+     edge.setOwner(owner);
      return edge;
    }
    
    /**
!    * @param owner Space
     * @param xml The VertexType
     * @param mapper The mapper
***************
*** 440,444 ****
     * @return The Vertex
     */
!   private static Vertex internalizeVertex(VertexType xml, Map mapper, Collection xmls) {
      Vertex vertex = new Vertex();
      if (xml.getProgid() != 0) {
--- 447,452 ----
     * @return The Vertex
     */
!   private static Vertex internalizeVertex(Space owner, VertexType xml,
!       Map mapper, Collection xmls) {
      Vertex vertex = new Vertex();
      if (xml.getProgid() != 0) {
***************
*** 450,453 ****
--- 458,462 ----
      vertex.setY(xml.getY());
      vertex.setZ(xml.getZ());
+     vertex.setOwner(owner);
      return vertex;
    }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** Space.java	2 Nov 2006 14:45:38 -0000	1.92
--- Space.java	6 Nov 2006 11:00:54 -0000	1.93
***************
*** 361,371 ****
     */
    public void setEmpty(Space element) {
-     if (empty != null) {
-       remove(empty);
-     }
      empty = element;
-     if (empty != null) {
-       add(empty);
-     }
    }
    
--- 361,365 ----
***************
*** 1163,1166 ****
--- 1157,1196 ----
      this.envelope = surfaces;
    }
+   
+   /**
+    * Set the vertices
+    * @param vertices HashMap
+    */
+   public void setVertices(HashMap vertices) {
+     this.vertices = vertices;
+     nextVertexId = Entity.maxId(vertices.values()) + 1;
+   }
+   
+   /**
+    * Set the edges
+    * @param edges HashMap
+    */
+   public void setEdges(HashMap edges) {
+     this.edges = edges;
+     nextEdgeId = Entity.maxId(edges.values()) + 1;
+   }
+   
+   /**
+    * Set the surfaces
+    * @param surfaces HashMap
+    */
+   public void setSurfaces(HashMap surfaces) {
+     this.surfaces = surfaces;
+     nextSurfaceId = Entity.maxId(surfaces.values()) + 1;
+   }
+   
+   /**
+    * Set the elements
+    * @param elements HashMap
+    */
+   public void setElements(HashMap elements) {
+     this.elements = elements;
+     nextElementId = Entity.maxId(elements.values());
+   }
  
    /**
***************
*** 1170,1174 ****
    public void addSurface(Surface surface) {
      envelope.add(surface);
-     //changed();
    }
  
--- 1200,1203 ----
***************
*** 1179,1183 ****
    public void removeSurface(Surface surface) {
      envelope.remove(surface);
-     //changed();
    }
  
--- 1208,1211 ----

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Entity.java	9 Aug 2006 15:14:58 -0000	1.9
--- Entity.java	6 Nov 2006 11:00:54 -0000	1.10
***************
*** 8,11 ****
--- 8,13 ----
  
  import java.io.Serializable;
+ import java.util.Collection;
+ import java.util.Iterator;
  
  /**
***************
*** 15,18 ****
--- 17,39 ----
    /** The id */
    protected Long id;
+   
+   /**
+    * Find the maximum id of entities in the collection
+    * @param entities Collection of entities
+    * @return max id
+    */
+   public static long maxId(Collection entities) {
+     long value = 0;
+     Iterator iter = entities.iterator();
+     while (iter.hasNext()) {
+       Entity current = (Entity) iter.next();
+       if (current.getId() != null) {
+         if (current.getId().longValue() > value) {
+           value = current.getId().longValue();
+         }
+       }
+     }
+     return value;
+   }
  
    /**