Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32165/src/net/sourceforge/bprocessor/model
Modified Files:
Space.java
Log Message:
Classifictaion is now different on the different levels (also part level supported)
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Space.java 5 Sep 2006 07:27:47 -0000 1.55
--- Space.java 5 Sep 2006 09:44:08 -0000 1.56
***************
*** 109,120 ****
{"None", "Exteriør", "Stue", "Badeværelse", "Opvarmet rum", "Uopvarmet rum"};
! /** The construcstionspace classification options */
private String[] elementConstructionOptions =
{"None", "Karm", "Sprosse", "Post", "Vindue 2lag termo", "Vindue 3lag termo"};
! /** The functionalspace classification options */
private String[] elementFunctionalOptions =
{"None"};
/** The modellor */
private Modellor modellor;
--- 109,128 ----
{"None", "Exteriør", "Stue", "Badeværelse", "Opvarmet rum", "Uopvarmet rum"};
! /** The construcstionspace on part element, classification options */
private String[] elementConstructionOptions =
{"None", "Karm", "Sprosse", "Post", "Vindue 2lag termo", "Vindue 3lag termo"};
! /** The functionalspace on part element, classification options */
private String[] elementFunctionalOptions =
{"None"};
+ /** The construcstionspace on part level, classification options */
+ private String[] partConstructionOptions =
+ {"None"};
+
+ /** The functionalspace on part level, classification options */
+ private String[] partFunctionalOptions =
+ {"None"};
+
/** The modellor */
private Modellor modellor;
***************
*** 1108,1112 ****
}
} else {
! System.out.println("This space is on part level - implementation pending");
}
--- 1116,1124 ----
}
} else {
! if (isConstructionSpace()) {
! res.add(new Attribute("Classification", partConstructionOptions, getClassification()));
! } else {
! res.add(new Attribute("Classification", partFunctionalOptions, getClassification()));
! }
}
|