bprocessor-commit

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4745/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	AbstractTool.java PencilTool.java ExtrusionTool.java 
	SelectTool.java 
Log Message:
All access to database now through the Project instance

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** SelectTool.java	30 Sep 2005 17:54:36 -0000	1.27
--- SelectTool.java	2 Oct 2005 14:48:23 -0000	1.28
***************
*** 16,30 ****
  
  import net.sourceforge.bprocessor.model.Domain;
- import net.sourceforge.bprocessor.model.DomainFacade;
  import net.sourceforge.bprocessor.model.Edge;
! import net.sourceforge.bprocessor.model.EdgeFacade;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.VertexFacade;
  import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.SurfaceFacade;
- import net.sourceforge.bprocessor.model.FunctionalSpaceFacade;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
- import net.sourceforge.bprocessor.model.ConstructionSpaceFacade;
  
  import java.awt.event.MouseEvent;
--- 16,25 ----
  
  import net.sourceforge.bprocessor.model.Domain;
  import net.sourceforge.bprocessor.model.Edge;
! import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
  
  import java.awt.event.MouseEvent;
***************
*** 37,41 ****
  
  import java.util.Iterator;
- //import java.util.ArrayList;
  import java.util.Set;
  import java.util.HashSet;
--- 32,35 ----
***************
*** 100,104 ****
      if (e.getButton() == MouseEvent.BUTTON1) {
        if (e.getClickCount() >= 2 && target instanceof Surface) {
!         DomainFacade df = DomainFacade.getInstance();
          Set ds = new HashSet();
          Surface surf = (Surface) target;
--- 94,98 ----
      if (e.getButton() == MouseEvent.BUTTON1) {
        if (e.getClickCount() >= 2 && target instanceof Surface) {
!         Project df = Project.getInstance();
          Set ds = new HashSet();
          Surface surf = (Surface) target;
***************
*** 128,132 ****
            String side = (String)target;
            JPopupMenu pp = new JPopupMenu(side);
!           Set domains = DomainFacade.getInstance().findAll();
            Iterator domIt = domains.iterator();
            Iterator selIt = new HashSet(selection).iterator();
--- 122,126 ----
            String side = (String)target;
            JPopupMenu pp = new JPopupMenu(side);
!           Set domains = Project.getInstance().getDomains();
            Iterator domIt = domains.iterator();
            Iterator selIt = new HashSet(selection).iterator();
***************
*** 254,283 ****
    public void handleNotification(Notification n) {
      if (n.getType().equals(Notification.VERTEX_SELECTED)) {
!       Object o = VertexFacade.getInstance().findById(n.getObject());
        if (!selection.contains(o)) {
          selection.add(o);
        }
      } else if (n.getType().equals(Notification.VERTEX_DESELECTED)) {
!       Object o = VertexFacade.getInstance().findById(n.getObject());
        if (selection.contains(o)) {
          selection.remove(o);
        }
      } else if (n.getType().equals(Notification.EDGE_SELECTED)) {
!       Object o = EdgeFacade.getInstance().findById(n.getObject());
        if (!selection.contains(o)) {
          selection.add(o);
        }
      } else if (n.getType().equals(Notification.EDGE_DESELECTED)) {
!       Object o = EdgeFacade.getInstance().findById(n.getObject());
        if (selection.contains(o)) {
          selection.remove(o);
        }
      } else if (n.getType().equals(Notification.SURFACE_SELECTED)) {
!       Object o = SurfaceFacade.getInstance().findById(n.getObject());
        if (!selection.contains(o)) {
          selection.add(o);
        }
      } else if (n.getType().equals(Notification.SURFACE_DESELECTED)) {
!       Object o = SurfaceFacade.getInstance().findById(n.getObject());
        if (selection.contains(o)) {
          selection.remove(o);
--- 248,277 ----
    public void handleNotification(Notification n) {
      if (n.getType().equals(Notification.VERTEX_SELECTED)) {
!       Vertex o = Project.getInstance().findVertexById(n.getObject());
        if (!selection.contains(o)) {
          selection.add(o);
        }
      } else if (n.getType().equals(Notification.VERTEX_DESELECTED)) {
!       Vertex o = Project.getInstance().findVertexById(n.getObject());
        if (selection.contains(o)) {
          selection.remove(o);
        }
      } else if (n.getType().equals(Notification.EDGE_SELECTED)) {
!       Edge o = Project.getInstance().findEdgeById(n.getObject());
        if (!selection.contains(o)) {
          selection.add(o);
        }
      } else if (n.getType().equals(Notification.EDGE_DESELECTED)) {
!       Edge o = Project.getInstance().findEdgeById(n.getObject());
        if (selection.contains(o)) {
          selection.remove(o);
        }
      } else if (n.getType().equals(Notification.SURFACE_SELECTED)) {
!       Surface o = Project.getInstance().findSurfaceById(n.getObject());
        if (!selection.contains(o)) {
          selection.add(o);
        }
      } else if (n.getType().equals(Notification.SURFACE_DESELECTED)) {
!       Surface o = Project.getInstance().findSurfaceById(n.getObject());
        if (selection.contains(o)) {
          selection.remove(o);
***************
*** 285,289 ****
      } else if (n.getType().equals(Notification.FUNCTIONAL_SPACE_SELECTED)) {
        FunctionalSpace fs = 
!         (FunctionalSpace)FunctionalSpaceFacade.getInstance().findById(n.getObject());
        Set s = fs.getSurfaces();
        Iterator it = s.iterator();
--- 279,283 ----
      } else if (n.getType().equals(Notification.FUNCTIONAL_SPACE_SELECTED)) {
        FunctionalSpace fs = 
!         Project.getInstance().findFunctionalSpaceById(n.getObject());
        Set s = fs.getSurfaces();
        Iterator it = s.iterator();
***************
*** 296,300 ****
      } else if (n.getType().equals(Notification.FUNCTIONAL_SPACE_DESELECTED)) {
        FunctionalSpace fs = 
!         (FunctionalSpace)FunctionalSpaceFacade.getInstance().findById(n.getObject());
        Set s = fs.getSurfaces();
        Iterator it = s.iterator();
--- 290,294 ----
      } else if (n.getType().equals(Notification.FUNCTIONAL_SPACE_DESELECTED)) {
        FunctionalSpace fs = 
!         Project.getInstance().findFunctionalSpaceById(n.getObject());
        Set s = fs.getSurfaces();
        Iterator it = s.iterator();
***************
*** 307,311 ****
      } else if (n.getType().equals(Notification.CONSTRUCTION_SPACE_SELECTED)) {
        ConstructionSpace cs = 
!         (ConstructionSpace)ConstructionSpaceFacade.getInstance().findById(n.getObject());
        Set s = cs.getSurfaces();
        Iterator it = s.iterator();
--- 301,305 ----
      } else if (n.getType().equals(Notification.CONSTRUCTION_SPACE_SELECTED)) {
        ConstructionSpace cs = 
!         Project.getInstance().findConstructionSpaceById(n.getObject());
        Set s = cs.getSurfaces();
        Iterator it = s.iterator();
***************
*** 318,322 ****
      } else if (n.getType().equals(Notification.CONSTRUCTION_SPACE_DESELECTED)) {
        ConstructionSpace cs = 
!         (ConstructionSpace)ConstructionSpaceFacade.getInstance().findById(n.getObject());
        Set s = cs.getSurfaces();
        Iterator it = s.iterator();
--- 312,316 ----
      } else if (n.getType().equals(Notification.CONSTRUCTION_SPACE_DESELECTED)) {
        ConstructionSpace cs = 
!         Project.getInstance().findConstructionSpaceById(n.getObject());
        Set s = cs.getSurfaces();
        Iterator it = s.iterator();

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ExtrusionTool.java	30 Sep 2005 12:47:09 -0000	1.18
--- ExtrusionTool.java	2 Oct 2005 14:48:23 -0000	1.19
***************
*** 16,26 ****
  
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
- import net.sourceforge.bprocessor.model.ConstructionSpaceFacade;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Domain;
- import net.sourceforge.bprocessor.model.DomainFacade;
  import net.sourceforge.bprocessor.model.Plane;
  
--- 16,25 ----
  
  import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Domain;
  import net.sourceforge.bprocessor.model.Plane;
  
***************
*** 199,203 ****
      if (newCSpace == null) {
        newCSpace = new ConstructionSpace("innerSpace");
!       ConstructionSpaceFacade.getInstance().create((ConstructionSpace) newCSpace);
      }
      Domain outer = extendSurf.getFrontDomain();
--- 198,202 ----
      if (newCSpace == null) {
        newCSpace = new ConstructionSpace("innerSpace");
!       Project.getInstance().intern((ConstructionSpace) newCSpace);
      }
      Domain outer = extendSurf.getFrontDomain();
***************
*** 282,286 ****
      }
      //moving this line to the top
!     DomainFacade.getInstance().update(newCSpace);
      Surface topSurf = createSurface(top);
      newCSpace.addSurface(topSurf);
--- 281,285 ----
      }
      //moving this line to the top
!     Project.getInstance().update(newCSpace);
      Surface topSurf = createSurface(top);
      newCSpace.addSurface(topSurf);

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** PencilTool.java	29 Sep 2005 21:02:34 -0000	1.23
--- PencilTool.java	2 Oct 2005 14:48:23 -0000	1.24
***************
*** 18,30 ****
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.EdgeFacade;
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.SurfaceFacade;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.VertexFacade;
- import net.sourceforge.bprocessor.model.FunctionalSpaceFacade;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
- import net.sourceforge.bprocessor.model.ConstructionSpaceFacade;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.Space;
--- 18,26 ----
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Plane;
+ import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.Space;
***************
*** 84,88 ****
      if (vertex.getId() == null) {
        vertex.setName("V" + vertexNum++);
!       VertexFacade.getInstance().create(vertex);
      }
    }
--- 80,84 ----
      if (vertex.getId() == null) {
        vertex.setName("V" + vertexNum++);
!       Project.getInstance().intern(vertex);
      }
    }
***************
*** 94,98 ****
    protected void intern(Edge edge) {
      if (edge.getId() == null) {
!       EdgeFacade.getInstance().create(edge);
        edges.add(edge);
      }
--- 90,94 ----
    protected void intern(Edge edge) {
      if (edge.getId() == null) {
!       Project.getInstance().intern(edge);
        edges.add(edge);
      }
***************
*** 118,122 ****
    protected void intern(Surface surface) {
      if (surface.getId() == null) {
!       SurfaceFacade.getInstance().create(surface);
      }
    }
--- 114,118 ----
    protected void intern(Surface surface) {
      if (surface.getId() == null) {
!       Project.getInstance().intern(surface);
      }
    }
***************
*** 173,178 ****
            if (exterior != null) {
              exterior.addHole(surface);
!             SurfaceFacade.getInstance().update(exterior);
!             SurfaceFacade.getInstance().update(surface);
            }
  
--- 169,174 ----
            if (exterior != null) {
              exterior.addHole(surface);
!             Project.getInstance().update(exterior);
!             Project.getInstance().update(surface);
            }
  
***************
*** 183,189 ****
            }
            if (sp instanceof ConstructionSpace) {
!             ConstructionSpaceFacade.getInstance().update((ConstructionSpace)sp);
            } else if (sp instanceof FunctionalSpace) {
!             FunctionalSpaceFacade.getInstance().update((FunctionalSpace)sp);
            }  else {
              //log.warn("No space was found");
--- 179,185 ----
            }
            if (sp instanceof ConstructionSpace) {
!             Project.getInstance().update((ConstructionSpace)sp);
            } else if (sp instanceof FunctionalSpace) {
!             Project.getInstance().update((FunctionalSpace)sp);
            }  else {
              //log.warn("No space was found");
***************
*** 300,304 ****
          snap(current);
        }
!       Set vertices = VertexFacade.getInstance().findByLocation
          (current.getX(), current.getY(), current.getZ(), 0.0);
        if (!vertices.isEmpty()) {
--- 296,300 ----
          snap(current);
        }
!       Set vertices = Project.getInstance().findByLocation
          (current.getX(), current.getY(), current.getZ(), 0.0);
        if (!vertices.isEmpty()) {
***************
*** 459,463 ****
     */
    private Space findSpace(Surface s) {
!     Set set = FunctionalSpaceFacade.getInstance().findAll();
      Iterator it = set.iterator();
      while (it.hasNext()) {
--- 455,459 ----
     */
    private Space findSpace(Surface s) {
!     Set set = Project.getInstance().getFunctionalSpaces();
      Iterator it = set.iterator();
      while (it.hasNext()) {

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AbstractTool.java	30 Sep 2005 16:30:59 -0000	1.21
--- AbstractTool.java	2 Oct 2005 14:48:22 -0000	1.22
***************
*** 8,16 ****
  
  import net.sourceforge.bprocessor.model.Edge;
! import net.sourceforge.bprocessor.model.EdgeFacade;
  import net.sourceforge.bprocessor.model.Surface;
- import net.sourceforge.bprocessor.model.SurfaceFacade;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.VertexFacade;
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.gl.GLView;
--- 8,14 ----
  
  import net.sourceforge.bprocessor.model.Edge;
! import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.gl.GLView;
***************
*** 261,271 ****
        Vertex v = new Vertex("V" + vertexNum);
        vertexNum++;
!       VertexFacade.getInstance().create(v);
        
        v.setX(coord[0]);
        v.setY(coord[1]);
        v.setZ(coord[2]);
!       
!       VertexFacade.getInstance().update(v);
        
        return v;
--- 259,268 ----
        Vertex v = new Vertex("V" + vertexNum);
        vertexNum++;
!       
        
        v.setX(coord[0]);
        v.setY(coord[1]);
        v.setZ(coord[2]);
!       Project.getInstance().intern(v);
        
        return v;
***************
*** 287,291 ****
        v.setZ(coord[2]);
  
!       VertexFacade.getInstance().update(v);
      } else {
        log.error("[updateVertex] wrong argument length was: " + coord.length);
--- 284,288 ----
        v.setZ(coord[2]);
  
!       Project.getInstance().update(v);
      } else {
        log.error("[updateVertex] wrong argument length was: " + coord.length);
***************
*** 298,302 ****
     */
    protected void removeVertex(Vertex v) {
!     VertexFacade.getInstance().remove(v);
    }
  
--- 295,299 ----
     */
    protected void removeVertex(Vertex v) {
!     Project.getInstance().remove(v);
    }
  
***************
*** 308,320 ****
     */
    protected Edge createEdge(Vertex from, Vertex to) {
!     Edge e = new Edge("E" + edgeNum);
!     edgeNum++;
!     EdgeFacade.getInstance().create(e);
! 
      e.setTo(to);
      e.setFrom(from);
! 
!     EdgeFacade.getInstance().update(e);
! 
      return e;
    }
--- 305,312 ----
     */
    protected Edge createEdge(Vertex from, Vertex to) {
!     Edge e = new Edge("E" + edgeNum++);
      e.setTo(to);
      e.setFrom(from);
!     Project.getInstance().intern(e);
      return e;
    }
***************
*** 325,329 ****
     */
    protected void removeEdge(Edge e) {
!     EdgeFacade.getInstance().remove(e);
    }
  
--- 317,321 ----
     */
    protected void removeEdge(Edge e) {
!     Project.getInstance().remove(e);
    }
  
***************
*** 333,337 ****
     */
    protected void updateEdge(Edge e) {
!     EdgeFacade.getInstance().update(e);
    }
  
--- 325,329 ----
     */
    protected void updateEdge(Edge e) {
!     Project.getInstance().update(e);
    }
  
***************
*** 342,353 ****
     */
    protected Surface createSurface(List list) {
!     Surface s = new Surface("S" + surfaceNum);
!     surfaceNum++;
!     SurfaceFacade.getInstance().create(s);
! 
      s.setEdges(list);
! 
!     SurfaceFacade.getInstance().update(s);
! 
      return s;
    }
--- 334,340 ----
     */
    protected Surface createSurface(List list) {
!     Surface s = new Surface("S" + surfaceNum++);
      s.setEdges(list);
!     Project.getInstance().intern(s);
      return s;
    }
***************
*** 358,362 ****
     */
    protected void removeSurface(Surface s) {
!     SurfaceFacade.getInstance().remove(s);
    }
  
--- 345,349 ----
     */
    protected void removeSurface(Surface s) {
!     Project.getInstance().remove(s);
    }
  
***************
*** 371,375 ****
      //checking if this is a hole in some surface an thus must removed before deleted
      //consider method that does not have to get all surfaces.
!     Set surfaces = SurfaceFacade.getInstance().findAll();
      Iterator surfIt = surfaces.iterator();
      while (surfIt.hasNext()) {
--- 358,362 ----
      //checking if this is a hole in some surface an thus must removed before deleted
      //consider method that does not have to get all surfaces.
!     Set surfaces = Project.getInstance().getSurfaces();
      Iterator surfIt = surfaces.iterator();
      while (surfIt.hasNext()) {
***************
*** 382,386 ****
            if (innerSurf == surface) {
              surf.removeHole(surface);
!             SurfaceFacade.getInstance().update(surf);
            }
          }
--- 369,373 ----
            if (innerSurf == surface) {
              surf.removeHole(surface);
!             Project.getInstance().update(surf);
            }
          }