[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool SelectTool.java, 1.69, 1.70

[rimestad <rim...@us...>]

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

Modified Files:
	SelectTool.java 
Log Message:
more popupmenu refactoring

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** SelectTool.java	10 Dec 2007 11:55:55 -0000	1.69
--- SelectTool.java	18 Dec 2007 23:15:01 -0000	1.70
***************
*** 8,12 ****
  
  import net.sourceforge.bprocessor.gl.Editor;
! import net.sourceforge.bprocessor.gui.PopupMenu;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
--- 8,13 ----
  
  import net.sourceforge.bprocessor.gl.Editor;
! import net.sourceforge.bprocessor.gl.view.PopupMenu;
! import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
***************
*** 14,17 ****
--- 15,19 ----
  import java.awt.Cursor;
  import java.awt.event.MouseEvent;
+ import java.util.LinkedList;
  
  import javax.swing.JPopupMenu;
***************
*** 87,91 ****
      if (target == null) {
        selection.clear();
!       menu = PopupMenu.getBackgroundMenu();
      } else {
        if (target instanceof Geometric) {
--- 89,93 ----
      if (target == null) {
        selection.clear();
!       menu = GUI.getInstance().menuFactory().menuFor(new LinkedList<Geometric>());
      } else {
        if (target instanceof Geometric) {
***************
*** 93,97 ****
            selection.set((Geometric) target);
          }
!         menu = PopupMenu.makeSelectionMenu();
        }
      }
--- 95,99 ----
            selection.set((Geometric) target);
          }
!         menu = GUI.getInstance().menuFactory().menuFor(selection);
        }
      }