[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.7, 1.8 GUI.java, 1.43, 1.44

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

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

Modified Files:
	PopupMenu.java GUI.java 
Log Message:
Removed methods from Project to add, remove and delete geometry

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PopupMenu.java	3 Oct 2006 10:04:09 -0000	1.7
--- PopupMenu.java	5 Oct 2006 11:26:56 -0000	1.8
***************
*** 169,183 ****
          pm.add(edit);
        }
!       if (s.getEnvelope().isEmpty()) {
!         AbstractAction envelope = new SpaceMenuAction(s, "Compute Envelope") {
!           public void actionPerformed(ActionEvent arg0) {
!             if (space != null) {
!               space.computeEnvelope();
!               Project.getInstance().changed(Project.getInstance());
!             }
            }
!         };
!         pm.add(envelope);
!       }
        AbstractAction flip = new SpaceMenuAction(s, "Rotate 90 degrees CCW") {
          public void actionPerformed(ActionEvent arg0) {
--- 169,181 ----
          pm.add(edit);
        }
!       AbstractAction envelope = new SpaceMenuAction(s, "Compute Envelope") {
!         public void actionPerformed(ActionEvent arg0) {
!           if (space != null) {
!             space.computeEnvelope();
!             Project.getInstance().changed(Project.getInstance());
            }
!         }
!       };
!       pm.add(envelope);
        AbstractAction flip = new SpaceMenuAction(s, "Rotate 90 degrees CCW") {
          public void actionPerformed(ActionEvent arg0) {

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** GUI.java	26 Sep 2006 09:50:55 -0000	1.43
--- GUI.java	5 Oct 2006 11:26:56 -0000	1.44
***************
*** 19,25 ****
  import net.sourceforge.bprocessor.gui.actions.FileSaveActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileSaveAsActionListener;
- import net.sourceforge.bprocessor.gui.actions.ToolsDetachActionListener;
  import net.sourceforge.bprocessor.gui.actions.ToolsEnergyActionListener;
- import net.sourceforge.bprocessor.gui.actions.ToolsJoinActionListener;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
  import net.sourceforge.bprocessor.gui.splash.SplashWindow;
--- 19,23 ----
***************
*** 306,321 ****
      JMenu tools = new JMenu("Tools");
      tools.setMnemonic(KeyEvent.VK_T);
- 
-     JMenuItem toolsJoin = new JMenuItem("Join");
-     toolsJoin.setMnemonic(KeyEvent.VK_J);
-     toolsJoin.addActionListener(new ToolsJoinActionListener());
-     tools.add(toolsJoin);
- 
-     JMenuItem toolsDetach = new JMenuItem("Detach");
-     toolsDetach.setMnemonic(KeyEvent.VK_D);
-     toolsDetach.addActionListener(new ToolsDetachActionListener());
-     tools.add(toolsDetach);
-     
-     tools.addSeparator();
      
      JMenuItem toolsEnergy = new JMenuItem("Energy calc");
--- 304,307 ----