[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Modellor.java, 1.4, 1.5 Geometric.java, 1.8, 1.9 Selection.java, 1.10, 1.11 Entity.java, 1.8, 1.9

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

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

Modified Files:
	Modellor.java Geometric.java Selection.java Entity.java 
Log Message:
REfactored center to Geometry and made Modellor implement Parametric as well

Index: Modellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Modellor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Modellor.java	11 Feb 2006 15:02:21 -0000	1.4
--- Modellor.java	9 Aug 2006 15:14:58 -0000	1.5
***************
*** 13,17 ****
   * established at the creation of the Modellor.
   */
! public abstract class Modellor extends Entity implements Observer {
    /**
     * Generate a list of surfaces.
--- 13,17 ----
   * established at the creation of the Modellor.
   */
! public abstract class Modellor extends Entity implements Observer, Parametric {
    /**
     * Generate a list of surfaces.

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Entity.java	4 Jul 2006 09:36:54 -0000	1.8
--- Entity.java	9 Aug 2006 15:14:58 -0000	1.9
***************
*** 49,58 ****
      Project.getInstance().changed(this);
    }
- 
-   /**
-    * Return the center for the entity
-    * @return The center as a vertex
-    */
-   public abstract Vertex center();
    
    /**
--- 49,52 ----

Index: Selection.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Selection.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Selection.java	3 Jul 2006 14:25:07 -0000	1.10
--- Selection.java	9 Aug 2006 15:14:58 -0000	1.11
***************
*** 257,262 ****
      if (it.hasNext()) {
        Object o = it.next();
!       if (o instanceof Entity) {
!         Vertex v = ((Entity)o).center();
          center = v;
        }
--- 257,262 ----
      if (it.hasNext()) {
        Object o = it.next();
!       if (o instanceof Geometric) {
!         Vertex v = ((Geometric)o).center();
          center = v;
        }

Index: Geometric.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometric.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Geometric.java	23 Jul 2006 09:17:36 -0000	1.8
--- Geometric.java	9 Aug 2006 15:14:58 -0000	1.9
***************
*** 69,71 ****
--- 69,77 ----
      
    }
+ 
+   /**
+    * Return the center for the entity
+    * @return The center as a vertex
+    */
+   public abstract Vertex center();
  }