[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.67, 1.68

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

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

Modified Files:
	GUI.java 
Log Message:
New experimental box modellor

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** GUI.java	24 May 2007 10:57:48 -0000	1.67
--- GUI.java	18 Jun 2007 13:21:57 -0000	1.68
***************
*** 56,59 ****
--- 56,60 ----
  import java.awt.event.KeyEvent;
  
+ import javax.swing.AbstractAction;
  import javax.swing.JFrame;
  import javax.swing.JMenu;
***************
*** 151,155 ****
  
    /** Abstract action */
!   private abstract class AbstractAction implements ActionListener {
      
    }
--- 152,156 ----
  
    /** Abstract action */
!   private abstract class EditAction implements ActionListener {
      
    }
***************
*** 241,244 ****
--- 242,254 ----
    }
  
+   private abstract class ModellorAction extends AbstractAction {
+     protected Modellor modellor;
+     
+     public ModellorAction(Modellor modellor) {
+       super(modellor.getGeneralName());
+       this.modellor = modellor;
+     }
+   }
+   
    private JMenu createCreateMenu() {
      JMenu create = new JMenu("Create");
***************
*** 280,283 ****
--- 290,309 ----
          createNet.addActionListener(new CreateNetActionListener());
          create.add(createNet);
+         
+         for (Modellor current : Modellor.getRegisteredModellors()) {
+           if (current.modern()) {
+             AbstractAction action = new ModellorAction(current) {
+               public void actionPerformed(ActionEvent e) {
+                 System.out.println("actionate " + modellor);
+                 Space space = modellor.createSpace();
+                 Project.getInstance().world().add(space);
+                 Project.getInstance().changed(Project.getInstance());
+               }
+             };
+             create.add(action);
+           }
+         }
+         
+         
  
          JMenu modellorSubmenu = new JMenu("Modellors");
***************
*** 296,300 ****
              int level = s.getLevel();
              for (Modellor m : Modellor.getRegisteredModellors()) {
!               JMenuItem mod = new JMenuItem(m.getName());
                if (level == m.getUseableLevel()) {
                  mod.addActionListener(new ModellorMenuAction(s, m));
--- 322,326 ----
              int level = s.getLevel();
              for (Modellor m : Modellor.getRegisteredModellors()) {
!               JMenuItem mod = new JMenuItem(m.getGeneralName());
                if (level == m.getUseableLevel()) {
                  mod.addActionListener(new ModellorMenuAction(s, m));
***************
*** 319,323 ****
      editUndo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z,
        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     editUndo.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
          Project.getInstance().undo();
--- 345,349 ----
      editUndo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z,
        Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     editUndo.addActionListener(new EditAction() {
        public void actionPerformed(ActionEvent arg0) {
          Project.getInstance().undo();
***************
*** 331,335 ****
      editRedo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Y,
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     editRedo.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
          Project.getInstance().redo();
--- 357,361 ----
      editRedo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Y,
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     editRedo.addActionListener(new EditAction() {
        public void actionPerformed(ActionEvent arg0) {
          Project.getInstance().redo();
***************
*** 353,357 ****
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
      editCopy.setEnabled(false);
!     editCopy.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
          Selection s = Selection.primary();
--- 379,383 ----
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
      editCopy.setEnabled(false);
!     editCopy.addActionListener(new EditAction() {
        public void actionPerformed(ActionEvent arg0) {
          Selection s = Selection.primary();
***************
*** 373,377 ****
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
      editPaste.setEnabled(false);
!     editPaste.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
          LinkedList<Geometric> copied = new LinkedList<Geometric>();
--- 399,403 ----
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
      editPaste.setEnabled(false);
!     editPaste.addActionListener(new EditAction() {
        public void actionPerformed(ActionEvent arg0) {
          LinkedList<Geometric> copied = new LinkedList<Geometric>();
***************
*** 416,420 ****
      JMenuItem editDelete = new JMenuItem("Delete");
      editDelete.setMnemonic(KeyEvent.VK_D);
!     editDelete.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
          Collection c = Selection.primary();
--- 442,446 ----
      JMenuItem editDelete = new JMenuItem("Delete");
      editDelete.setMnemonic(KeyEvent.VK_D);
!     editDelete.addActionListener(new EditAction() {
        public void actionPerformed(ActionEvent arg0) {
          Collection c = Selection.primary();
***************
*** 433,437 ****
      JMenuItem repaintTree = new JMenuItem("Repaint tree");
      repaintTree.setEnabled(true);
!     repaintTree.addActionListener(new AbstractAction() {
        public void actionPerformed(ActionEvent arg0) {
          makeTree();
--- 459,463 ----
      JMenuItem repaintTree = new JMenuItem("Repaint tree");
      repaintTree.setEnabled(true);
!     repaintTree.addActionListener(new EditAction() {
        public void actionPerformed(ActionEvent arg0) {
          makeTree();