[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.21, 1.22

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

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

Modified Files:
	PopupMenu.java 
Log Message:
Build errors and style-check errors fixed

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** PopupMenu.java	23 Jan 2007 10:51:55 -0000	1.21
--- PopupMenu.java	23 Jan 2007 14:31:33 -0000	1.22
***************
*** 390,394 ****
          Collection<Surface> surfaces = new HashSet<Surface>();
          Collection<Geometric> geometrics = (Collection<Geometric>) entities;
!         for (Geometric geometric: geometrics) {
            if (geometric instanceof Surface) {
              surfaces.add((Surface) geometric);
--- 390,394 ----
          Collection<Surface> surfaces = new HashSet<Surface>();
          Collection<Geometric> geometrics = (Collection<Geometric>) entities;
!         for (Geometric geometric : geometrics) {
            if (geometric instanceof Surface) {
              surfaces.add((Surface) geometric);
***************
*** 397,401 ****
          Collection<Space> spaces = new HashSet<Space>();
          Space owner = null;
!         for (Surface surface: surfaces) {
            owner = surface.getOwner();
            Space empty = owner.getEmpty();
--- 397,401 ----
          Collection<Space> spaces = new HashSet<Space>();
          Space owner = null;
!         for (Surface surface : surfaces) {
            owner = surface.getOwner();
            Space empty = owner.getEmpty();
***************
*** 408,420 ****
          }
          Collection<Space> interior = new HashSet<Space>();
!         for (Space space: spaces) {
            interior.add(space);
          }
!         for (Space space: interior) {
            surfaces.addAll(space.getEnvelope());
          }
          Collection<Surface> inside = new LinkedList<Surface>();
          Collection<Surface> border = new LinkedList<Surface>();
!         for (Surface surface: surfaces) {
            if (interior.contains(surface.getFrontDomain()) && 
                interior.contains(surface.getBackDomain())) {
--- 408,420 ----
          }
          Collection<Space> interior = new HashSet<Space>();
!         for (Space space : spaces) {
            interior.add(space);
          }
!         for (Space space : interior) {
            surfaces.addAll(space.getEnvelope());
          }
          Collection<Surface> inside = new LinkedList<Surface>();
          Collection<Surface> border = new LinkedList<Surface>();
!         for (Surface surface : surfaces) {
            if (interior.contains(surface.getFrontDomain()) && 
                interior.contains(surface.getBackDomain())) {
***************
*** 429,433 ****
          Map<Geometric, Geometric> map = new HashMap<Geometric, Geometric>();
          
!         for(Space space:interior) {
            Space copy = space.simpleCopy();
            map.put(space, copy);
--- 429,433 ----
          Map<Geometric, Geometric> map = new HashMap<Geometric, Geometric>();
          
!         for (Space space : interior) {
            Space copy = space.simpleCopy();
            map.put(space, copy);
***************
*** 438,442 ****
          Collection<Surface> deletion = new LinkedList<Surface>();
          
!         for(Surface surface:inside) {
            Surface copy = surface.copy(map);
            Space front = surface.getFrontDomain();
--- 438,442 ----
          Collection<Surface> deletion = new LinkedList<Surface>();
          
!         for (Surface surface : inside) {
            Surface copy = surface.copy(map);
            Space front = surface.getFrontDomain();
***************
*** 457,461 ****
            deletion.add(surface);
          }
!         for(Surface surface:border) {
            Surface copy = surface.copy(map);
            Space front = surface.getFrontDomain();
--- 457,461 ----
            deletion.add(surface);
          }
!         for (Surface surface : border) {
            Surface copy = surface.copy(map);
            Space front = surface.getFrontDomain();
***************
*** 479,486 ****
          }
          union.addAll(all);
!         for(Geometric geometric:deletion) {
            geometric.delete();
          }
!         for(Space space:interior) {
            space.delete();
          }
--- 479,486 ----
          }
          union.addAll(all);
!         for (Geometric geometric : deletion) {
            geometric.delete();
          }
!         for (Space space : interior) {
            space.delete();
          }