[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.68, 1.69

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

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

Modified Files:
	PopupMenu.java 
Log Message:
new implementation of make union

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** PopupMenu.java	8 Nov 2007 09:19:58 -0000	1.68
--- PopupMenu.java	9 Nov 2007 13:58:45 -0000	1.69
***************
*** 10,14 ****
  import java.util.Collection;
  import java.util.HashMap;
- import java.util.HashSet;
  import java.util.Iterator;
  import java.util.LinkedList;
--- 10,13 ----
***************
*** 54,58 ****
    private static final boolean CHECKS = false;
    
-   private static final boolean GROUPS = true;
    /**
     * make a popup menu for a surface
--- 53,56 ----
***************
*** 336,358 ****
      menu.add(simplify);
      
!     AbstractAction makeUnion = new GeometricMenuAction(arguments, "Make Union") {
!       public void actionPerformed(ActionEvent e) {
!         Collection<Space> interior = new HashSet<Space>();
!         Space owner = null;
!         
!         for (Entity ent : entities) {
!           if (ent instanceof Space) {
!             interior.add((Space) ent);
!           }
!         }
! 
!         Space.makeUnion(interior);
!         Project.getInstance().changed(owner);
!         Project.getInstance().checkpoint();
!       }
!     };
!     menu.add(makeUnion);
!     if (GROUPS) {
!       AbstractAction action = new GeometricMenuAction(arguments, "Group") {
          public void actionPerformed(ActionEvent event) {
            Mesh mesh = new Mesh(entities);
--- 334,339 ----
      menu.add(simplify);
      
!     {
!       AbstractAction action = new GeometricMenuAction(arguments, "Make Union") {
          public void actionPerformed(ActionEvent event) {
            Mesh mesh = new Mesh(entities);