Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21452/src/net/sourceforge/bprocessor/model/modellor
Modified Files:
InnerWallModellor.java
Log Message:
Have refactored loadClassification and loadType as well as the storing of the types out of the Project and into a new class ClassificationFileLoader. Made A ClassificationType Class holding all type specific info such as u-value etc. Made Classification hold a ClassificationType root for all the possible types it can be. The Space now hold the classification and a ClassificationType that is the chosen Type of the possible types in the chosen classification.
Persistence now have mothods to externalize the DBK to XML, but still need a load mechanism. NOTICE THAT PERSISTENCE AND PROJECT SEEM TO HAVE CHANGED INTIRELY BUT THEY HAVEN'T ONLY THE THINGS MENTIONED HERE HAVE BEEN CHANGED
Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InnerWallModellor.java 18 May 2007 19:10:23 -0000 1.4
--- InnerWallModellor.java 25 Jun 2007 10:26:46 -0000 1.5
***************
*** 218,222 ****
space.add(base);
Space joist = new Space("joist", Space.CONSTRUCTION, space.getLevel() + 1, true);
! joist.setClassification(woodJoist());
space.add(joist);
Vertex dir = e.getDirection();
--- 218,223 ----
space.add(base);
Space joist = new Space("joist", Space.CONSTRUCTION, space.getLevel() + 1, true);
! Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
! joist.setClassificationType(c.getPossibleTypes().getSubTypes().get(0));
space.add(joist);
Vertex dir = e.getDirection();
***************
*** 733,743 ****
}
- private static Classification woodJoist() {
- Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
- Classification type = Project.getInstance().getProductType("-1.-205.01.A01");
- c.setTypeClassification(type);
- return c;
- }
-
private static Classification woodSheet() {
Classification c = Project.getInstance().getClassification("-1.-205.01.03", 0);
--- 734,737 ----
|
