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-serv15919/src/net/sourceforge/bprocessor/model

Modified Files:
	Space.java Geometric.java 
Log Message:
Added a protect flag to geometric

Index: Geometric.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometric.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Geometric.java	11 Sep 2006 14:58:17 -0000	1.12
--- Geometric.java	13 Oct 2006 07:54:58 -0000	1.13
***************
*** 19,22 ****
--- 19,25 ----
    private Space owner;
    
+   /** protected */
+   private boolean protect;
+   
    /**
     * Get the mesh
***************
*** 59,62 ****
--- 62,81 ----
    
    /**
+    * Set the protect flag
+    * @param value protect flag
+    */
+   public void protect(boolean value) {
+     this.protect = value;
+   }
+   
+   /**
+    * Get the protect flag
+    * @return protect flag
+    */
+   public boolean protect() {
+     return protect;
+   }
+   
+   /**
     * Collects the set of vertices in this geometric
     * @return the set of vertices

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** Space.java	11 Oct 2006 13:27:59 -0000	1.77
--- Space.java	13 Oct 2006 07:54:58 -0000	1.78
***************
*** 516,520 ****
          space.findByLocation (vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001);
        if (!vertices.isEmpty()) {
!         actual = (Vertex) vertices.iterator().next();
        }
      }
--- 516,526 ----
          space.findByLocation (vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001);
        if (!vertices.isEmpty()) {
!         Iterator iter = vertices.iterator();
!         while (iter.hasNext()) {
!           Vertex current = (Vertex) iter.next();
!           if (!current.protect()) {
!             actual = current;
!           }
!         }
        }
      }
***************
*** 529,533 ****
            while (iter.hasNext()) {
              Edge e = (Edge) iter.next();
!             if (!e.getStrippled()) {
                e.split(actual);
              }
--- 535,539 ----
            while (iter.hasNext()) {
              Edge e = (Edge) iter.next();
!             if (!e.getStrippled() && !e.protect()) {
                e.split(actual);
              }
***************
*** 633,643 ****
        while (iter.hasNext()) {
          Edge current = (Edge) iter.next();
!         if (current.getFrom() == edge.getFrom() && current.getTo() == edge.getTo()) {
!           actual = current;
!           break;
!         }
!         if (current.getFrom() == edge.getTo() && current.getTo() == edge.getFrom()) {
!           actual = current;
!           break;
          }
        }
--- 639,651 ----
        while (iter.hasNext()) {
          Edge current = (Edge) iter.next();
!         if (!current.protect()) {
!           if (current.getFrom() == edge.getFrom() && current.getTo() == edge.getTo()) {
!             actual = current;
!             break;
!           }
!           if (current.getFrom() == edge.getTo() && current.getTo() == edge.getFrom()) {
!             actual = current;
!             break;
!           }
          }
        }