bprocessor-commit

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

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

Modified Files:
	Space.java Mesh.java 
Log Message:
More work on grouping

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** Space.java	5 Nov 2007 18:10:29 -0000	1.200
--- Space.java	6 Nov 2007 15:29:02 -0000	1.201
***************
*** 1540,1544 ****
     * @return new space
     */
!   public Space simpleCopy() {
      Space copy = new Space();
      copy.classification = classification;
--- 1540,1544 ----
     * @return new space
     */
!   public Space shallowCopy() {
      Space copy = new Space();
      copy.classification = classification;
***************
*** 1546,1549 ****
--- 1546,1553 ----
      copy.description = description;
      copy.name = name;
+     copy.isNet = isNet;
+     copy.isUnion = isUnion;
+     copy.transparent = transparent;
+     copy.type = type;
      return copy;
    }

Index: Mesh.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Mesh.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Mesh.java	6 Nov 2007 14:02:35 -0000	1.23
--- Mesh.java	6 Nov 2007 15:29:02 -0000	1.24
***************
*** 42,45 ****
--- 42,46 ----
      this.edges = edges;
      this.vertices = vertices;
+     this.elements = new LinkedList();
    }
    
***************
*** 252,255 ****
--- 253,257 ----
    }
    
+   
    /**
     * Returns a copy of this mesh
***************
*** 257,261 ****
     * @return copy of this Mesh
     */
!   public Mesh copy(Map map) {
      Collection<Vertex> vs = new LinkedList();
      Collection<Edge> es = new LinkedList();
--- 259,263 ----
     * @return copy of this Mesh
     */
!   public Mesh copyGeometry(Map map) {
      Collection<Vertex> vs = new LinkedList();
      Collection<Edge> es = new LinkedList();
***************
*** 274,277 ****
--- 276,289 ----
    
    /**
+    * Returns a copy of this mesh
+    * @param map Map
+    * @return copy of this Mesh
+    */
+   public Mesh copy(Map map) {
+     Mesh copy = copyGeometry(map);
+     return copy;
+   }
+   
+   /**
     * Copy and assign original spaces
     * @param map HashMap
***************
*** 279,283 ****
     */
    public Mesh copyAndAssign(Map map) {
!     Mesh copy = copy(map);
      for (Surface current : surfaces) {
        Surface surface = (Surface) map.get(current);
--- 291,295 ----
     */
    public Mesh copyAndAssign(Map map) {
!     Mesh copy = copyGeometry(map);
      for (Surface current : surfaces) {
        Surface surface = (Surface) map.get(current);