[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.29, 1.30

[rimestad <rim...@us...>]

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

Modified Files:
	PopupMenu.java 
Log Message:
altered selection to a generic collection og geometrics which lead to quite alot of changes

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** PopupMenu.java	10 Apr 2007 20:55:25 -0000	1.29
--- PopupMenu.java	14 Apr 2007 15:00:42 -0000	1.30
***************
*** 344,349 ****
        public void actionPerformed(ActionEvent arg0) {
          int size = 0;
!         Collection vertices = Geometry.collect(entities);
!         Collection edges = new LinkedList();
          while (vertices.size() > size) {
            size = vertices.size();
--- 344,349 ----
        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();
***************
*** 351,361 ****
            vertices = Geometry.collect(edges);
          }
!         Collection surfaces = Edge.surfaces(edges);
!         Collection geometrics = new HashSet();
          geometrics.addAll(surfaces);
          geometrics.addAll(edges);
          geometrics.addAll(vertices);
!         Selection.primary().clear();
!         Selection.primary().addAll(geometrics);
        }
      };
--- 351,360 ----
            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);
        }
      };
***************
*** 464,469 ****
          owner.add(union);
          Project.getInstance().changed(owner);
!         Selection.primary().clear();
!         Selection.primary().add(union);
          Project.getInstance().checkpoint();
        }
--- 463,467 ----
          owner.add(union);
          Project.getInstance().changed(owner);
!         Selection.primary().set(union);
          Project.getInstance().checkpoint();
        }