[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.29, 1.30 Space.java, 1.73, 1.74

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

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

Modified Files:
	Geometry.java Space.java 
Log Message:
Small changes to Space.insert(Vertex)

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** Space.java	6 Oct 2006 11:45:49 -0000	1.73
--- Space.java	9 Oct 2006 06:52:34 -0000	1.74
***************
*** 498,504 ****
     * Insert a vertex
     * @param vertex The vertex
     * @return The vertex
     */
!   public Vertex insert(Vertex vertex) {
      add(vertex);
      return vertex;
--- 498,505 ----
     * Insert a vertex
     * @param vertex The vertex
+    * @param split Split edges
     * @return The vertex
     */
!   public Vertex insert(Vertex vertex, boolean split) {
      add(vertex);
      return vertex;

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Geometry.java	6 Oct 2006 11:45:49 -0000	1.29
--- Geometry.java	9 Oct 2006 06:52:34 -0000	1.30
***************
*** 749,760 ****
      Space space = p.getActiveSpace();
      
!     if (vertex.getOwner() != space) {
!       vertex = vertex.copy();
      }
      
      Vertex actual = null;
      {
!       Set vertices = p.getActiveSpace().findByLocation
!         (vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001);
        if (!vertices.isEmpty()) {
          actual = (Vertex) vertices.iterator().next();
--- 749,764 ----
      Space space = p.getActiveSpace();
      
!     if (vertex.getOwner() != null) {
!       if (vertex.getOwner() == space) {
!         return vertex;
!       } else {
!         vertex = vertex.copy();
!       }
      }
      
      Vertex actual = null;
      {
!       Set vertices = 
!         space.findByLocation (vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001);
        if (!vertices.isEmpty()) {
          actual = (Vertex) vertices.iterator().next();
***************
*** 764,778 ****
      if (actual == null) {
        actual = vertex;
!       if (actual.getOwner() == null) {
!         p.getActiveSpace().add(actual);
!         if (split) {
!           Set es = p.getActiveSpace().findEdge(actual);
!           if (es.size() > 0) {
!             Iterator iter = es.iterator();
!             while (iter.hasNext()) {
!               Edge e = (Edge) iter.next();
!               if (!e.getStrippled()) {
!                 e.split(actual);
!               }
              }
            }
--- 768,780 ----
      if (actual == null) {
        actual = vertex;
!       space.add(actual);
!       if (split) {
!         Set es = space.findEdge(actual);
!         if (es.size() > 0) {
!           Iterator iter = es.iterator();
!           while (iter.hasNext()) {
!             Edge e = (Edge) iter.next();
!             if (!e.getStrippled()) {
!               e.split(actual);
              }
            }