[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool FinalMoveTool.java, 1.8, 1.9

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29498/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	FinalMoveTool.java 
Log Message:
Implemented copy using the alt key in the new move tool

Index: FinalMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FinalMoveTool.java	29 May 2007 12:39:13 -0000	1.8
--- FinalMoveTool.java	29 May 2007 13:23:01 -0000	1.9
***************
*** 12,15 ****
--- 12,16 ----
  import java.util.Collection;
  import java.util.HashMap;
+ import java.util.HashSet;
  import java.util.LinkedList;
  import java.util.Map;
***************
*** 20,26 ****
--- 21,30 ----
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Geometry;
+ import net.sourceforge.bprocessor.model.Mesh;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
+ import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
+ import net.sourceforge.bprocessor.model.Space;
  
  /**
***************
*** 130,133 ****
--- 134,139 ----
            copied.add(current.copy(map));
          }
+         geometrics = copied;
+         Project.getInstance().getActiveSpace().addProtected(geometrics);
        }
  
***************
*** 141,145 ****
      } else {
        Geometric geometric = affected.iterator().next();
!       geometric.getOwner().simplify();
        Project.getInstance().checkpoint();
        cleanUp();
--- 147,172 ----
      } else {
        Geometric geometric = affected.iterator().next();
!       Space owner = geometric.getOwner();
!       if (copy) {
!         owner.removeProtected(geometrics);
!         Collection<Vertex> vertices = new HashSet();
!         Collection<Edge> edges = new HashSet();
!         Collection<Surface> surfaces = new HashSet();
!         for (Geometric current : geometrics) {
!           if (current instanceof Surface) {
!             surfaces.add((Surface) current);
!           } else if (current instanceof Edge) {
!             edges.add((Edge) current);
!           } else if (current instanceof Vertex) {
!             vertices.add((Vertex) current);
!           }
!         }
!         edges.addAll(Surface.edges(surfaces));
!         vertices.addAll(Edge.vertices(edges));
!         Mesh mesh = new Mesh(surfaces, edges, vertices);
!         owner.insert(mesh);
!         geometrics = null;
!       }
!       owner.simplify();
        Project.getInstance().checkpoint();
        cleanUp();
***************
*** 152,155 ****
--- 179,187 ----
    public void cleanUp() {
      super.cleanUp();
+     if (copy) {
+       if (geometrics != null) {
+         Project.getInstance().getActiveSpace().removeProtected(geometrics);
+       }
+     }
      geometrics = null;
      affected = null;