[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.48, 1.49
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2007-10-19 13:06:24
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22591/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: removed some code Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** PopupMenu.java 19 Oct 2007 11:24:42 -0000 1.48 --- PopupMenu.java 19 Oct 2007 13:06:25 -0000 1.49 *************** *** 14,22 **** import java.util.LinkedList; import java.util.Map; - import java.util.Set; - import javax.swing.AbstractAction; import javax.swing.JMenu; - import javax.swing.JMenuItem; import javax.swing.JPopupMenu; --- 14,19 ---- *************** *** 45,49 **** import net.sourceforge.bprocessor.model.Translate; import net.sourceforge.bprocessor.model.Vertex; - import net.sourceforge.bprocessor.model.constraints.OffsetConstraint; import net.sourceforge.bprocessor.model.modellor.Modellor; --- 42,45 ---- *************** *** 98,139 **** }; jm.add(flip); - } - if (c.size() == 2) { - JMenuItem offsetItem = new JMenuItem("Offset Constraint"); - offsetItem.addActionListener(new CollectionMenuAction(c, "Offset") { - public void actionPerformed(ActionEvent event) { - OffsetConstraint.addOffsetConstraint(col); - Project p = Project.getInstance(); - p.changed(p); - p.checkpoint(); - } - } - ); - jm.add(offsetItem); - AbstractAction relate = new CollectionMenuAction(c, "Relate") { - public void actionPerformed(ActionEvent e) { - CoordinateSystem.relate(col); - } - }; - jm.add(relate); - } - - JMenuItem mergeItem = new JMenuItem("Merge Surfaces"); - mergeItem.addActionListener(new CollectionMenuAction(c, "Merge Surfaces") { - public void actionPerformed(ActionEvent event) { - Set<Surface> surfaces = new HashSet<Surface>(); - Iterator it = col.iterator(); - while (it.hasNext()) { - Object o = it.next(); - if (o instanceof Surface) { - surfaces.add((Surface)o); - } - } - Geometry.mergeAllPossibleSurfaces(surfaces); - } } - ); - jm.add(mergeItem); - return jm; } --- 94,98 ---- |