Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7158/src/net/sourceforge/bprocessor/model
Modified Files:
Domain.java Element.java Space.java Surface.java
Log Message:
Fix NPE in toString()
Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Surface.java 4 Aug 2005 10:47:57 -0000 1.6
--- Surface.java 4 Aug 2005 11:11:49 -0000 1.7
***************
*** 158,162 ****
public String toString() {
return "Surface[id=" + id + ",name=" + name + ",constructor=" + constructor +
! ",edges=" + edges.size() + "]";
}
}
--- 158,162 ----
public String toString() {
return "Surface[id=" + id + ",name=" + name + ",constructor=" + constructor +
! ",edges=" + edges == null ? "0" : edges.size() + "]";
}
}
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Space.java 28 Jul 2005 06:48:54 -0000 1.2
--- Space.java 4 Aug 2005 11:11:49 -0000 1.3
***************
*** 82,86 ****
*/
public String toString() {
! return "Space[" + super.toString() + ",elements=" + elements.size() + "]";
}
}
--- 82,87 ----
*/
public String toString() {
! return "Space[" + super.toString() + ",elements=" +
! elements == null ? "0" : elements.size() + "]";
}
}
Index: Element.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Element.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Element.java 28 Jul 2005 06:48:54 -0000 1.2
--- Element.java 4 Aug 2005 11:11:49 -0000 1.3
***************
*** 115,119 ****
*/
public String toString() {
! return "Element[" + super.toString() + ",parts=" + parts.size() + "]";
}
}
--- 115,120 ----
*/
public String toString() {
! return "Element[" + super.toString() + ",parts=" +
! parts == null ? "0" : parts.size() + "]";
}
}
Index: Domain.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Domain.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Domain.java 28 Jul 2005 06:48:54 -0000 1.2
--- Domain.java 4 Aug 2005 11:11:48 -0000 1.3
***************
*** 128,132 ****
public String toString() {
return "Domain[id=" + id + ",name=" + name + ",attributes=" + attributes.size() +
! ",surfaces=" + surfaces.size() + "]";
}
}
--- 128,132 ----
public String toString() {
return "Domain[id=" + id + ",name=" + name + ",attributes=" + attributes.size() +
! ",surfaces=" + surfaces == null ? "0" : surfaces.size() + "]";
}
}
|