[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java,1.12,1.13 Vertex.java,1.11,1.12 EdgeFacade.java,1.8,1.9 VertexFacade.java,1.9,1.10 SurfaceFacade.java,1.12,1.13

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

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

Modified Files:
	Edge.java Vertex.java EdgeFacade.java VertexFacade.java 
	SurfaceFacade.java 
Log Message:
Change facades

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Edge.java	28 Sep 2005 13:42:48 -0000	1.12
--- Edge.java	30 Sep 2005 12:47:46 -0000	1.13
***************
*** 11,14 ****
--- 11,17 ----
  import org.apache.log4j.Logger;
  
+ 
+ import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 285,289 ****
     */
    public Set getSurfaces() {
!     return SurfaceFacade.getInstance().findByEdge(this);
    }
    
--- 288,301 ----
     */
    public Set getSurfaces() {
!     Set result = new HashSet();
!     Set surfaces = SurfaceFacade.getInstance().findAll();
!     Iterator iter = surfaces.iterator();
!     while (iter.hasNext()) {
!       Surface current = (Surface) iter.next();
!       if (current.contains(this)) {
!         result.add(current);
!       }
!     }
!     return result;
    }
    

Index: EdgeFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/EdgeFacade.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EdgeFacade.java	30 Sep 2005 11:35:06 -0000	1.8
--- EdgeFacade.java	30 Sep 2005 12:47:46 -0000	1.9
***************
*** 224,262 ****
      return result;
    }
- 
-   /**
-    * Find edges that has a vertex
-    * @param v The vertex
-    * @return The edges
-    */
-   public synchronized Set findByVertex(Vertex v) {
-     Set result = new HashSet();
- 
-     HibernateUtil hu = HibernateUtil.getInstance();
-     Transaction tx = null;
-     try {
-       Session session = hu.currentSession();
-       tx = session.beginTransaction();
- 
-       Query q = session.createQuery("SELECT e FROM Edge AS e " + 
-                                     "WHERE e.from.id = :id OR e.to.id = :id");
-       q.setLong("id", v.getId().longValue());
-     
-       Iterator it = q.iterate();
-       while (it.hasNext()) {
-         result.add((Edge)it.next());
-       }
- 
-       tx.commit();
-     } catch (Exception ex) {
-       if (tx != null) {
-         tx.rollback();
-       }
-       log.error(ex.getMessage(), ex);
-     } finally {
-       hu.closeSession();
-     }
- 
-     return result;
-   }
  }
--- 224,226 ----

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Vertex.java	28 Sep 2005 13:42:48 -0000	1.11
--- Vertex.java	30 Sep 2005 12:47:46 -0000	1.12
***************
*** 8,11 ****
--- 8,13 ----
  
  import java.io.Serializable;
+ import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 186,190 ****
     */
    public Set getEdges() {
!     return EdgeFacade.getInstance().findByVertex(this);
    }
  
--- 188,201 ----
     */
    public Set getEdges() {
!     Set result = new HashSet();
!     Set edges = EdgeFacade.getInstance().findAll();
!     Iterator iter = edges.iterator();
!     while (iter.hasNext()) {
!       Edge current = (Edge) iter.next();
!       if (current.contains(this)) {
!         result.add(current);
!       }
!     }
!     return result;
    }
  
***************
*** 264,268 ****
     */
    public double length() {
!     return Math.sqrt(Math.abs(getX() * getX() + getY() * getY() + getZ() * getZ()));
    }
    
--- 275,291 ----
     */
    public double length() {
!     return Math.sqrt(getX() * getX() + getY() * getY() + getZ() * getZ());
!   }
!   
!   /**
!    * Compute distance from v to this vertex
!    * @param v The vertex to compute the distance to
!    * @return The distance
!    */
!   public double distance(Vertex v) {
!     double dx = v.getX() - getX();
!     double dy = v.getY() - getY();
!     double dz = v.getZ() - getZ();
!     return Math.sqrt(dx * dx + dy * dy + dz * dz);
    }
    

Index: SurfaceFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SurfaceFacade.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SurfaceFacade.java	30 Sep 2005 11:35:06 -0000	1.12
--- SurfaceFacade.java	30 Sep 2005 12:47:46 -0000	1.13
***************
*** 241,280 ****
      return result;
    }
- 
-   /**
-    * Find surfaces based upon an edge
-    * @param e The edge
-    * @return The surfaces
-    */
-   public synchronized Set findByEdge(Edge e) {
-     Set result = new HashSet();
- 
-     HibernateUtil hu = HibernateUtil.getInstance();
-     Transaction tx = null;
-     try {
-       Session session = hu.currentSession();
-       tx = session.beginTransaction();
- 
-       Query q = session.createQuery("SELECT s FROM Surface AS s " + 
-                                     "JOIN s.edges AS edges " + 
-                                     "WHERE edges.id = :id");
-       q.setLong("id", e.getId().longValue());
-       
-       Iterator it = q.iterate();
-       while (it.hasNext()) {
-         result.add((Surface)it.next());
-       }
- 
-       tx.commit();
-     } catch (Exception ex) {
-       if (tx != null) {
-         tx.rollback();
-       }
-       log.error(ex.getMessage(), ex);
-     } finally {
-       hu.closeSession();
-     }
- 
-     return result;
-   }
  }
--- 241,243 ----

Index: VertexFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/VertexFacade.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VertexFacade.java	30 Sep 2005 11:35:06 -0000	1.9
--- VertexFacade.java	30 Sep 2005 12:47:46 -0000	1.10
***************
*** 235,278 ****
    public synchronized Set findByLocation(double x, double y, double z, double delta) {
      Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     Transaction tx = null;
!     try {
!       Session session = hu.currentSession();
!       tx = session.beginTransaction();
! 
!       double minX = x - delta;
!       double maxX = x + delta;
!       double minY = y - delta;
!       double maxY = y + delta;
!       double minZ = z - delta;
!       double maxZ = z + delta;
! 
!       Query q = session.createQuery("SELECT v FROM Vertex AS v WHERE " + 
!                                     "v.x BETWEEN :minX AND :maxX AND " +
!                                     "v.y BETWEEN :minY AND :maxY AND " +
!                                     "v.z BETWEEN :minZ AND :maxZ");
!       q.setDouble("minX", minX);
!       q.setDouble("maxX", maxX);
!       q.setDouble("minY", minY);
!       q.setDouble("maxY", maxY);
!       q.setDouble("minZ", minZ);
!       q.setDouble("maxZ", maxZ);
!     
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((Vertex)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       if (tx != null) {
!         tx.rollback();
        }
-       log.error(ex.getMessage(), ex);
-     } finally {
-       hu.closeSession();
      }
- 
      return result;
    }
--- 235,249 ----
    public synchronized Set findByLocation(double x, double y, double z, double delta) {
      Set result = new HashSet();
!     Set vertices = findAll();
!     Iterator iter = vertices.iterator();
!     double limit = delta;
!     Vertex tester = new Vertex("", x, y, z);
!     while (iter.hasNext()) {
!       Vertex current = (Vertex) iter.next();
!       double distance = current.distance(tester);
!       if (distance <= limit) {
!         result.add(current);
        }
      }
      return result;
    }