[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.47, 1.48

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

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

Modified Files:
	PopupMenu.java 
Log Message:
Delete

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** PopupMenu.java	19 Oct 2007 10:55:24 -0000	1.47
--- PopupMenu.java	19 Oct 2007 11:24:42 -0000	1.48
***************
*** 23,27 ****
  import net.sourceforge.bprocessor.gui.actions.AttributeMenuAction;
  import net.sourceforge.bprocessor.gui.actions.CollectionMenuAction;
! import net.sourceforge.bprocessor.gui.actions.EntitiesMenuAction;
  import net.sourceforge.bprocessor.gui.actions.EntityMenuAction;
  import net.sourceforge.bprocessor.gui.actions.ModellorMenuAction;
--- 23,27 ----
  import net.sourceforge.bprocessor.gui.actions.AttributeMenuAction;
  import net.sourceforge.bprocessor.gui.actions.CollectionMenuAction;
! import net.sourceforge.bprocessor.gui.actions.GeometricMenuAction;
  import net.sourceforge.bprocessor.gui.actions.EntityMenuAction;
  import net.sourceforge.bprocessor.gui.actions.ModellorMenuAction;
***************
*** 74,78 ****
     */
    public static JPopupMenu getSurfaceMenu(Collection c) {
!     JPopupMenu jm = getEntiesMenu(c);
      if (c.size() == 1) {
        Surface s = (Surface)c.iterator().next();
--- 74,78 ----
     */
    public static JPopupMenu getSurfaceMenu(Collection c) {
!     JPopupMenu jm = getGeometricMenu(c);
      if (c.size() == 1) {
        Surface s = (Surface)c.iterator().next();
***************
*** 238,242 ****
     */
    public static JPopupMenu getSpaceMenu(Collection s) {
!     JPopupMenu pm = PopupMenu.getEntiesMenu(s);
      
      pm.addSeparator();
--- 238,242 ----
     */
    public static JPopupMenu getSpaceMenu(Collection s) {
!     JPopupMenu pm = PopupMenu.getGeometricMenu(s);
      
      pm.addSeparator();
***************
*** 367,371 ****
      Collection c = new LinkedList();
      c.add(e);
!     return getEntiesMenu(c);
    }
  
--- 367,371 ----
      Collection c = new LinkedList();
      c.add(e);
!     return getGeometricMenu(c);
    }
  
***************
*** 391,418 ****
    /**
     * A popupmenu generator for entities
!    * @param entities the entity list to make popup for
     * @return the popupmenu
     */
!   public static JPopupMenu getEntiesMenu(Collection<Geometric> entities) {
      JPopupMenu menu = new JPopupMenu();
!     AbstractAction delete = new EntitiesMenuAction(entities, "Delete Entities") {
        public void actionPerformed(ActionEvent arg0) {
!         if (entities != null) {
!           Selection.primary().clear();
!           for (Entity current : entities) {
!             if (current instanceof Geometric) {
!               ((Geometric)current).erase();
!             } else {
!               current.delete();
!             }
!             Project.getInstance().changed(current);
!           }
!           Project.getInstance().changed(Geometry.collect(entities));
!           Project.getInstance().checkpoint();
          }
        }
      };
      menu.add(delete);
!     AbstractAction allConnected = new EntitiesMenuAction(entities, "All Connected") {
        public void actionPerformed(ActionEvent arg0) {
          Collection<Geometric> geometrics = 
--- 391,413 ----
    /**
     * A popupmenu generator for entities
!    * @param arguments the entity list to make popup for
     * @return the popupmenu
     */
!   public static JPopupMenu getGeometricMenu(Collection<Geometric> arguments) {
      JPopupMenu menu = new JPopupMenu();
!     AbstractAction delete = new GeometricMenuAction(arguments, "Delete") {
        public void actionPerformed(ActionEvent arg0) {
!         Selection.primary().clear();
!         for (Geometric current : entities) {
!           current.erase();
!           Project.getInstance().changed(current);
          }
+         Project.getInstance().changed(Geometry.collect(entities));
+         Project.getInstance().checkpoint();
+ 
        }
      };
      menu.add(delete);
!     AbstractAction allConnected = new GeometricMenuAction(arguments, "All Connected") {
        public void actionPerformed(ActionEvent arg0) {
          Collection<Geometric> geometrics = 
***************
*** 423,427 ****
      menu.add(allConnected);
      
!     AbstractAction simplify = new EntitiesMenuAction(entities, "Simplify Geometry") {
        public void actionPerformed(ActionEvent arg0) {
          Geometry.simplifyGeometry(entities);
--- 418,422 ----
      menu.add(allConnected);
      
!     AbstractAction simplify = new GeometricMenuAction(arguments, "Simplify Geometry") {
        public void actionPerformed(ActionEvent arg0) {
          Geometry.simplifyGeometry(entities);
***************
*** 430,434 ****
      menu.add(simplify);
      
!     AbstractAction makeUnion = new EntitiesMenuAction(entities, "Make Union") {
        public void actionPerformed(ActionEvent e) {
          Collection<Surface> surfaces = new HashSet<Surface>();
--- 425,429 ----
      menu.add(simplify);
      
!     AbstractAction makeUnion = new GeometricMenuAction(arguments, "Make Union") {
        public void actionPerformed(ActionEvent e) {
          Collection<Surface> surfaces = new HashSet<Surface>();
***************
*** 573,577 ****
            type = next;
          } else if (!next.getClass().isInstance(type)) {
!           return PopupMenu.getEntiesMenu(new LinkedList<Geometric>(Selection.primary()));
          } 
        }
--- 568,572 ----
            type = next;
          } else if (!next.getClass().isInstance(type)) {
!           return PopupMenu.getGeometricMenu(new LinkedList<Geometric>(Selection.primary()));
          } 
        }
***************
*** 581,585 ****
          return PopupMenu.getSurfaceMenu(new LinkedList<Geometric>(Selection.primary()));
        } else {
!         return PopupMenu.getEntiesMenu(new LinkedList<Geometric>(Selection.primary()));
        }
      }
--- 576,580 ----
          return PopupMenu.getSurfaceMenu(new LinkedList<Geometric>(Selection.primary()));
        } else {
!         return PopupMenu.getGeometricMenu(new LinkedList<Geometric>(Selection.primary()));
        }
      }