[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Mesh.java,NONE,1.1 Edge.java,1.25,1.26 Vertex.java,1.18,1.19 Surface.java,1.64,1.65 Project.java,1.19,1.20

[Michael L. <he...@us...>]

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

Modified Files:
	Edge.java Vertex.java Surface.java Project.java 
Added Files:
	Mesh.java 
Log Message:
Startet implementation of Mesh. Changed uses of Set to Collection.

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Surface.java	5 Jan 2006 10:40:39 -0000	1.64
--- Surface.java	23 Jan 2006 10:16:32 -0000	1.65
***************
*** 8,11 ****
--- 8,12 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  import java.util.HashMap;
  import java.util.Iterator;
***************
*** 582,586 ****
      
      if (this.isInner()) {
!       Set surfaces = Project.getInstance().getSurfaces();
        Iterator surfIt = surfaces.iterator();
        while (surfIt.hasNext()) {
--- 583,587 ----
      
      if (this.isInner()) {
!       Collection surfaces = Project.getInstance().getSurfaces();
        Iterator surfIt = surfaces.iterator();
        while (surfIt.hasNext()) {

--- NEW FILE: Mesh.java ---
//---------------------------------------------------------------------------------
// $Id: Mesh.java,v 1.1 2006/01/23 10:16:32 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.Collection;
import java.util.HashMap;

/**
 * The Mesh is a collection of surfaces, edges and vertices.
 */
public class Mesh {
  /** The vertices */
  private HashMap vertices;
  
  /** The next vertex id */
  private long nextVertexId;
  
  /**
   * Constructor for Mesh
   */
  public Mesh() {
    super();
    vertices = new HashMap();
  }
  
  
  /**
   * Add a vertex
   * @param vertex The vertex
   */
  public void add(Vertex vertex) {
    Long id = new Long(nextVertexId++);
    vertex.setId(id);
    vertices.put(id, vertex);
  }
  
  /**
   * Remove a vertex
   * @param vertex The vertex
   */
  public void remove(Vertex vertex) {
    vertices.remove(vertex.getId());
    vertex.setId(null);
  }
  
  /**
   * Insert a vertex
   * @param vertex The vertex
   * @return The vertex
   */
  public Vertex insert(Vertex vertex) {
    add(vertex);
    return vertex;
  }
  
  /**
   * Delete a vertex
   * @param vertex The vertex
   */
  public void delete(Vertex vertex) {
    remove(vertex);
  }
  
  /**
   * Return the vertices
   * @return The vertices
   */
  public Collection getVertices() {
    return vertices.values();
  }
  
  /**
   * Return the vertex
   * @param id The id
   * @return The vertex
   */
  public Vertex getVertex(long id) {
    return (Vertex) vertices.get(new Long(id));
  }

}

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Vertex.java	19 Dec 2005 19:37:54 -0000	1.18
--- Vertex.java	23 Jan 2006 10:16:32 -0000	1.19
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.model;
  
+ import java.util.Collection;
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 125,129 ****
    public Set getEdges() {
      Set result = new HashSet();
!     Set edges = Project.getInstance().getEdges();
      Iterator iter = edges.iterator();
      while (iter.hasNext()) {
--- 126,130 ----
    public Set getEdges() {
      Set result = new HashSet();
!     Collection edges = Project.getInstance().getEdges();
      Iterator iter = edges.iterator();
      while (iter.hasNext()) {

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Edge.java	21 Dec 2005 14:36:36 -0000	1.25
--- Edge.java	23 Jan 2006 10:16:32 -0000	1.26
***************
*** 9,12 ****
--- 9,13 ----
  import org.apache.log4j.Logger;
  
+ import java.util.Collection;
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 299,303 ****
    public Set getSurfaces() {
      Set result = new HashSet();
!     Set surfaces = Project.getInstance().getSurfaces();
      Iterator iter = surfaces.iterator();
      while (iter.hasNext()) {
--- 300,304 ----
    public Set getSurfaces() {
      Set result = new HashSet();
!     Collection surfaces = Project.getInstance().getSurfaces();
      Iterator iter = surfaces.iterator();
      while (iter.hasNext()) {

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Project.java	19 Jan 2006 17:23:35 -0000	1.19
--- Project.java	23 Jan 2006 10:16:32 -0000	1.20
***************
*** 155,159 ****
     * @return The construction spaces
     */
!   public Set getConstructionSpaces() {
      return filter(spaces.values(), ConstructionSpace.class);
    }
--- 155,159 ----
     * @return The construction spaces
     */
!   public Collection getConstructionSpaces() {
      return filter(spaces.values(), ConstructionSpace.class);
    }
***************
*** 163,167 ****
     * @return the set of all domains
     */
!   public Set getSpaces() {
      return new HashSet(spaces.values());
    }
--- 163,167 ----
     * @return the set of all domains
     */
!   public Collection getSpaces() {
      return new HashSet(spaces.values());
    }
***************
*** 200,204 ****
     * @return The edges
     */
!   public Set getEdges() {
      return new HashSet(edges.values());
    }
--- 200,204 ----
     * @return The edges
     */
!   public Collection getEdges() {
      return new HashSet(edges.values());
    }
***************
*** 242,246 ****
     * @return The functional spaces
     */
!   public Set getFunctionalSpaces() {
      return filter(spaces.values(), FunctionalSpace.class);
    }
--- 242,246 ----
     * @return The functional spaces
     */
!   public Collection getFunctionalSpaces() {
      return filter(spaces.values(), FunctionalSpace.class);
    }
***************
*** 280,284 ****
     * @return The surfaces
     */
!   public Set getSurfaces() {
      return new HashSet(surfaces.values());
    }
--- 280,284 ----
     * @return The surfaces
     */
!   public Collection getSurfaces() {
      return new HashSet(surfaces.values());
    }
***************
*** 317,321 ****
     * @return The vertexs
     */
!   public Set getVertices() {
      return new HashSet(vertices.values());
    }
--- 317,321 ----
     * @return The vertexs
     */
!   public Collection getVertices() {
      return new HashSet(vertices.values());
    }
***************
*** 344,348 ****
     * @return The cameras
     */
!   public Set getCameras() {
      return new HashSet(cameras.values());
    }
--- 344,348 ----
     * @return The cameras
     */
!   public Collection getCameras() {
      return new HashSet(cameras.values());
    }
***************
*** 367,371 ****
    public Set findByLocation(double x, double y, double z, double delta) {
      Set result = new HashSet();
!     Set vertices = getVertices();
      Iterator iter = vertices.iterator();
      double limit = delta;
--- 367,371 ----
    public Set findByLocation(double x, double y, double z, double delta) {
      Set result = new HashSet();
!     Collection vertices = getVertices();
      Iterator iter = vertices.iterator();
      double limit = delta;
***************
*** 388,392 ****
    public Set findEdge(Vertex vertex) {
      Set result = new HashSet();
!     Set edges = getEdges();
      Iterator iter = edges.iterator();
      while (iter.hasNext()) {
--- 388,392 ----
    public Set findEdge(Vertex vertex) {
      Set result = new HashSet();
!     Collection edges = getEdges();
      Iterator iter = edges.iterator();
      while (iter.hasNext()) {