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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	PopupMenu.java 
Log Message:
Made some space menu items condional on a "CHECKS" flag

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** PopupMenu.java	24 Oct 2007 06:48:28 -0000	1.56
--- PopupMenu.java	26 Oct 2007 09:10:50 -0000	1.57
***************
*** 56,59 ****
--- 56,61 ----
    private static Logger log = Logger.getLogger(PopupMenu.class);  
    
+   private static final boolean CHECKS = false;
+   
    /**
     * make a popup menu for a surface
***************
*** 227,281 ****
      
      pm.addSeparator();
!     
!     if (s != null) {
!       AbstractAction copy = new CollectionMenuAction(s, "Duplicate") {
!         public void actionPerformed(ActionEvent arg0) {
!           if (col != null) {
!             Iterator iter = col.iterator();
!             while (iter.hasNext()) {
!               Space space = (Space)iter.next();
!               Space spaceCopy = space.copy();
!               Selection.primary().set(spaceCopy);
!               Project.getInstance().checkpoint();
!             }
            }
          }
!       };
!       pm.add(copy);
!       AbstractAction instantiate = new CollectionMenuAction(s, "Instantiate") {
!         public void actionPerformed(ActionEvent arg0) {
!           if (col != null) {
!             /*FIXME better if there were made a union if more than one 
              and a instance of it */
!             Iterator iter = col.iterator();
!             while (iter.hasNext()) {
!               Space space = (Space)iter.next();
!               Space instance = new Space("Instance of " + space.getName(),
!                   Space.CONSTRUCTION, space.getLevel(), false);
!               instance.setProto(space);
!               space.getOwner().add(instance);
!             }
!             Project.getInstance().changed(Project.getInstance());
!             Project.getInstance().checkpoint();
            }
          }
!       };
!       pm.add(instantiate);
!       if (s.size() == 1) {
!         // Some options do only apply to one space
!         Space sp = (Space)s.iterator().next();
!         if (((Space)s.iterator().next()).getLevel() != Space.PART_LEVEL) {
!           AbstractAction edit = new SpaceMenuAction(sp, "Edit") {
!             public void actionPerformed(ActionEvent arg0) {
!               Selection.primary().clear();
!               Project p = Project.getInstance();
!               space.edit();
!               //FIXME: changed is also called in the edit-method on space
!               //It is properly only needed once.
!               p.changed(p);
!             }
!           };
!           pm.add(edit);
!         }
          AbstractAction envelope = new SpaceMenuAction(sp, "Compute Envelope") {
            public void actionPerformed(ActionEvent arg0) {
--- 229,284 ----
      
      pm.addSeparator();
! 
!     AbstractAction copy = new CollectionMenuAction(s, "Duplicate") {
!       public void actionPerformed(ActionEvent arg0) {
!         if (col != null) {
!           Iterator iter = col.iterator();
!           while (iter.hasNext()) {
!             Space space = (Space)iter.next();
!             Space spaceCopy = space.copy();
!             Selection.primary().set(spaceCopy);
!             Project.getInstance().checkpoint();
            }
          }
!       }
!     };
!     pm.add(copy);
!     AbstractAction instantiate = new CollectionMenuAction(s, "Instantiate") {
!       public void actionPerformed(ActionEvent arg0) {
!         if (col != null) {
!           /*FIXME better if there were made a union if more than one 
              and a instance of it */
!           Iterator iter = col.iterator();
!           while (iter.hasNext()) {
!             Space space = (Space)iter.next();
!             Space instance = new Space("Instance of " + space.getName(),
!                 Space.CONSTRUCTION, space.getLevel(), false);
!             instance.setProto(space);
!             space.getOwner().add(instance);
            }
+           Project.getInstance().changed(Project.getInstance());
+           Project.getInstance().checkpoint();
          }
!       }
!     };
!     pm.add(instantiate);
!     if (s.size() == 1) {
!       // Some options do only apply to one space
!       Space sp = (Space)s.iterator().next();
!       if (((Space)s.iterator().next()).getLevel() != Space.PART_LEVEL) {
!         AbstractAction edit = new SpaceMenuAction(sp, "Edit") {
!           public void actionPerformed(ActionEvent arg0) {
!             Selection.primary().clear();
!             Project p = Project.getInstance();
!             space.edit();
!             //FIXME: changed is also called in the edit-method on space
!             //It is properly only needed once.
!             p.changed(p);
!           }
!         };
!         pm.add(edit);
!       }
!       
!       if (CHECKS) {
          AbstractAction envelope = new SpaceMenuAction(sp, "Compute Envelope") {
            public void actionPerformed(ActionEvent arg0) {
***************
*** 288,307 ****
          };
          pm.add(envelope);
!         AbstractAction flip = new SpaceMenuAction(sp, "Rotate 90 degrees CCW") {
!           public void actionPerformed(ActionEvent arg0) {
!             Iterator it = space.collect().iterator();
!             Vertex center = space.center();
!             while (it.hasNext()) {
!               Geometry.rotate(Math.PI / 2, 
!                   0, 0, 1, 
!                   (Vertex)it.next(), 
!                   center);
!             }
!             space.changed();
!             Project.getInstance().checkpoint();
!           }
!         };
!         pm.add(flip);
!         AbstractAction check = new SpaceMenuAction(sp, "Check") {
            public void actionPerformed(ActionEvent arg0) {
              space.check();
--- 291,295 ----
          };
          pm.add(envelope);
!         AbstractAction check = new SpaceMenuAction(sp, "Consistency Check") {
            public void actionPerformed(ActionEvent arg0) {
              space.check();
***************
*** 309,313 ****
          };
          pm.add(check);
!         AbstractAction modCheck = new SpaceMenuAction(sp, "modCheck") {
            public void actionPerformed(ActionEvent arg0) {
              log.info(space.getModellor());
--- 297,301 ----
          };
          pm.add(check);
!         AbstractAction modCheck = new SpaceMenuAction(sp, "Modellor Check") {
            public void actionPerformed(ActionEvent arg0) {
              log.info(space.getModellor());
***************
*** 315,345 ****
          };
          pm.add(modCheck);
!         pm.add(getTransformMenu(sp));
!         
!         for (Modellor current : Modellor.getRegisteredModellors()) {
!           if (current.application() == Modellor.DETAIL) {
!             AbstractAction action = new ModellorAction(current, sp) {
!               public void actionPerformed(ActionEvent e) {
!                 System.out.println("detail " + modellor);
!                 Modellor detailer = modellor.newInstance(space);
!                 Project.getInstance().changed(Project.getInstance());
!                 Project.getInstance().addObserver(detailer);
!               }
!             };
!             pm.add(action);
!           }
!         }
!         
!         JMenu mm = new JMenu("Modellors");
!         Collection c = Modellor.getRegisteredModellors();
!         Iterator iter = c.iterator();        
!         while (iter.hasNext()) {
!           Modellor m = (Modellor)iter.next();
!           AbstractAction modellor = new ModellorMenuAction(sp, m);
!           mm.add(modellor);
          }
-         pm.add(mm);
        }
!     }      
      return pm;
    }
--- 303,334 ----
          };
          pm.add(modCheck);
!       }
!       
!       pm.add(getTransformMenu(sp));
! 
!       for (Modellor current : Modellor.getRegisteredModellors()) {
!         if (current.application() == Modellor.DETAIL) {
!           AbstractAction action = new ModellorAction(current, sp) {
!             public void actionPerformed(ActionEvent e) {
!               System.out.println("detail " + modellor);
!               Modellor detailer = modellor.newInstance(space);
!               Project.getInstance().changed(Project.getInstance());
!               Project.getInstance().addObserver(detailer);
!             }
!           };
!           pm.add(action);
          }
        }
! 
!       JMenu mm = new JMenu("Modellors");
!       Collection c = Modellor.getRegisteredModellors();
!       Iterator iter = c.iterator();        
!       while (iter.hasNext()) {
!         Modellor m = (Modellor)iter.next();
!         AbstractAction modellor = new ModellorMenuAction(sp, m);
!         mm.add(modellor);
!       }
!       pm.add(mm);
!     }
      return pm;
    }