[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.34, 1.35

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

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

Modified Files:
	PopupMenu.java 
Log Message:
Improved copying of geometry

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** PopupMenu.java	29 May 2007 11:49:25 -0000	1.34
--- PopupMenu.java	4 Jun 2007 20:38:25 -0000	1.35
***************
*** 31,35 ****
  import net.sourceforge.bprocessor.model.Camera;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
- import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Geometric;
--- 31,34 ----
***************
*** 372,391 ****
        }
      };
!     menu.add(delete);        
      AbstractAction allConnected = new EntitiesMenuAction(entities, "All Connected") {
        public void actionPerformed(ActionEvent arg0) {
!         int size = 0;
!         Collection<Vertex> vertices = Geometry.collect(entities);
!         Collection<Edge> edges = new LinkedList<Edge>();
!         while (vertices.size() > size) {
!           size = vertices.size();
!           edges = Vertex.edges(vertices);
!           vertices = Geometry.collect(edges);
!         }
!         Collection<Surface> surfaces = Edge.surfaces(edges);
!         Collection<Geometric> geometrics = new HashSet<Geometric>();
!         geometrics.addAll(surfaces);
!         geometrics.addAll(edges);
!         geometrics.addAll(vertices);
          Selection.primary().set(geometrics);
        }
--- 371,379 ----
        }
      };
!     menu.add(delete);
      AbstractAction allConnected = new EntitiesMenuAction(entities, "All Connected") {
        public void actionPerformed(ActionEvent arg0) {
!         Collection<Geometric> geometrics = 
!           Geometric.connected(new LinkedList(entities));
          Selection.primary().set(geometrics);
        }