Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8626/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
AbstractTool.java ToolFactory.java SpaceTool.java
SelectTool.java
Log Message:
Changed spacetool and menu handling
Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** SpaceTool.java 28 Nov 2007 18:11:07 -0000 1.98
--- SpaceTool.java 10 Dec 2007 11:55:55 -0000 1.99
***************
*** 32,39 ****
import net.sourceforge.bprocessor.gl.Editor;
- import net.sourceforge.bprocessor.gui.PopupMenu;
import net.sourceforge.bprocessor.gui.actions.SpaceMenuAction;
import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.Geometric;
import net.sourceforge.bprocessor.model.Mesh;
import net.sourceforge.bprocessor.model.Project;
--- 32,37 ----
***************
*** 61,64 ****
--- 59,65 ----
}
+
+
+
/**
* Invoked when a mouse button has been pressed on a component.
***************
*** 69,94 ****
editor.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) {
- editor.popup(menu, e.getX(), e.getY());
- }
- done = true;
- }
if (e.getButton() == MouseEvent.BUTTON1) {
--- 70,73 ----
***************
*** 97,107 ****
String side = (String)target;
editor.popup(makeSpaceMenu(side), e.getX(), e.getY());
-
}
}
}
- if (!done) {
- super.pressed(e);
- }
}
--- 76,82 ----
Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** ToolFactory.java 3 Dec 2007 17:29:48 -0000 1.96
--- ToolFactory.java 10 Dec 2007 11:55:54 -0000 1.97
***************
*** 209,213 ****
this.registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
selBut.setMnemonic(KeyEvent.VK_Q);
! registerTool(Tool.ASSIGN_TOOL, assign, "Biconselecttool.gif", "Assign");
JToggleButton pencilBut =
this.registerTool(Tool.PENCIL_TOOL, pencil, "Biconpentool.gif", "Pencil");
--- 209,213 ----
this.registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
selBut.setMnemonic(KeyEvent.VK_Q);
! registerTool(Tool.ASSIGN_TOOL, assign, "Biconassigntool.gif", "Assign");
JToggleButton pencilBut =
this.registerTool(Tool.PENCIL_TOOL, pencil, "Biconpentool.gif", "Pencil");
Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** SelectTool.java 18 Nov 2007 21:30:17 -0000 1.68
--- SelectTool.java 10 Dec 2007 11:55:55 -0000 1.69
***************
*** 8,15 ****
--- 8,20 ----
import net.sourceforge.bprocessor.gl.Editor;
+ import net.sourceforge.bprocessor.gui.PopupMenu;
+ import net.sourceforge.bprocessor.model.Geometric;
+ import net.sourceforge.bprocessor.model.Selection;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
+ import javax.swing.JPopupMenu;
+
/**
* The selecttool
***************
*** 72,74 ****
--- 77,102 ----
" Drag to multi-select.";
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public void handleMenu(MouseEvent event) {
+ 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) {
+ editor.popup(menu, event.getX(), event.getY());
+ }
+ }
}
Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** AbstractTool.java 21 Nov 2007 09:21:17 -0000 1.140
--- AbstractTool.java 10 Dec 2007 11:55:54 -0000 1.141
***************
*** 452,455 ****
--- 452,464 ----
}
+
+ /**
+ * Handle the menu for this tool
+ * @param event MouseEvent
+ */
+ public void handleMenu(MouseEvent event) {
+ }
+
+
/**
* Invoked when a mouse button has been pressed on a component.
***************
*** 480,484 ****
Project.getInstance().setActiveSpace(clickbox.space());
} else {
! pressed(e);
}
}
--- 489,498 ----
Project.getInstance().setActiveSpace(clickbox.space());
} else {
!
! if (e.getButton() == MouseEvent.BUTTON3 || e.isPopupTrigger()) {
! handleMenu(e);
! } else {
! pressed(e);
! }
}
}
|
