[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.236, 1.237 Container.j
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2008-11-03 13:14:25
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2332/src/net/sourceforge/bprocessor/model Modified Files: Space.java Container.java Log Message: Refactor Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.236 retrieving revision 1.237 diff -C2 -d -r1.236 -r1.237 *** Space.java 23 Oct 2008 05:35:36 -0000 1.236 --- Space.java 3 Nov 2008 13:14:09 -0000 1.237 *************** *** 26,29 **** --- 26,34 ---- /** * Space + * + * Space: name + * Container: classification, product, description + * Construct: type, level, transparent, material + * */ public abstract class Space extends Geometric implements Parametric { *************** *** 107,111 **** * @param container The container flag */ ! public Space(String name, int type, boolean container) { super(); this.name = name; --- 112,116 ---- * @param container The container flag */ ! protected Space(String name, int type, boolean container) { super(); this.name = name; *************** *** 128,132 **** * @return The space */ ! public Container createConstructionSpace(String name) { return new Container(name, Container.CONSTRUCTION, true); } --- 133,137 ---- * @return The space */ ! public static Container createConstructionSpace(String name) { return new Container(name, Container.CONSTRUCTION, true); } *************** *** 137,141 **** * @return The space */ ! public Container createFunctionalSpace(String name) { return new Container(name, Container.FUNCTIONAL, true); } --- 142,146 ---- * @return The space */ ! public static Container createFunctionalSpace(String name) { return new Container(name, Container.FUNCTIONAL, true); } *************** *** 147,151 **** * @return The space */ ! public Container createUnion(String name) { Container s = createConstructionSpace(name); s.add(new CoordinateSystem(new Vertex(0, 0, 0))); --- 152,156 ---- * @return The space */ ! public static Container createUnion(String name) { Container s = createConstructionSpace(name); s.add(new CoordinateSystem(new Vertex(0, 0, 0))); Index: Container.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Container.java 23 Oct 2008 05:35:36 -0000 1.16 --- Container.java 3 Nov 2008 13:14:09 -0000 1.17 *************** *** 56,60 **** * */ ! public Container() { super(); container = true; --- 56,60 ---- * */ ! protected Container() { super(); container = true; *************** *** 70,74 **** * @param container The container flag */ ! public Container(String name, int type, boolean container) { super(name, type, container); if (container) { --- 70,74 ---- * @param container The container flag */ ! protected Container(String name, int type, boolean container) { super(name, type, container); if (container) { |