[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.26, 1.27

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

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

Modified Files:
	Persistence.java 
Log Message:
Order is preserved for the basic geometry

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Persistence.java	28 Nov 2006 10:06:34 -0000	1.26
--- Persistence.java	4 Dec 2006 14:41:55 -0000	1.27
***************
*** 744,748 ****
        //Only save geometry if space isn't a instance
        {
!         Iterator iter = space.getElements().iterator();
          while (iter.hasNext()) {
            Space current = (Space) iter.next();
--- 744,750 ----
        //Only save geometry if space isn't a instance
        {
!         List elements = new LinkedList(space.getElements());
!         Entity.sort(elements);
!         Iterator iter = elements.iterator();
          while (iter.hasNext()) {
            Space current = (Space) iter.next();
***************
*** 751,755 ****
        }
        {
!         Iterator iter = space.getSurfaces().iterator();
          while (iter.hasNext()) {
            Surface current = (Surface) iter.next();
--- 753,759 ----
        }
        {
!         List surfaces = new LinkedList(space.getSurfaces());
!         Entity.sort(surfaces);
!         Iterator iter = surfaces.iterator();
          while (iter.hasNext()) {
            Surface current = (Surface) iter.next();
***************
*** 758,762 ****
        }
        {
!         Iterator iter = space.getEdges().iterator();
          while (iter.hasNext()) {
            Edge current = (Edge) iter.next();
--- 762,768 ----
        }
        {
!         List edges = new LinkedList(space.getEdges());
!         Entity.sort(edges);
!         Iterator iter = edges.iterator();
          while (iter.hasNext()) {
            Edge current = (Edge) iter.next();
***************
*** 765,769 ****
        }
        {
!         Iterator iter = space.getVertices().iterator();
          while (iter.hasNext()) {
            Vertex current = (Vertex) iter.next();
--- 771,777 ----
        }
        {
!         List vertices = new LinkedList(space.getVertices());
!         Entity.sort(vertices);
!         Iterator iter = vertices.iterator();
          while (iter.hasNext()) {
            Vertex current = (Vertex) iter.next();
***************
*** 1007,1010 ****
--- 1015,1029 ----
    
    /**
+    * Return sorted list (by id) of input collection of Entity
+    * @param entities collection of Entity
+    * @return sorted list of Entity
+    */
+   public static List sorted(Collection entities) {
+     List sorted = new LinkedList(entities);
+     Entity.sort(sorted);
+     return sorted;
+   }
+   
+   /**
     * Externalize references
     * @param object The object
***************
*** 1043,1047 ****
        xml.setProtoref(id(map, object.getProto()));
      }
!     xml.getBoundary().addAll(ids(map, object.getEnvelope()));
    }
    
--- 1062,1066 ----
        xml.setProtoref(id(map, object.getProto()));
      }
!     xml.getBoundary().addAll(ids(map, sorted(object.getEnvelope())));
    }
    
***************
*** 1054,1058 ****
    private static void externalizeReferences(Surface object, SurfaceType xml, Map map) {
      xml.getEdgeref().addAll(ids(map, object.getEdges()));
!     xml.getHole().addAll(ids(map, object.getHoles()));
      xml.setFront(id(map, object.getFrontDomain()));
      xml.setFrontMaterial(id(map, object.getFrontMaterial()));
--- 1073,1077 ----
    private static void externalizeReferences(Surface object, SurfaceType xml, Map map) {
      xml.getEdgeref().addAll(ids(map, object.getEdges()));
!     xml.getHole().addAll(ids(map, sorted(object.getHoles())));
      xml.setFront(id(map, object.getFrontDomain()));
      xml.setFrontMaterial(id(map, object.getFrontMaterial()));