[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Grid.java, 1.5, 1.6 Project.java, 1.175, 1.176 Persistence.java, 1.75, 1.76

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32130/src/net/sourceforge/bprocessor/model

Modified Files:
	Grid.java Project.java Persistence.java 
Log Message:


Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** Persistence.java	5 Feb 2008 14:21:08 -0000	1.75
--- Persistence.java	19 May 2009 10:33:45 -0000	1.76
***************
*** 19,22 ****
--- 19,23 ----
  import net.sourceforge.bprocessor.model.xml.EdgeType;
  import net.sourceforge.bprocessor.model.xml.EntityType;
+ import net.sourceforge.bprocessor.model.xml.GridType;
  import net.sourceforge.bprocessor.model.xml.IDTransformType;
  import net.sourceforge.bprocessor.model.xml.IntegerType;
***************
*** 53,56 ****
--- 54,58 ----
  import net.sourceforge.bprocessor.model.xml.impl.DoubleTypeImpl;
  import net.sourceforge.bprocessor.model.xml.impl.EdgeImpl;
+ import net.sourceforge.bprocessor.model.xml.impl.GridTypeImpl;
  import net.sourceforge.bprocessor.model.xml.impl.IDTransformTypeImpl;
  import net.sourceforge.bprocessor.model.xml.impl.IntegerTypeImpl;
***************
*** 402,405 ****
--- 404,409 ----
          } else if (current instanceof LineType) {
            c = internalizeLine((LineType)current, mapper, xmls);
+         } else if (current instanceof GridType) { 
+           c = internalizeGrid((GridType) current, mapper, xmls);
          } else {
            log.info("Const were " + current.getClass());
***************
*** 565,568 ****
--- 569,584 ----
    }
    
+   private static Grid internalizeGrid(GridType xml, Map mapper, Collection xmls) {
+     Grid res = new Grid();
+     res.setActive(xml.isActive());
+     res.setDistance(xml.getDistance());
+     res.setSize(xml.getSize());
+     res.setId(xml.getProgid());
+     mapper.put(xml.getId(), res);
+     res.setOrigin(internalizeVertex(null, xml.getVertex(), new HashMap(), new LinkedList()));
+     xmls.add(xml);
+     return res;
+   }
+   
    /**
     * 
***************
*** 1170,1173 ****
--- 1186,1191 ----
      } else if (constructor instanceof CoordinateSystem) {
        return externalizeCoordinateSystem((CoordinateSystem)constructor, map);
+     } else if (constructor instanceof Grid) {
+       return externalizeGrid((Grid) constructor, map);
      } else {
        log.error(constructor + " were of unknown type");
***************
*** 1223,1226 ****
--- 1241,1259 ----
      return xml;
    }
+   
+   private static GridType externalizeGrid(Grid grid, Map map) {
+     GridType xml = new GridTypeImpl();
+     xml.setId(counter++);
+     
+     xml.setProgid(grid.getId());
+     xml.setActive(grid.isActive());
+     xml.setDistance((float) grid.getDistance());
+     xml.setSize((float) grid.getSize());
+     
+     xml.setVertex(externalizeVertex(grid.getOrigin(), new HashMap()));
+     
+     map.put(grid, xml);
+     return xml;
+   }
  
    /**

Index: Grid.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Grid.java	18 May 2009 07:10:22 -0000	1.5
--- Grid.java	19 May 2009 10:33:45 -0000	1.6
***************
*** 15,19 ****
  public class Grid extends Constructor {
    private double size;
!   private double delta;
  
    /**
--- 15,19 ----
  public class Grid extends Constructor {
    private double size;
!   private double distance;
  
    /**
***************
*** 24,28 ****
      super(new Vertex(0, 0, 0));
      size = 40.0;
!     delta = 1.0;
    }
    
--- 24,28 ----
      super(new Vertex(0, 0, 0));
      size = 40.0;
!     distance = 1.0;
    }
    
***************
*** 31,37 ****
     * @return size
     */
!   public double size() {
      return size;
    }
  
    /**
--- 31,45 ----
     * @return size
     */
!   public double getSize() {
      return size;
    }
+   
+   /**
+    * 
+    * @param value new size
+    */
+   public void setSize(double value) {
+     size = value;
+   }
  
    /**
***************
*** 39,44 ****
     * @return delta
     */
!   public double delta() {
!     return delta;
    }
  
--- 47,60 ----
     * @return delta
     */
!   public double getDistance() {
!     return distance;
!   }
!   
!   /**
!    * 
!    * @param value new distance
!    */
!   public void setDistance(double value) {
!     distance = value;
    }
  
***************
*** 52,56 ****
      LinkedList<Attribute> attributes = new LinkedList();
      attributes.add(new Attribute("Size", new Double(size)));
!     attributes.add(new Attribute("Distance", new Double(delta)));
      return attributes;
    }
--- 68,72 ----
      LinkedList<Attribute> attributes = new LinkedList();
      attributes.add(new Attribute("Size", new Double(size)));
!     attributes.add(new Attribute("Distance", new Double(distance)));
      return attributes;
    }
***************
*** 62,66 ****
          size = (Double)(current.getValue());
        } else if (current.getName().equals("Distance")) {
!         delta = (Double)(current.getValue());
        }
      }
--- 78,82 ----
          size = (Double)(current.getValue());
        } else if (current.getName().equals("Distance")) {
!         distance = (Double)(current.getValue());
        }
      }

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** Project.java	19 May 2009 07:02:59 -0000	1.175
--- Project.java	19 May 2009 10:33:45 -0000	1.176
***************
*** 318,322 ****
      super();
      staticObservers = new LinkedList();
!     initialize();
    }
    
--- 318,322 ----
      super();
      staticObservers = new LinkedList();
!     reset();
    }
    
***************
*** 332,338 ****
      scheduledObservers = new LinkedList();
      
-     undoStack = new Stack();
-     redoStack = new Stack();
-     
      catalog = new LinkedList();
      
--- 332,335 ----
***************
*** 383,386 ****
--- 380,392 ----
  
    /**
+    * Reset everything
+    */
+   public void reset() {
+     clear();
+     undoStack = new Stack();
+     redoStack = new Stack();
+   }
+   
+   /**
     * Clear all objects
     */
***************
*** 901,905 ****
    public void load(File file) throws Exception {
      Selection.primary().clear();
!     clear();
      Persistence.load(file);
      makeClean();
--- 907,911 ----
    public void load(File file) throws Exception {
      Selection.primary().clear();
!     reset();
      Persistence.load(file);
      makeClean();
***************
*** 915,919 ****
    public void close() {
      Selection.primary().clear();
!     this.clear();
    }
  
--- 921,925 ----
    public void close() {
      Selection.primary().clear();
!     reset();
    }