[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java,1.26,1.27 Surface.java,1.65,1.66 Geometry.java,1.9,1.10 Project.java,1.21,1.22

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

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

Modified Files:
	Edge.java Surface.java Geometry.java Project.java 
Log Message:
intern renamed to add

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Surface.java	23 Jan 2006 10:16:32 -0000	1.65
--- Surface.java	24 Jan 2006 14:10:42 -0000	1.66
***************
*** 365,369 ****
          newFrom = from.copy();
          map.put(from.getId(), newFrom);
!         Project.getInstance().intern(newFrom);
        }
        newEdge.setFrom(newFrom);
--- 365,369 ----
          newFrom = from.copy();
          map.put(from.getId(), newFrom);
!         Project.getInstance().add(newFrom);
        }
        newEdge.setFrom(newFrom);
***************
*** 373,384 ****
          newTo = to.copy();
          map.put(to.getId(), newTo);
!         Project.getInstance().intern(newTo);
        }
        newEdge.setTo(newTo);
!       Project.getInstance().intern(newEdge);
        edges.add(newEdge);
      }
      surface.setEdges(edges);
!     Project.getInstance().intern(surface);
      return surface;
    }
--- 373,384 ----
          newTo = to.copy();
          map.put(to.getId(), newTo);
!         Project.getInstance().add(newTo);
        }
        newEdge.setTo(newTo);
!       Project.getInstance().add(newEdge);
        edges.add(newEdge);
      }
      surface.setEdges(edges);
!     Project.getInstance().add(surface);
      return surface;
    }
***************
*** 425,439 ****
      for (int i = 0; i < n; i++) {
        vmap[i] = v[i].add(normal);
!       Project.getInstance().intern(vmap[i]);
      }
      
      for (int i = 0; i < n; i++) {
        topmap[i] = new Edge(vmap[i], vmap[(i + 1) % n]);
!       Project.getInstance().intern(topmap[i]);
      }
      
      for (int i = 0; i < n; i++) {
        sidemap[i] = new Edge(v[i], vmap[i]);
!       Project.getInstance().intern(sidemap[i]);
      }
      
--- 425,439 ----
      for (int i = 0; i < n; i++) {
        vmap[i] = v[i].add(normal);
!       Project.getInstance().add(vmap[i]);
      }
      
      for (int i = 0; i < n; i++) {
        topmap[i] = new Edge(vmap[i], vmap[(i + 1) % n]);
!       Project.getInstance().add(topmap[i]);
      }
      
      for (int i = 0; i < n; i++) {
        sidemap[i] = new Edge(v[i], vmap[i]);
!       Project.getInstance().add(sidemap[i]);
      }
      
***************
*** 449,453 ****
        newEdges.add(b);
        facemap[i] = new Surface(newEdges);
!       Project.getInstance().intern(facemap[i]);
        sides.add(facemap[i]);
      }
--- 449,453 ----
        newEdges.add(b);
        facemap[i] = new Surface(newEdges);
!       Project.getInstance().add(facemap[i]);
        sides.add(facemap[i]);
      }
***************
*** 459,463 ****
        }
        top = new Surface(newEdges);
!       Project.getInstance().intern(top);
      }
      
--- 459,463 ----
        }
        top = new Surface(newEdges);
!       Project.getInstance().add(top);
      }
      

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Edge.java	23 Jan 2006 10:16:32 -0000	1.26
--- Edge.java	24 Jan 2006 14:10:42 -0000	1.27
***************
*** 271,277 ****
        Vertex to = getTo();
        Edge e1 = new Edge(from, vertex);
!       Project.getInstance().intern(e1);
        Edge e2 = new Edge(vertex, to);
!       Project.getInstance().intern(e2);
        
        
--- 271,277 ----
        Vertex to = getTo();
        Edge e1 = new Edge(from, vertex);
!       Project.getInstance().add(e1);
        Edge e2 = new Edge(vertex, to);
!       Project.getInstance().add(e2);
        
        

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Geometry.java	22 Dec 2005 11:19:57 -0000	1.9
--- Geometry.java	24 Jan 2006 14:10:42 -0000	1.10
***************
*** 236,240 ****
        if (clockwise != null) {
          if (clockwise.angle(vertex.system()) < 0) {
!           Project.getInstance().intern(clockwise);
            surfaces.add(clockwise);
            count++;
--- 236,240 ----
        if (clockwise != null) {
          if (clockwise.angle(vertex.system()) < 0) {
!           Project.getInstance().add(clockwise);
            surfaces.add(clockwise);
            count++;
***************
*** 246,250 ****
        if (counterclockwise != null) {
          if (counterclockwise.angle(vertex.system()) > 0) {
!           Project.getInstance().intern(counterclockwise);
            surfaces.add(counterclockwise);
            count++;
--- 246,250 ----
        if (counterclockwise != null) {
          if (counterclockwise.angle(vertex.system()) > 0) {
!           Project.getInstance().add(counterclockwise);
            surfaces.add(counterclockwise);
            count++;

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Project.java	24 Jan 2006 09:24:57 -0000	1.21
--- Project.java	24 Jan 2006 14:10:42 -0000	1.22
***************
*** 145,149 ****
     * @param space The space
     */
!   public void intern(Space space) {
      space.setId(new Long(spaceId++));
      spaces.put(space.getId(), space);
--- 145,149 ----
     * @param space The space
     */
!   public void add(Space space) {
      space.setId(new Long(spaceId++));
      spaces.put(space.getId(), space);
***************
*** 180,184 ****
     * @param e The edge
     */
!   public void intern(Edge e) {
      e.setId(new Long(edgeId++));
      edges.put(e.getId(), e);
--- 180,184 ----
     * @param e The edge
     */
!   public void add(Edge e) {
      e.setId(new Long(edgeId++));
      edges.put(e.getId(), e);
***************
*** 250,254 ****
     * @param s The surface
     */
!   public void intern(Surface s) {
      s.setId(new Long(surfaceId++));
      surfaces.put(s.getId(), s);
--- 250,254 ----
     * @param s The surface
     */
!   public void add(Surface s) {
      s.setId(new Long(surfaceId++));
      surfaces.put(s.getId(), s);
***************
*** 297,301 ****
     * @param v The vertex
     */
!   public void intern(Vertex v) {
      v.setId(new Long(vertexId++));
      vertices.put(v.getId(), v);
--- 297,301 ----
     * @param v The vertex
     */
!   public void add(Vertex v) {
      v.setId(new Long(vertexId++));
      vertices.put(v.getId(), v);
***************
*** 334,338 ****
     * @param c The camera
     */
!   public void intern(Camera c) {
      c.setId(new Long(cameraId++));
      cameras.put(c.getId(), c);
--- 334,338 ----
     * @param c The camera
     */
!   public void add(Camera c) {
      c.setId(new Long(cameraId++));
      cameras.put(c.getId(), c);