[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java,1.32,1.33 ConstructionSpaceFacade.java,1.9,1.10 FunctionalSpaceFacade.java,1.9,1.10

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15201/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java ConstructionSpaceFacade.java 
	FunctionalSpaceFacade.java 
Log Message:
Changed equals to ==

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Surface.java	29 Sep 2005 11:54:35 -0000	1.32
--- Surface.java	30 Sep 2005 08:14:24 -0000	1.33
***************
*** 373,377 ****
            while (innerIt.hasNext()) {
              Surface innerSurf = (Surface)innerIt.next();
!             if (innerSurf.equals(this)) {
                if (!containedCheck(this, surf)) {
                  //The inner surface has been moved out of its outer surface
--- 373,377 ----
            while (innerIt.hasNext()) {
              Surface innerSurf = (Surface)innerIt.next();
!             if (innerSurf == this) {
                if (!containedCheck(this, surf)) {
                  //The inner surface has been moved out of its outer surface

Index: ConstructionSpaceFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ConstructionSpaceFacade.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConstructionSpaceFacade.java	21 Sep 2005 08:57:07 -0000	1.9
--- ConstructionSpaceFacade.java	30 Sep 2005 08:14:24 -0000	1.10
***************
*** 119,128 ****
          Surface surface = (Surface)surfIt.next();
          Domain back = surface.getBackDomain();
!         if (back.equals(c)) {
            surface.setBackDomain(null);
            SurfaceFacade.getInstance().update(surface);
          } else {
            Domain front = surface.getFrontDomain();
!           if (front.equals(c)) {
              surface.setFrontDomain(null);
              SurfaceFacade.getInstance().update(surface);
--- 119,128 ----
          Surface surface = (Surface)surfIt.next();
          Domain back = surface.getBackDomain();
!         if (back == c) {
            surface.setBackDomain(null);
            SurfaceFacade.getInstance().update(surface);
          } else {
            Domain front = surface.getFrontDomain();
!           if (front == c) {
              surface.setFrontDomain(null);
              SurfaceFacade.getInstance().update(surface);

Index: FunctionalSpaceFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/FunctionalSpaceFacade.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FunctionalSpaceFacade.java	21 Sep 2005 08:57:07 -0000	1.9
--- FunctionalSpaceFacade.java	30 Sep 2005 08:14:24 -0000	1.10
***************
*** 119,128 ****
          Surface surface = (Surface)surfIt.next();
          Domain back = surface.getBackDomain();
!         if (back.equals(f)) {
            surface.setBackDomain(null);
            SurfaceFacade.getInstance().update(surface);
          } else {
            Domain front = surface.getFrontDomain();
!           if (front.equals(f)) {
              surface.setFrontDomain(null);
              SurfaceFacade.getInstance().update(surface);
--- 119,128 ----
          Surface surface = (Surface)surfIt.next();
          Domain back = surface.getBackDomain();
!         if (back == f) {
            surface.setBackDomain(null);
            SurfaceFacade.getInstance().update(surface);
          } else {
            Domain front = surface.getFrontDomain();
!           if (front == f) {
              surface.setFrontDomain(null);
              SurfaceFacade.getInstance().update(surface);