[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.53, 1.54 Space.java, 1.218, 1.219 Project.java, 1.149, 1.150 Persistence.java, 1.66, 1.67 Container.java, 1.1, 1.2

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

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

Modified Files:
	Command.java Space.java Project.java Persistence.java 
	Container.java 
Log Message:
Instance/Container instantiated as appropriately

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Persistence.java	12 Dec 2007 12:34:58 -0000	1.66
--- Persistence.java	12 Dec 2007 12:48:23 -0000	1.67
***************
*** 311,316 ****
      boolean container = (empty != 0);
      
-     long proto = xml.getProtoref();
-     
      // Alternative:
      //space = new Space()
--- 311,314 ----
***************
*** 319,323 ****
      //space.setContainer(container);
      
!     Space space = new Space(name, type, container);
      
      
--- 317,321 ----
      //space.setContainer(container);
      
!     Space space = new Container(name, type, container);
      
      

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.218
retrieving revision 1.219
diff -C2 -d -r1.218 -r1.219
*** Space.java	12 Dec 2007 11:06:11 -0000	1.218
--- Space.java	12 Dec 2007 12:48:23 -0000	1.219
***************
*** 28,32 ****
   * Space
   */
! public class Space extends Geometric implements Parametric {
    private static Logger log = Logger.getLogger(Space.class);
    
--- 28,32 ----
   * Space
   */
! public abstract class Space extends Geometric implements Parametric {
    private static Logger log = Logger.getLogger(Space.class);
    
***************
*** 197,201 ****
      if (container) {
        initializeContainers();
!       empty = new Space("Void", FUNCTIONAL, false);
        this.add(empty);
      }
--- 197,201 ----
      if (container) {
        initializeContainers();
!       empty = new Container("Void", FUNCTIONAL, false);
        this.add(empty);
      }
***************
*** 210,214 ****
     */
    public Space createConstructionSpace(String name) {
!     return new Space(name, Space.CONSTRUCTION, true);
    }
    
--- 210,214 ----
     */
    public Space createConstructionSpace(String name) {
!     return new Container(name, Space.CONSTRUCTION, true);
    }
    
***************
*** 219,223 ****
     */
    public Space createFunctionalSpace(String name) {
!     return new Space(name, Space.FUNCTIONAL, true);
    }
    
--- 219,223 ----
     */
    public Space createFunctionalSpace(String name) {
!     return new Container(name, Space.FUNCTIONAL, true);
    }
    
***************
*** 241,245 ****
     */
    public static Space createNet(String name) {
!     Space net = new Space(name, Space.FUNCTIONAL, true);
      net.setNet(true);
      return net;
--- 241,245 ----
     */
    public static Space createNet(String name) {
!     Space net = new Container(name, Space.FUNCTIONAL, true);
      net.setNet(true);
      return net;
***************
*** 1475,1479 ****
     */
    public Space shallowCopy() {
!     Space copy = new Space();
      copy.classification = classification;
      copy.container = container;
--- 1475,1479 ----
     */
    public Space shallowCopy() {
!     Space copy = new Container();
      copy.classification = classification;
      copy.container = container;

Index: Container.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Container.java	12 Dec 2007 10:53:50 -0000	1.1
--- Container.java	12 Dec 2007 12:48:23 -0000	1.2
***************
*** 12,15 ****
   */
  public class Container extends Space {
! 
  }
--- 12,30 ----
   */
  public class Container extends Space {
!   /**
!    * Empty constructor
!    *
!    */
!   public Container() {
!   }
!   
!   /**
!    * Constructor for container
!    * @param name The name
!    * @param type The type
!    * @param container The container flag
!    */
!   public Container(String name, int type, boolean container) {
!     super(name, type, container);
!   }
  }

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Command.java	12 Dec 2007 09:38:34 -0000	1.53
--- Command.java	12 Dec 2007 12:48:23 -0000	1.54
***************
*** 840,844 ****
        Surface side3 = new Surface(list(e3, l3, l0));
        
!       Space union = new Space("Pyramid", Space.CONSTRUCTION, true);
        
        addTo(union, list(s0, side0, side1, side2, side3));
--- 840,844 ----
        Surface side3 = new Surface(list(e3, l3, l0));
        
!       Space union = new Container("Pyramid", Space.CONSTRUCTION, true);
        
        addTo(union, list(s0, side0, side1, side2, side3));
***************
*** 923,927 ****
        Surface top = s0.extrusion(d, sides);
        
!       Space union = new Space("Cube", Space.CONSTRUCTION, true);
        Collection<Surface> surfaces = new LinkedList();
        surfaces.add(s0);
--- 923,927 ----
        Surface top = s0.extrusion(d, sides);
        
!       Space union = new Container("Cube", Space.CONSTRUCTION, true);
        Collection<Surface> surfaces = new LinkedList();
        surfaces.add(s0);
***************
*** 1357,1361 ****
        Offset.offsetIt(boundary, -inside + (delta / 2));
        
!       Space union = new Space("Frame", Space.CONSTRUCTION, true);
        
        Collection<Surface> inserted = new LinkedList();
--- 1357,1361 ----
        Offset.offsetIt(boundary, -inside + (delta / 2));
        
!       Space union = new Container("Frame", Space.CONSTRUCTION, true);
        
        Collection<Surface> inserted = new LinkedList();
***************
*** 1391,1396 ****
        
        {
!         Space ext = new Space(exteriorName, Space.FUNCTIONAL, true);
!         Space frame = new Space(frameName, Space.CONSTRUCTION, true);
          if (depth > 0) {
            exterior.assignBack(ext, true);
--- 1391,1396 ----
        
        {
!         Space ext = new Container(exteriorName, Space.FUNCTIONAL, true);
!         Space frame = new Container(frameName, Space.CONSTRUCTION, true);
          if (depth > 0) {
            exterior.assignBack(ext, true);
***************
*** 1413,1417 ****
              sign = depth;
            }
!           Space hole = new Space(holeName + " " + i, Space.FUNCTIONAL, true);
            if (sign > 0) {
              current.assignFront(hole, true);
--- 1413,1417 ----
              sign = depth;
            }
!           Space hole = new Container(holeName + " " + i, Space.FUNCTIONAL, true);
            if (sign > 0) {
              current.assignFront(hole, true);
***************
*** 1516,1520 ****
          }
        }
!       Space union = new Space("Layer", Space.CONSTRUCTION, true);
        for (Prism current : prisms) {
          Shape.addTo(union, current.surfaces());
--- 1516,1520 ----
          }
        }
!       Space union = new Container("Layer", Space.CONSTRUCTION, true);
        for (Prism current : prisms) {
          Shape.addTo(union, current.surfaces());

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** Project.java	11 Dec 2007 15:14:13 -0000	1.149
--- Project.java	12 Dec 2007 12:48:23 -0000	1.150
***************
*** 181,185 ****
      staticObservers = new LinkedList();
      scheduledObservers = new LinkedList();
!     world = new Space("World", Space.FUNCTIONAL, true);
      world.setId(new Long(0));
      materials = new HashMap<Long, Material>();
--- 181,185 ----
      staticObservers = new LinkedList();
      scheduledObservers = new LinkedList();
!     world = new Container("World", Space.FUNCTIONAL, true);
      world.setId(new Long(0));
      materials = new HashMap<Long, Material>();