Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15395/src/net/sourceforge/bprocessor/model
Modified Files:
Surface.java
Log Message:
added some generics
Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** Surface.java 26 Feb 2007 15:06:33 -0000 1.139
--- Surface.java 12 Mar 2007 15:58:01 -0000 1.140
***************
*** 42,50 ****
private boolean constructor;
! private List edges;
private Surface exterior;
! private Set holes;
private Space frontDomain;
--- 42,50 ----
private boolean constructor;
! private List<Edge> edges;
private Surface exterior;
! private Set<Surface> holes;
private Space frontDomain;
***************
*** 158,166 ****
* @return Collection of edges
*/
! public static Collection edges(Collection surfaces) {
! Set edges = new HashSet();
! Iterator iter = surfaces.iterator();
! while (iter.hasNext()) {
! Surface current = (Surface) iter.next();
edges.addAll(current.getEdges());
}
--- 158,164 ----
* @return Collection of edges
*/
! public static Collection<Edge> edges(Collection<Surface> surfaces) {
! Set<Edge> edges = new HashSet<Edge>();
! for (Surface current : surfaces) {
edges.addAll(current.getEdges());
}
***************
*** 212,216 ****
* class="net.sourceforge.bprocessor.model.Edge"
*/
! public List getEdges() {
return edges;
}
--- 210,214 ----
* class="net.sourceforge.bprocessor.model.Edge"
*/
! public List<Edge> getEdges() {
return edges;
}
|