bprocessor-commit

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

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

Modified Files:
	SpaceTool.java 
Log Message:
All connected also selects spaces interior to the selection
Keyboard delete now also deletes selected spaces

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** SpaceTool.java	16 May 2007 07:37:56 -0000	1.79
--- SpaceTool.java	14 Jun 2007 09:36:17 -0000	1.80
***************
*** 12,21 ****
  import java.awt.event.ActionListener;
  import java.awt.event.MouseEvent;
- import java.util.ArrayList;
  import java.util.Collection;
  import java.util.HashSet;
  import java.util.Iterator;
  import java.util.LinkedList;
- import java.util.List;
  import java.util.Stack;
  
--- 12,19 ----
***************
*** 29,34 ****
  import net.sourceforge.bprocessor.gui.PopupMenu;
  import net.sourceforge.bprocessor.gui.actions.SpaceMenuAction;
- import net.sourceforge.bprocessor.model.ClippingPlane;
- import net.sourceforge.bprocessor.model.Constructor;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;
--- 27,30 ----
***************
*** 446,472 ****
    @Override
    public void remove() {
!     Iterator it = Selection.primary().iterator();
!     List<Geometric> edges = new ArrayList<Geometric>();
!     List<Geometric> vertices = new ArrayList<Geometric>();
!     List<Geometric> surfaces = new ArrayList<Geometric>();
!     while (it.hasNext()) {
!       Object selected = it.next();
!       if (selected instanceof Surface) {
!         surfaces.add((Surface)selected);
!       } else if (selected instanceof Edge) {
!         edges.add((Edge)selected);
!       } else if (selected instanceof Vertex) {
!         vertices.add((Vertex) selected);
!       } else if (selected instanceof ClippingPlane) {
!         ((ClippingPlane)selected).delete();
!       } else if (selected instanceof Constructor) {
!         ((Constructor)selected).delete();
!       }
      }
      Selection.primary().clear();
      glv.getView().makeTarget(null);
-     Project.getInstance().delete(surfaces);
-     Project.getInstance().delete(edges);
-     Project.getInstance().delete(vertices);
      Project.getInstance().changed(Project.getInstance().getActiveSpace());
      Project.getInstance().checkpoint();
--- 442,450 ----
    @Override
    public void remove() {
!     for (Geometric current : Selection.primary()) {
!       current.delete();
      }
      Selection.primary().clear();
      glv.getView().makeTarget(null);
      Project.getInstance().changed(Project.getInstance().getActiveSpace());
      Project.getInstance().checkpoint();