Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv772/src/net/sourceforge/bprocessor/model
Modified Files:
Surface.java Space.java
Log Message:
material
Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.211
retrieving revision 1.212
diff -C2 -d -r1.211 -r1.212
*** Surface.java 17 Dec 2007 14:20:37 -0000 1.211
--- Surface.java 18 Dec 2007 08:02:53 -0000 1.212
***************
*** 574,577 ****
--- 574,579 ----
}
copy.setEdges(edges);
+ copy.setFrontMaterial(getFrontMaterial());
+ copy.setBackMaterial(getBackMaterial());
}
return copy;
***************
*** 1298,1302 ****
public void setBackMaterial(Material back) {
backMaterial = back;
!
}
--- 1300,1316 ----
public void setBackMaterial(Material back) {
backMaterial = back;
! }
!
! /**
! * Returs the material to be used on the back side
! *
! * @return back material
! */
! public Material backMaterial() {
! if (backMaterial != null) {
! return backMaterial;
! } else {
! return backDomain.material();
! }
}
***************
*** 1315,1319 ****
public void setFrontMaterial(Material front) {
frontMaterial = front;
!
}
--- 1329,1344 ----
public void setFrontMaterial(Material front) {
frontMaterial = front;
! }
!
! /**
! * Returns the material to used for the front side
! * @return the front material
! */
! public Material frontMaterial() {
! if (frontMaterial != null) {
! return frontMaterial;
! } else {
! return frontDomain.material();
! }
}
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.229
retrieving revision 1.230
diff -C2 -d -r1.229 -r1.230
*** Space.java 17 Dec 2007 13:09:16 -0000 1.229
--- Space.java 18 Dec 2007 08:02:53 -0000 1.230
***************
*** 61,64 ****
--- 61,66 ----
protected boolean transparent;
+
+
/**
* The next boolean specifies wether or not
***************
*** 196,199 ****
--- 198,215 ----
/**
+ * Returns the material for this space
+ * @return material to used for this space
+ */
+ public Material material() {
+ if (isVoid()) {
+ return Defaults.getVoidMaterial();
+ } else if (isFunctionalSpace()) {
+ return Defaults.getFunctionalMaterial();
+ } else {
+ return Defaults.getConstructionMaterial();
+ }
+ }
+
+ /**
*
* @param container isContainer
|
