[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.57, 1.58

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

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

Modified Files:
	PopupMenu.java 
Log Message:
A subdivision algo

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** PopupMenu.java	26 Oct 2007 09:10:50 -0000	1.57
--- PopupMenu.java	26 Oct 2007 13:01:24 -0000	1.58
***************
*** 226,232 ****
     */
    public static JPopupMenu getSpaceMenu(Collection s) {
!     JPopupMenu pm = PopupMenu.getGeometricMenu(s);
      
!     pm.addSeparator();
  
      AbstractAction copy = new CollectionMenuAction(s, "Duplicate") {
--- 226,232 ----
     */
    public static JPopupMenu getSpaceMenu(Collection s) {
!     JPopupMenu menu = PopupMenu.getGeometricMenu(s);
      
!     menu.addSeparator();
  
      AbstractAction copy = new CollectionMenuAction(s, "Duplicate") {
***************
*** 243,247 ****
        }
      };
!     pm.add(copy);
      AbstractAction instantiate = new CollectionMenuAction(s, "Instantiate") {
        public void actionPerformed(ActionEvent arg0) {
--- 243,247 ----
        }
      };
!     menu.add(copy);
      AbstractAction instantiate = new CollectionMenuAction(s, "Instantiate") {
        public void actionPerformed(ActionEvent arg0) {
***************
*** 262,266 ****
        }
      };
!     pm.add(instantiate);
      if (s.size() == 1) {
        // Some options do only apply to one space
--- 262,266 ----
        }
      };
!     menu.add(instantiate);
      if (s.size() == 1) {
        // Some options do only apply to one space
***************
*** 277,283 ****
            }
          };
!         pm.add(edit);
        }
        
        if (CHECKS) {
          AbstractAction envelope = new SpaceMenuAction(sp, "Compute Envelope") {
--- 277,292 ----
            }
          };
!         menu.add(edit);
        }
        
+       {
+         AbstractAction action = new SpaceMenuAction(sp, "Smooth...") {
+           public void actionPerformed(ActionEvent event) {
+             Command command = new Command.SmoothSpace(space);
+             AttributeView.instance().display(command);
+           }
+         };
+         menu.add(action);
+       }
        if (CHECKS) {
          AbstractAction envelope = new SpaceMenuAction(sp, "Compute Envelope") {
***************
*** 290,294 ****
            }
          };
!         pm.add(envelope);
          AbstractAction check = new SpaceMenuAction(sp, "Consistency Check") {
            public void actionPerformed(ActionEvent arg0) {
--- 299,303 ----
            }
          };
!         menu.add(envelope);
          AbstractAction check = new SpaceMenuAction(sp, "Consistency Check") {
            public void actionPerformed(ActionEvent arg0) {
***************
*** 296,300 ****
            }
          };
!         pm.add(check);
          AbstractAction modCheck = new SpaceMenuAction(sp, "Modellor Check") {
            public void actionPerformed(ActionEvent arg0) {
--- 305,309 ----
            }
          };
!         menu.add(check);
          AbstractAction modCheck = new SpaceMenuAction(sp, "Modellor Check") {
            public void actionPerformed(ActionEvent arg0) {
***************
*** 302,309 ****
            }
          };
!         pm.add(modCheck);
        }
        
!       pm.add(getTransformMenu(sp));
  
        for (Modellor current : Modellor.getRegisteredModellors()) {
--- 311,318 ----
            }
          };
!         menu.add(modCheck);
        }
        
!       menu.add(getTransformMenu(sp));
  
        for (Modellor current : Modellor.getRegisteredModellors()) {
***************
*** 317,321 ****
              }
            };
!           pm.add(action);
          }
        }
--- 326,330 ----
              }
            };
!           menu.add(action);
          }
        }
***************
*** 329,335 ****
          mm.add(modellor);
        }
!       pm.add(mm);
      }
!     return pm;
    }
    
--- 338,344 ----
          mm.add(modellor);
        }
!       menu.add(mm);
      }
!     return menu;
    }