[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SpaceTool.java, 1.87, 1.88

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

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

Modified Files:
	SpaceTool.java 
Log Message:
Fixet popup menu logic

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** SpaceTool.java	17 Oct 2007 09:08:19 -0000	1.87
--- SpaceTool.java	19 Oct 2007 10:48:58 -0000	1.88
***************
*** 28,32 ****
  import net.sourceforge.bprocessor.gui.actions.SpaceMenuAction;
  import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Mesh;
--- 28,31 ----
***************
*** 64,75 ****
      glv.setLengthValue("");
      typing = false;
-     findTarget(e);
      boolean done = false;
      
!     if (e.getButton() == MouseEvent.BUTTON3 || 
!         e.isPopupTrigger()) {
!       glv.popup(makeSelectionMenu(), e.getX(), e.getY());
        done = true;
!     } 
      
      if (e.getButton() == MouseEvent.BUTTON1) {
--- 63,88 ----
      glv.setLengthValue("");
      typing = false;
      boolean done = false;
      
!     if (e.getButton() == MouseEvent.BUTTON3 || e.isPopupTrigger()) {
!       Selection selection = Selection.primary();
!       JPopupMenu menu = null;
!       
!       if (target == null) {
!         selection.clear();
!         menu = PopupMenu.getBackgroundMenu();
!       } else {
!         if (target instanceof Geometric) {
!           if (!selection.contains(target)) {
!             selection.set((Geometric) target);
!           }
!           menu = PopupMenu.makeSelectionMenu();
!         }
!       }
!       if (menu != null) {
!         glv.popup(menu, e.getX(), e.getY());
!       }
        done = true;
!     }
      
      if (e.getButton() == MouseEvent.BUTTON1) {
***************
*** 93,120 ****
    }
    
-   /**
-    * Create a popup for performing operations on selection
-    * @return The popup menu
-    */
-   protected JPopupMenu makeSelectionMenu() {
-     if (Selection.primary().isEmpty()) {
-       if (target instanceof Space) {
-         return PopupMenu.getSpaceMenu((Space)target);
-       } else if (target instanceof Surface) {
-         return PopupMenu.getSurfaceMenu((Surface) target);
-       } else if (target instanceof Entity) {
-         return PopupMenu.getEntityMenu((Entity) target);
-       } else {
-         return PopupMenu.getBackgroundMenu();
-       }
-     } else {
-       if (Selection.primary().contains(target)) {
-         return PopupMenu.makeSelectionMenu();
-       } else {
-         return PopupMenu.getBackgroundMenu();
-       }
-     }
-   }
-   
    /** 
     * Creates the correct type popup menu.
--- 106,109 ----