bprocessor-commit

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10921/src/net/sourceforge/bprocessor/model

Modified Files:
	ClippingPlane.java 
Log Message:
generics

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ClippingPlane.java	16 Apr 2007 15:55:22 -0000	1.19
--- ClippingPlane.java	7 May 2007 13:31:09 -0000	1.20
***************
*** 36,43 ****
  
    /** The corners */
!   private ArrayList corners;
  
    /** The silluet */
!   private ArrayList silluet;
    
    /** The edge map */
--- 36,43 ----
  
    /** The corners */
!   private ArrayList<Vertex> corners;
  
    /** The silluet */
!   private ArrayList<Edge> silluet;
    
    /** The edge map */
***************
*** 61,66 ****
      this.isActive = true;
      this.plane = cs.plane();
!     this.silluet = new ArrayList();
!     this.corners = new ArrayList();
      this.toModel = new HashMap();
      Project.getInstance().addObserver(this);
--- 61,66 ----
      this.isActive = true;
      this.plane = cs.plane();
!     this.silluet = new ArrayList<Edge>();
!     this.corners = new ArrayList<Vertex>();
      this.toModel = new HashMap();
      Project.getInstance().addObserver(this);
***************
*** 139,143 ****
     * @return The corners
     */
!   public Collection getCorners() {
      if (corners.isEmpty()) {
        update();
--- 139,143 ----
     * @return The corners
     */
!   public Collection<Vertex> getCorners() {
      if (corners.isEmpty()) {
        update();
***************
*** 150,155 ****
     * @return the set of vertices
     */
!   public Set collect() {
!     Set result = new HashSet();
      result.add(center());
      return result;
--- 150,155 ----
     * @return the set of vertices
     */
!   public Set<Vertex> collect() {
!     Set<Vertex> result = new HashSet<Vertex>();
      result.add(center());
      return result;
***************
*** 178,182 ****
     * @return The intersection edges
     */
!   public Collection getLines() {
      return silluet;
    }
--- 178,182 ----
     * @return The intersection edges
     */
!   public Collection<Edge> getLines() {
      return silluet;
    }
***************
*** 189,198 ****
     * @return The set of all intersection vertices
     */
!   public Collection findIntersections() {
      toModel.clear();
      Space space = Project.getInstance().getActiveSpace();
      Collection edges = Geometry.getActiveEdges(space);
      silluet.clear();
!     Collection res = new ArrayList();
      Plane plan = cs.plane();
      Iterator it = edges.iterator();
--- 189,198 ----
     * @return The set of all intersection vertices
     */
!   public Collection<Vertex> findIntersections() {
      toModel.clear();
      Space space = Project.getInstance().getActiveSpace();
      Collection edges = Geometry.getActiveEdges(space);
      silluet.clear();
!     Collection<Vertex> res = new ArrayList<Vertex>();
      Plane plan = cs.plane();
      Iterator it = edges.iterator();
***************
*** 260,264 ****
          Vertex v4 = system.translate((Vertex)corners.get(3));
          v4.setZ(0);
!         corners = new ArrayList();
          corners.add(system.unTranslate(v1));
          corners.add(system.unTranslate(v2));
--- 260,264 ----
          Vertex v4 = system.translate((Vertex)corners.get(3));
          v4.setZ(0);
!         corners = new ArrayList<Vertex>();
          corners.add(system.unTranslate(v1));
          corners.add(system.unTranslate(v2));
***************
*** 296,300 ****
        v3 = system.unTranslate(v3);
        v4 = system.unTranslate(v4);
!       corners = new ArrayList();
        corners.add(v1);
        corners.add(v2);
--- 296,300 ----
        v3 = system.unTranslate(v3);
        v4 = system.unTranslate(v4);
!       corners = new ArrayList<Vertex>();
        corners.add(v1);
        corners.add(v2);