bprocessor-commit — Commit

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions CreateConstructionSpaceActionListener.java,1.1.1.1,1.2 CreateConstructorActionListener.java,1.2,1.3 CreateElementActionListener.java,1.2,1.3 CreateFunctionalSpaceActionListener.java,1.1.1.1,1.2 CreatePartActionListener.java,1.2,1.3 CreateSurfaceActionListener.java,1.2,1.3 ToolsDetachActionListener.java,1.1,1.2 ToolsJoinActionListener.java,1.1,1.2

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8893/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	CreateConstructionSpaceActionListener.java 
	CreateConstructorActionListener.java 
	CreateElementActionListener.java 
	CreateFunctionalSpaceActionListener.java 
	CreatePartActionListener.java CreateSurfaceActionListener.java 
	ToolsDetachActionListener.java ToolsJoinActionListener.java 
Log Message:
Use the new facades and relationships in model

Index: ToolsDetachActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsDetachActionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ToolsDetachActionListener.java	11 Jul 2005 08:42:23 -0000	1.1
--- ToolsDetachActionListener.java	28 Jul 2005 06:54:41 -0000	1.2
***************
*** 568,571 ****
--- 568,572 ----
              
              fs.getSurfaces().remove(s);
+             fsf.update(fs);
            } else if (rsname.equals(ELEMENTS)) {
              ElementFacade ef = ElementFacade.getInstance();
***************
*** 573,576 ****
--- 574,578 ----
              
              fs.getElements().remove(e);
+             fsf.update(fs);
            }            
          } else if (lsname.equals(CONSTRUCTION_SPACES)) {
***************
*** 583,586 ****
--- 585,589 ----
              
              cs.getSurfaces().remove(s);
+             csf.update(cs);
            } else if (rsname.equals(ELEMENTS)) {
              ElementFacade ef = ElementFacade.getInstance();
***************
*** 588,591 ****
--- 591,595 ----
              
              cs.getElements().remove(e);
+             csf.update(cs);
            }            
          } else if (lsname.equals(ELEMENTS)) {
***************
*** 598,601 ****
--- 602,606 ----
              
              e.getSurfaces().remove(s);
+             ef.update(e);
            } else if (rsname.equals(PARTS)) {
              PartFacade pf = PartFacade.getInstance();
***************
*** 603,606 ****
--- 608,612 ----
              
              e.getParts().remove(p);
+             ef.update(e);
            }            
          } else if (lsname.equals(PARTS)) {
***************
*** 613,616 ****
--- 619,623 ----
              
              p.getSurfaces().remove(s);
+             pf.update(p);
            }            
          }

Index: CreateElementActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateElementActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateElementActionListener.java	11 Jul 2005 08:40:21 -0000	1.2
--- CreateElementActionListener.java	28 Jul 2005 06:54:40 -0000	1.3
***************
*** 49,53 ****
        Element el = new Element(result.trim());
  
!       ef.add(el);
  
        Notification n = new Notification(Notification.ELEMENT_CREATED, el.getId());
--- 49,53 ----
        Element el = new Element(result.trim());
  
!       el = ef.create(el);
  
        Notification n = new Notification(Notification.ELEMENT_CREATED, el.getId());

Index: ToolsJoinActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsJoinActionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ToolsJoinActionListener.java	11 Jul 2005 08:41:59 -0000	1.1
--- ToolsJoinActionListener.java	28 Jul 2005 06:54:41 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import java.awt.event.ItemListener;
  import java.util.Collection;
+ import java.util.HashSet;
  import java.util.Iterator;
  import java.util.Vector;
***************
*** 370,389 ****
--- 371,406 ----
              FunctionalSpace fs = fsf.findById(rsvalue.getId());
              
+             if (fs.getSurfaces() == null) {
+               fs.setSurfaces(new HashSet());
+             }
              fs.getSurfaces().add(s);
+             fsf.update(fs);
            } else if (rsname.equals(CONSTRUCTION_SPACES)) {
              ConstructionSpaceFacade csf = ConstructionSpaceFacade.getInstance();
              ConstructionSpace cs = csf.findById(rsvalue.getId());
              
+             if (cs.getSurfaces() == null) {
+               cs.setSurfaces(new HashSet());
+             }
              cs.getSurfaces().add(s);
+             csf.update(cs);
            } else if (rsname.equals(ELEMENTS)) {
              ElementFacade ef = ElementFacade.getInstance();
              Element e = ef.findById(rsvalue.getId());
              
+             if (e.getSurfaces() == null) {
+               e.setSurfaces(new HashSet());
+             }
              e.getSurfaces().add(s);
+             ef.update(e);
            } else if (rsname.equals(PARTS)) {
              PartFacade pf = PartFacade.getInstance();
              Part p = pf.findById(rsvalue.getId());
              
+             if (p.getSurfaces() == null) {
+               p.setSurfaces(new HashSet());
+             }
              p.getSurfaces().add(s);
+             pf.update(p);
            }
          } else if (lsname.equals(ELEMENTS)) {
***************
*** 395,404 ****
--- 412,429 ----
              FunctionalSpace fs = fsf.findById(rsvalue.getId());
              
+             if (fs.getElements() == null) {
+               fs.setElements(new HashSet());
+             }
              fs.getElements().add(e);
+             fsf.update(fs);
            } else if (rsname.equals(CONSTRUCTION_SPACES)) {
              ConstructionSpaceFacade csf = ConstructionSpaceFacade.getInstance();
              ConstructionSpace cs = csf.findById(rsvalue.getId());
              
+             if (cs.getElements() == null) {
+               cs.setElements(new HashSet());
+             }
              cs.getElements().add(e);
+             csf.update(cs);
            }
          } else if (lsname.equals(PARTS)) {
***************
*** 410,414 ****
--- 435,443 ----
              Element e = ef.findById(rsvalue.getId());
              
+             if (e.getParts() == null) {
+               e.setParts(new HashSet());
+             }
              e.getParts().add(p);
+             ef.update(e);
            }
          }

Index: CreatePartActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreatePartActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreatePartActionListener.java	11 Jul 2005 08:40:21 -0000	1.2
--- CreatePartActionListener.java	28 Jul 2005 06:54:40 -0000	1.3
***************
*** 49,53 ****
        Part p = new Part(result.trim());
  
!       pf.add(p);
  
        Notification n = new Notification(Notification.PART_CREATED, p.getId());
--- 49,53 ----
        Part p = new Part(result.trim());
  
!       p = pf.create(p);
  
        Notification n = new Notification(Notification.PART_CREATED, p.getId());

Index: CreateConstructionSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructionSpaceActionListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CreateConstructionSpaceActionListener.java	27 Jun 2005 09:32:23 -0000	1.1.1.1
--- CreateConstructionSpaceActionListener.java	28 Jul 2005 06:54:40 -0000	1.2
***************
*** 50,54 ****
        ConstructionSpace cs = new ConstructionSpace(result.trim());
  
!       csf.add(cs);
  
        Notification n = new Notification(Notification.CONSTRUCTION_SPACE_CREATED, cs.getId());
--- 50,54 ----
        ConstructionSpace cs = new ConstructionSpace(result.trim());
  
!       cs = csf.create(cs);
  
        Notification n = new Notification(Notification.CONSTRUCTION_SPACE_CREATED, cs.getId());

Index: CreateConstructorActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructorActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateConstructorActionListener.java	18 Jul 2005 09:27:51 -0000	1.2
--- CreateConstructorActionListener.java	28 Jul 2005 06:54:40 -0000	1.3
***************
*** 48,52 ****
        s.setConstructor(true);
  
!       sf.add(s);
      }
    }
--- 48,52 ----
        s.setConstructor(true);
  
!       s = sf.create(s);
      }
    }

Index: CreateFunctionalSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateFunctionalSpaceActionListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CreateFunctionalSpaceActionListener.java	27 Jun 2005 09:32:23 -0000	1.1.1.1
--- CreateFunctionalSpaceActionListener.java	28 Jul 2005 06:54:40 -0000	1.2
***************
*** 50,54 ****
        FunctionalSpace fs = new FunctionalSpace(result.trim());
  
!       fsf.add(fs);
  
        Notification n = new Notification(Notification.FUNCTIONAL_SPACE_CREATED, fs.getId());
--- 50,54 ----
        FunctionalSpace fs = new FunctionalSpace(result.trim());
  
!       fs = fsf.create(fs);
  
        Notification n = new Notification(Notification.FUNCTIONAL_SPACE_CREATED, fs.getId());

Index: CreateSurfaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateSurfaceActionListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateSurfaceActionListener.java	1 Jul 2005 11:29:00 -0000	1.2
--- CreateSurfaceActionListener.java	28 Jul 2005 06:54:40 -0000	1.3
***************
*** 49,53 ****
        Surface s = new Surface(result.trim());
  
!       sf.add(s);
  
        Notification n = new Notification(Notification.SURFACE_CREATED, s.getId());
--- 49,53 ----
        Surface s = new Surface(result.trim());
  
!       s = sf.create(s);
  
        Notification n = new Notification(Notification.SURFACE_CREATED, s.getId());

[Bprocessor-commit] model/src/etc bprocessor.xsd,1.1,1.2

[Jesper P. <je...@us...>]

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

Modified Files:
	bprocessor.xsd 
Log Message:
Remove edge reference from vertex

Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bprocessor.xsd	18 Jul 2005 09:20:06 -0000	1.1
--- bprocessor.xsd	28 Jul 2005 06:52:58 -0000	1.2
***************
*** 92,96 ****
        <xsd:element name="z" type="xsd:double"/>
        <xsd:element name="w" type="xsd:double"/>
-       <xsd:element name="edgeref" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/>
      </xsd:sequence>
    </xsd:complexType>
--- 92,95 ----

[Bprocessor-commit] model build.xml,1.2,1.3

[Jesper P. <je...@us...>]

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

Modified Files:
	build.xml 
Log Message:
Enable Hibernatedoclet (use HSQLDB/mem for now)

Index: build.xml
===================================================================
RCS file: /cvsroot/bprocessor/model/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	18 Jul 2005 09:19:15 -0000	1.2
--- build.xml	28 Jul 2005 06:52:33 -0000	1.3
***************
*** 59,62 ****
--- 59,67 ----
      </copy>
      <copy todir="${lib.dir}">
+       <fileset dir="${tools.dir}/hibernate">
+         <include name="**/*.jar"/>
+       </fileset>
+     </copy>
+     <copy todir="${lib.dir}">
        <fileset dir="${kernel.dir}/dist">
          <include name="**/kernel.jar"/>
***************
*** 92,95 ****
--- 97,135 ----
    </target>
  
+   <target name="xdoclet" depends="copylib">
+     <taskdef
+       name="hibernatedoclet"
+       classname="xdoclet.modules.hibernate.HibernateDocletTask">
+       <classpath>
+         <fileset dir="${tools.dir}/xdoclet">
+           <include name="**/*.jar"/>
+         </fileset>
+       </classpath>
+     </taskdef>
+ 
+     <hibernatedoclet
+          destdir="${build.dir}"
+          mergedir="${conf.dir}"
+          excludedtags="@version,@author,@todo,@see"
+          force="true"
+          verbose="false">
+ 
+          <fileset dir="${src.dir}">
+              <include name="**/*.java"/>
+          </fileset>
+ 
+          <hibernate version="3.0"/>
+          <hibernatecfg version="3.0"
+                        hbm2ddl="create-drop"
+                        jdbcUrl="jdbc:hsqldb:mem:bprocessor"
+                        driver="org.hsqldb.jdbcDriver"
+                        username=""
+                        password=""
+                        dialect="org.hibernate.dialect.HSQLDialect">
+          </hibernatecfg>
+ 
+      </hibernatedoclet>
+   </target>
+ 
    <target name="checkstyle" depends="prepare">
      <taskdef name="checkstyle"
***************
*** 104,108 ****
    </target>
  
!   <target name="compile" depends="checkstyle,copylib,compile-xml">
      <ant dir="src" target="compile"/>
    </target>
--- 144,148 ----
    </target>
  
!   <target name="compile" depends="checkstyle,copylib,compile-xml,xdoclet">
      <ant dir="src" target="compile"/>
    </target>

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/db package.html,NONE,1.1

[Jesper P. <je...@us...>]

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

Added Files:
	package.html 
Log Message:
Information about the db package

--- NEW FILE: package.html ---
<body>
This package contains classes that helps with the database persistence
</body>

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/db HibernateUtil.java,NONE,1.1

[Jesper P. <je...@us...>]

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

Added Files:
	HibernateUtil.java 
Log Message:
Controller of the Hibernate session

--- NEW FILE: HibernateUtil.java ---
//---------------------------------------------------------------------------------
// $Id: HibernateUtil.java,v 1.1 2005/07/28 06:50:19 jews 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.db;

import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;

import org.apache.log4j.Logger;

/**
 * Hibernate utility class
 */
public class HibernateUtil {
  /** The logger */
  private static Logger log = Logger.getLogger(HibernateUtil.class);

  /** The singleton */
  private static HibernateUtil instance;

  /** The session factory */
  private static SessionFactory sf;

  /** The session */
  private static final ThreadLocal TL = new ThreadLocal();

  /**
   * Constructor
   */
  private HibernateUtil() {
    try {
      sf = new Configuration().configure().buildSessionFactory();
    } catch (Exception e) {
      log.fatal("Exception", e);
    }
  }

  /**
   * Get the instance
   * @return The instance
   */
  public static synchronized HibernateUtil getInstance() {
    if (instance == null) {
      instance = new HibernateUtil();
    }
    return instance;
  }

  /**
   * Get the current session
   * @return The session
   */
  public Session currentSession() {
    Session s = (Session)TL.get();
    if (s == null) {
      s = sf.openSession();
      TL.set(s);
    }
    return s;
  }

  /**
   * Close the current session
   */
  public void closeSession() {
    Session s = (Session)TL.get();
    if (s != null) {
      s.close();
    }
    TL.set(null);
  }
}

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/db - New directory

[Jesper P. <je...@us...>]

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

Log Message:
Directory /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/db added to the repository

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/xml PersistenceManager.java,1.1,1.2

[Jesper P. <je...@us...>]

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

Modified Files:
	PersistenceManager.java 
Log Message:
Update to use the new facades and relationships

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PersistenceManager.java	18 Jul 2005 09:25:56 -0000	1.1
--- PersistenceManager.java	28 Jul 2005 06:49:28 -0000	1.2
***************
*** 36,39 ****
--- 36,40 ----
  import java.io.OutputStream;
  import java.util.HashMap;
+ import java.util.HashSet;
  import java.util.Iterator;
  import java.util.List;
***************
*** 156,160 ****
        mapper.put(new Long(cs.getId()), csm.getId());
  
!       ConstructionSpaceFacade.getInstance().add(csm);
  
        Notification n = new Notification(Notification.CONSTRUCTION_SPACE_CREATED, csm.getId());
--- 157,161 ----
        mapper.put(new Long(cs.getId()), csm.getId());
  
!       csm = ConstructionSpaceFacade.getInstance().create(csm);
  
        Notification n = new Notification(Notification.CONSTRUCTION_SPACE_CREATED, csm.getId());
***************
*** 176,180 ****
        mapper.put(new Long(fs.getId()), fsm.getId());
  
!       FunctionalSpaceFacade.getInstance().add(fsm);
  
        Notification n = new Notification(Notification.FUNCTIONAL_SPACE_CREATED, fsm.getId());
--- 177,181 ----
        mapper.put(new Long(fs.getId()), fsm.getId());
  
!       fsm = FunctionalSpaceFacade.getInstance().create(fsm);
  
        Notification n = new Notification(Notification.FUNCTIONAL_SPACE_CREATED, fsm.getId());
***************
*** 198,202 ****
        mapper.put(new Long(e.getId()), em.getId());
  
!       ElementFacade.getInstance().add(em);
  
        Notification n = new Notification(Notification.ELEMENT_CREATED, em.getId());
--- 199,203 ----
        mapper.put(new Long(e.getId()), em.getId());
  
!       em = ElementFacade.getInstance().create(em);
  
        Notification n = new Notification(Notification.ELEMENT_CREATED, em.getId());
***************
*** 220,224 ****
        mapper.put(new Long(p.getId()), pm.getId());
  
!       PartFacade.getInstance().add(pm);
  
        Notification n = new Notification(Notification.PART_CREATED, pm.getId());
--- 221,225 ----
        mapper.put(new Long(p.getId()), pm.getId());
  
!       pm = PartFacade.getInstance().create(pm);
  
        Notification n = new Notification(Notification.PART_CREATED, pm.getId());
***************
*** 244,248 ****
        mapper.put(new Long(s.getId()), sm.getId());
  
!       SurfaceFacade.getInstance().add(sm);
  
        Notification n = new Notification(Notification.SURFACE_CREATED, sm.getId());
--- 245,249 ----
        mapper.put(new Long(s.getId()), sm.getId());
  
!       sm = SurfaceFacade.getInstance().create(sm);
  
        Notification n = new Notification(Notification.SURFACE_CREATED, sm.getId());
***************
*** 266,270 ****
        mapper.put(new Long(e.getId()), em.getId());
  
!       EdgeFacade.getInstance().add(em);
  
        Notification n = new Notification(Notification.EDGE_CREATED, em.getId());
--- 267,271 ----
        mapper.put(new Long(e.getId()), em.getId());
  
!       em = EdgeFacade.getInstance().create(em);
  
        Notification n = new Notification(Notification.EDGE_CREATED, em.getId());
***************
*** 293,297 ****
        mapper.put(new Long(v.getId()), vm.getId());
  
!       VertexFacade.getInstance().add(vm);
  
        Notification n = new Notification(Notification.VERTEX_CREATED, vm.getId());
--- 294,298 ----
        mapper.put(new Long(v.getId()), vm.getId());
  
!       vm = VertexFacade.getInstance().create(vm);
  
        Notification n = new Notification(Notification.VERTEX_CREATED, vm.getId());
***************
*** 316,319 ****
--- 317,321 ----
        List as = cs.getAttributeref();
        if (as != null && as.size() > 0) {
+         Set ar = new HashSet();
          Iterator ias = as.iterator();
          while (ias.hasNext()) {
***************
*** 321,329 ****
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           csm.getAttributes().add(a);
          }
        }
        List ss = cs.getSurfaceref();
        if (ss != null && ss.size() > 0) {
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
--- 323,333 ----
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           ar.add(a);
          }
+         csm.setAttributes(ar);
        }
        List ss = cs.getSurfaceref();
        if (ss != null && ss.size() > 0) {
+         Set sr = new HashSet();
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
***************
*** 331,339 ****
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           csm.getSurfaces().add(s);
          }
        }
        List es = cs.getElementref();
        if (es != null && es.size() > 0) {
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
--- 335,345 ----
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           sr.add(s);
          }
+         csm.setSurfaces(sr);
        }
        List es = cs.getElementref();
        if (es != null && es.size() > 0) {
+         Set er = new HashSet();
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
***************
*** 341,347 ****
            net.sourceforge.bprocessor.model.Element e =
              ElementFacade.getInstance().findById(eid);
!           csm.getElements().add(e);
          }
        }
      }
    }
--- 347,355 ----
            net.sourceforge.bprocessor.model.Element e =
              ElementFacade.getInstance().findById(eid);
!           er.add(e);
          }
+         csm.setElements(er);
        }
+       ConstructionSpaceFacade.getInstance().update(csm);
      }
    }
***************
*** 363,366 ****
--- 371,375 ----
        List as = fs.getAttributeref();
        if (as != null && as.size() > 0) {
+         Set ar = new HashSet();
          Iterator ias = as.iterator();
          while (ias.hasNext()) {
***************
*** 368,376 ****
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           fsm.getAttributes().add(a);
          }
        }
        List ss = fs.getSurfaceref();
        if (ss != null && ss.size() > 0) {
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
--- 377,387 ----
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           ar.add(a);
          }
+         fsm.setAttributes(ar);
        }
        List ss = fs.getSurfaceref();
        if (ss != null && ss.size() > 0) {
+         Set sr = new HashSet();
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
***************
*** 378,386 ****
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           fsm.getSurfaces().add(s);
          }
        }
        List es = fs.getElementref();
        if (es != null && es.size() > 0) {
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
--- 389,399 ----
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           sr.add(s);
          }
+         fsm.setSurfaces(sr);
        }
        List es = fs.getElementref();
        if (es != null && es.size() > 0) {
+         Set er = new HashSet();
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
***************
*** 388,394 ****
            net.sourceforge.bprocessor.model.Element e =
              ElementFacade.getInstance().findById(eid);
!           fsm.getElements().add(e);
          }
        }
      }
    }
--- 401,409 ----
            net.sourceforge.bprocessor.model.Element e =
              ElementFacade.getInstance().findById(eid);
!           er.add(e);
          }
+         fsm.setElements(er);
        }
+       FunctionalSpaceFacade.getInstance().update(fsm);
      }
    }
***************
*** 411,414 ****
--- 426,430 ----
        List as = e.getAttributeref();
        if (as != null && as.size() > 0) {
+         Set ar = new HashSet();
          Iterator ias = as.iterator();
          while (ias.hasNext()) {
***************
*** 416,424 ****
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           em.getAttributes().add(a);
          }
        }
        List ss = e.getSurfaceref();
        if (ss != null && ss.size() > 0) {
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
--- 432,442 ----
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           ar.add(a);
          }
+         em.setAttributes(ar);
        }
        List ss = e.getSurfaceref();
        if (ss != null && ss.size() > 0) {
+         Set sr = new HashSet();
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
***************
*** 426,434 ****
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           em.getSurfaces().add(s);
          }
        }
        List ps = e.getPartref();
        if (ps != null && ps.size() > 0) {
          Iterator ips = ps.iterator();
          while (ips.hasNext()) {
--- 444,454 ----
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           sr.add(s);
          }
+         em.setSurfaces(sr);
        }
        List ps = e.getPartref();
        if (ps != null && ps.size() > 0) {
+         Set pr = new HashSet();
          Iterator ips = ps.iterator();
          while (ips.hasNext()) {
***************
*** 436,442 ****
            net.sourceforge.bprocessor.model.Part p =
              PartFacade.getInstance().findById(pid);
!           em.getParts().add(p);
          }
        }
      }
    }
--- 456,464 ----
            net.sourceforge.bprocessor.model.Part p =
              PartFacade.getInstance().findById(pid);
!           pr.add(p);
          }
+         em.setParts(pr);
        }
+       ElementFacade.getInstance().update(em);
      }
    }
***************
*** 459,462 ****
--- 481,485 ----
        List as = p.getAttributeref();
        if (as != null && as.size() > 0) {
+         Set ar = new HashSet();
          Iterator ias = as.iterator();
          while (ias.hasNext()) {
***************
*** 464,472 ****
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           pm.getAttributes().add(a);
          }
        }
        List ss = p.getSurfaceref();
        if (ss != null && ss.size() > 0) {
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
--- 487,497 ----
            net.sourceforge.bprocessor.model.Attribute a =
              (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
!           ar.add(a);
          }
+         pm.setAttributes(ar);
        }
        List ss = p.getSurfaceref();
        if (ss != null && ss.size() > 0) {
+         Set sr = new HashSet();
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
***************
*** 474,480 ****
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           pm.getSurfaces().add(s);
          }
        }
      }
    }
--- 499,507 ----
            net.sourceforge.bprocessor.model.Surface s =
              SurfaceFacade.getInstance().findById(sid);
!           sr.add(s);
          }
+         pm.setSurfaces(sr);
        }
+       PartFacade.getInstance().update(pm);
      }
    }
***************
*** 497,500 ****
--- 524,528 ----
        List es = s.getEdgeref();
        if (es != null && es.size() > 0) {
+         Set er = new HashSet();
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
***************
*** 502,508 ****
            net.sourceforge.bprocessor.model.Edge e =
              EdgeFacade.getInstance().findById(eid);
!           sm.getEdges().add(e);
          }
        }
      }
    }
--- 530,538 ----
            net.sourceforge.bprocessor.model.Edge e =
              EdgeFacade.getInstance().findById(eid);
!           er.add(e);
          }
+         sm.setEdges(er);
        }
+       SurfaceFacade.getInstance().update(sm);
      }
    }
***************
*** 531,534 ****
--- 561,566 ----
        v = VertexFacade.getInstance().findById(vid);
        em.setTo(v);
+ 
+       EdgeFacade.getInstance().update(em);
      }
    }
***************
*** 548,562 ****
        net.sourceforge.bprocessor.model.Vertex vm =
          VertexFacade.getInstance().findById(id);
- 
-       List es = v.getEdgeref();
-       if (es != null && es.size() > 0) {
-         Iterator ies = es.iterator();
-         while (ies.hasNext()) {
-           Long eid = (Long)mapper.get((Long)ies.next());
-           net.sourceforge.bprocessor.model.Edge e =
-             EdgeFacade.getInstance().findById(eid);
-           vm.getEdges().add(e);
-         }
-       }
      }
    }
--- 580,583 ----
***************
*** 1164,1177 ****
        net.sourceforge.bprocessor.model.xml.Vertex vx = findVertex(bp, v);
  
-       Set data = v.getEdges();
-       Iterator it = data.iterator();
-       while (it.hasNext()) {
-         net.sourceforge.bprocessor.model.Edge e =
-           (net.sourceforge.bprocessor.model.Edge)it.next();
- 
-         Map m = (Map)mapper.get(KEY_EDGE);
- 
-         vx.getEdgeref().add(m.get(e.getId()));
-       }
      }
    }
--- 1185,1188 ----

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Attribute.java,1.1.1.1,1.2 ConstructionSpaceFacade.java,1.1.1.1,1.2 ConstructionSpace.java,1.1.1.1,1.2 Domain.java,1.1.1.1,1.2 EdgeFacade.java,1.1,1.2 Edge.java,1.2,1.3 ElementFacade.java,1.1.1.1,1.2 Element.java,1.1.1.1,1.2 FunctionalSpaceFacade.java,1.1.1.1,1.2 FunctionalSpace.java,1.1.1.1,1.2 PartFacade.java,1.1.1.1,1.2 Part.java,1.1.1.1,1.2 Space.java,1.1.1.1,1.2 SurfaceFacade.java,1.1.1.1,1.2 Surface.java,1.3,1.4 VertexFacade.java,1.1,1.2 Vertex.java,1.2,1.3

[Jesper P. <je...@us...>]

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

Modified Files:
	Attribute.java ConstructionSpaceFacade.java 
	ConstructionSpace.java Domain.java EdgeFacade.java Edge.java 
	ElementFacade.java Element.java FunctionalSpaceFacade.java 
	FunctionalSpace.java PartFacade.java Part.java Space.java 
	SurfaceFacade.java Surface.java VertexFacade.java Vertex.java 
Log Message:
Use Hibernate for the persistence layer

Index: EdgeFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/EdgeFacade.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EdgeFacade.java	11 Jul 2005 09:31:23 -0000	1.1
--- EdgeFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static EdgeFacade instance;
  
-   /** Edges */
-   private Set edges;
- 
    /**
     * Constructor
     */
    private EdgeFacade() {
-     edges = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,102 ****
  
    /**
!    * Add a edge
     * @param e The edge
     */
!   public synchronized void add(Edge e) {
!     edges.add(e);
    }
  
    /**
!    * Remove a edge
     * @param e The edge
     */
    public synchronized void remove(Edge e) {
!     edges.remove(e);
    }
  
    /**
     * Find all edges
!    * @return The edges (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(edges); 
    }
  
    /**
!    * Find a edge by id
     * @param id The id
     * @return The edge
     */
!   public synchronized Edge findById(Long id) {
!     Iterator it = edges.iterator();
!     while (it.hasNext()) {
!       Edge e = (Edge)it.next();
!       if (e.getId().equals(id)) {
!         return e;
!       }
      }
!     return null;
    }
  
    /**
!    * Find a edge by name
     * @param name The name
     * @return The edge
     */
!   public synchronized Edge findByName(String name) {
!     Iterator it = edges.iterator();
!     while (it.hasNext()) {
!       Edge e = (Edge)it.next();
!       if (e.getName().equals(name)) {
!         return e;
        }
      }
!     return null;
    }
  }
--- 46,194 ----
  
    /**
!    * Create an edge
     * @param e The edge
+    * @return The edge
     */
!   public synchronized Edge create(Edge e) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(e);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return e;
    }
  
    /**
!    * Update an edge
!    * @param e The edge
!    */
!   public synchronized void update(Edge e) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.update(e);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
!   }
! 
!   /**
!    * Remove an edge
     * @param e The edge
     */
    public synchronized void remove(Edge e) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.delete(e);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
    /**
     * Find all edges
!    * @return The edges
     */
    public Set findAll() {
!     Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT e FROM Edge AS e");
!     
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((Edge)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return result;
    }
  
    /**
!    * Find an edge by id
     * @param id The id
     * @return The edge
     */
!   public Edge findById(Long id) {
!     Edge result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       result = (Edge)session.load(Edge.class, id);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
      }
! 
!     return result;
    }
  
    /**
!    * Find an edge by name
     * @param name The name
     * @return The edge
     */
!   public Edge findByName(String name) {
!     Edge result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT e FROM Edge AS e WHERE e.name = :name");
!       q.setString("name", name);
!     
!       Iterator it = q.iterate();
!       if (it.hasNext()) {
!         result = (Edge)it.next();
        }
+ 
+       tx.commit();
+     } catch (Exception ex) {
+       log.error(ex.getMessage(), ex);
+     } finally {
+       hu.closeSession();
      }
! 
!     return result;
    }
  }

Index: ConstructionSpaceFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ConstructionSpaceFacade.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ConstructionSpaceFacade.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- ConstructionSpaceFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static ConstructionSpaceFacade instance;
  
-   /** Construction spaces */
-   private Set constructionSpaces;
- 
    /**
     * Constructor
     */
    private ConstructionSpaceFacade() {
-     constructionSpaces = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,54 ****
  
    /**
!    * Add a construction space
     * @param c The construction space
     */
!   public synchronized void add(ConstructionSpace c) {
!     constructionSpaces.add(c);
    }
  
--- 46,89 ----
  
    /**
!    * Create a construction space
     * @param c The construction space
+    * @return The construction space
     */
!   public synchronized ConstructionSpace create(ConstructionSpace c) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(c);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return c;
!   }
! 
!   /**
!    * Update a construction space
!    * @param c The construction space
!    */
!   public synchronized void update(ConstructionSpace c) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.update(c);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
***************
*** 58,70 ****
     */
    public synchronized void remove(ConstructionSpace c) {
!     constructionSpaces.remove(c);
    }
  
    /**
     * Find all construction spaces
!    * @return The construction spaces (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(constructionSpaces); 
    }
  
--- 93,138 ----
     */
    public synchronized void remove(ConstructionSpace c) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.delete(c);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
    /**
     * Find all construction spaces
!    * @return The construction spaces
     */
    public Set findAll() {
!     Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT c FROM ConstructionSpace AS c");
!     
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((ConstructionSpace)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return result;
    }
  
***************
*** 74,86 ****
     * @return The construction space
     */
!   public synchronized ConstructionSpace findById(Long id) {
!     Iterator it = constructionSpaces.iterator();
!     while (it.hasNext()) {
!       ConstructionSpace c = (ConstructionSpace)it.next();
!       if (c.getId().equals(id)) {
!         return c;
!       }
      }
!     return null;
    }
  
--- 142,163 ----
     * @return The construction space
     */
!   public ConstructionSpace findById(Long id) {
!     ConstructionSpace result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       result = (ConstructionSpace)session.load(ConstructionSpace.class, id);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
      }
! 
!     return result;
    }
  
***************
*** 90,102 ****
     * @return The construction space
     */
!   public synchronized ConstructionSpace findByName(String name) {
!     Iterator it = constructionSpaces.iterator();
!     while (it.hasNext()) {
!       ConstructionSpace c = (ConstructionSpace)it.next();
!       if (c.getName().equals(name)) {
!         return c;
        }
      }
!     return null;
    }
  }
--- 167,194 ----
     * @return The construction space
     */
!   public ConstructionSpace findByName(String name) {
!     ConstructionSpace result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT c FROM ConstructionSpace AS c WHERE c.name = :name");
!       q.setString("name", name);
!     
!       Iterator it = q.iterate();
!       if (it.hasNext()) {
!         result = (ConstructionSpace)it.next();
        }
+ 
+       tx.commit();
+     } catch (Exception ex) {
+       log.error(ex.getMessage(), ex);
+     } finally {
+       hu.closeSession();
      }
! 
!     return result;
    }
  }

Index: ElementFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ElementFacade.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElementFacade.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- ElementFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static ElementFacade instance;
  
-   /** Elements */
-   private Set elements;
- 
    /**
     * Constructor
     */
    private ElementFacade() {
-     elements = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,54 ****
  
    /**
!    * Add an element
     * @param e The element
     */
!   public synchronized void add(Element e) {
!     elements.add(e);
    }
  
--- 46,89 ----
  
    /**
!    * Create an element
     * @param e The element
+    * @return The element
     */
!   public synchronized Element create(Element e) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(e);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return e;
!   }
! 
!   /**
!    * Update an element
!    * @param e The element
!    */
!   public synchronized void update(Element e) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.update(e);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
***************
*** 58,70 ****
     */
    public synchronized void remove(Element e) {
!     elements.remove(e);
    }
  
    /**
     * Find all elements
!    * @return The elements (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(elements); 
    }
  
--- 93,138 ----
     */
    public synchronized void remove(Element e) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.delete(e);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
    /**
     * Find all elements
!    * @return The elements
     */
    public Set findAll() {
!     Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT e FROM Element AS e");
!     
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((Element)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return result;
    }
  
***************
*** 74,86 ****
     * @return The element
     */
!   public synchronized Element findById(Long id) {
!     Iterator it = elements.iterator();
!     while (it.hasNext()) {
!       Element e = (Element)it.next();
!       if (e.getId().equals(id)) {
!         return e;
!       }
      }
!     return null;
    }
  
--- 142,163 ----
     * @return The element
     */
!   public Element findById(Long id) {
!     Element result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       result = (Element)session.load(Element.class, id);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
      }
! 
!     return result;
    }
  
***************
*** 90,102 ****
     * @return The element
     */
!   public synchronized Element findByName(String name) {
!     Iterator it = elements.iterator();
!     while (it.hasNext()) {
!       Element e = (Element)it.next();
!       if (e.getName().equals(name)) {
!         return e;
        }
      }
!     return null;
    }
  }
--- 167,194 ----
     * @return The element
     */
!   public Element findByName(String name) {
!     Element result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT e FROM Element AS e WHERE e.name = :name");
!       q.setString("name", name);
!     
!       Iterator it = q.iterate();
!       if (it.hasNext()) {
!         result = (Element)it.next();
        }
+ 
+       tx.commit();
+     } catch (Exception ex) {
+       log.error(ex.getMessage(), ex);
+     } finally {
+       hu.closeSession();
      }
! 
!     return result;
    }
  }

Index: FunctionalSpace.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/FunctionalSpace.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionalSpace.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- FunctionalSpace.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 11,14 ****
--- 11,19 ----
  /**
   * The functional space
+  * @hibernate.joined-subclass
+  *   table="FUNCTIONALSPACE"
+  *   lazy="false"
+  * @hibernate.key
+  *   column="SPACE_ID"
   */
  public class FunctionalSpace extends Space {
***************
*** 16,21 ****
    private static Logger log = Logger.getLogger(FunctionalSpace.class);
  
!   /** Id generator */
!   private static long l = 0;
  
    /**
--- 21,26 ----
    private static Logger log = Logger.getLogger(FunctionalSpace.class);
  
!   /** The functional space id */
!   private Long functionalSpaceId;
  
    /**
***************
*** 30,35 ****
     */
    public FunctionalSpace(String name) {
!     super(new Long(l++));
      setName(name);
    }
  
--- 35,60 ----
     */
    public FunctionalSpace(String name) {
!     super();
      setName(name);
+     setElements(null);
+   }
+ 
+   /**
+    * Get the functional space id
+    * @return The functional space id
+    * @hibernate.id
+    *   column="FUNCTIONALSPACE_ID"
+    *   generator-class="increment"
+    */
+   protected Long getFunctionalSpaceId() {
+     return functionalSpaceId;
+   }
+ 
+   /**
+    * Set the functional space id
+    * @param id The functional space id
+    */
+   private void setFunctionalSpaceId(Long id) {
+     this.functionalSpaceId = id;
    }
  
***************
*** 56,58 ****
--- 81,91 ----
      return getId().equals(fs.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "FunctionalSpace[" + super.toString() + "]";
+   }
  }

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Surface.java	18 Jul 2005 09:24:35 -0000	1.3
--- Surface.java	28 Jul 2005 06:48:54 -0000	1.4
***************
*** 8,12 ****
  
  import java.io.Serializable;
- import java.util.HashSet;
  import java.util.Set;
  
--- 8,11 ----
***************
*** 15,18 ****
--- 14,20 ----
  /**
   * The surface
+  * @hibernate.class
+  *   table="SURFACE"
+  *   lazy="false"
   */
  public class Surface implements Serializable {
***************
*** 20,26 ****
    private static Logger log = Logger.getLogger(Surface.class);
  
-   /** Id generator */
-   private static long l = 0;
- 
    /** The id */
    private Long id;
--- 22,25 ----
***************
*** 46,53 ****
     */
    public Surface(String name) {
!     setId(new Long(l++));
      setName(name);
      setConstructor(false);
!     setEdges(new HashSet());
    }
  
--- 45,52 ----
     */
    public Surface(String name) {
!     super();
      setName(name);
      setConstructor(false);
!     setEdges(null);
    }
  
***************
*** 55,58 ****
--- 54,60 ----
     * Get the id
     * @return The id
+    * @hibernate.id
+    *   column="SURFACE_ID"
+    *   generator-class="increment"
     */
    public Long getId() {
***************
*** 71,74 ****
--- 73,77 ----
     * Get the name
     * @return The name
+    * @hibernate.property
     */
    public String getName() {
***************
*** 87,90 ****
--- 90,94 ----
     * Is the surface a constructor
     * @return True if constructor; otherwise false
+    * @hibernate.property
     */
    public boolean getConstructor() {
***************
*** 103,106 ****
--- 107,117 ----
     * Get the edges
     * @return The edges
+    * @hibernate.set
+    *   cascade="delete"
+    *   lazy="false"
+    * @hibernate.key
+    *   column="SURFACE_ID"
+    * @hibernate.one-to-many
+    *   class="net.sourceforge.bprocessor.model.Edge"
     */
    public Set getEdges() {
***************
*** 138,140 ****
--- 149,160 ----
      return this.id.equals(s.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Surface[id=" + id + ",name=" + name + ",constructor=" + constructor +
+       ",edges=" + edges.size() + "]";
+   }
  }

Index: Part.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Part.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Part.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- Part.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 11,14 ****
--- 11,19 ----
  /**
   * The part
+  * @hibernate.joined-subclass
+  *   table="PART"
+  *   lazy="false"
+  * @hibernate.key
+  *   column="DOMAIN_ID"
   */
  public class Part extends Domain {
***************
*** 16,21 ****
    private static Logger log = Logger.getLogger(Part.class);
  
!   /** Id generator */
!   private static long l = 0;
  
    /**
--- 21,26 ----
    private static Logger log = Logger.getLogger(Part.class);
  
!   /** The part id */
!   private Long partId;
  
    /**
***************
*** 30,38 ****
     */
    public Part(String name) {
!     super(new Long(l++));
      setName(name);
    }
  
    /**
     * Return the hash code of the object
     * @return The hash
--- 35,62 ----
     */
    public Part(String name) {
!     super();
      setName(name);
    }
  
    /**
+    * Get the part id
+    * @return The part id
+    * @hibernate.id
+    *   column="PART_ID"
+    *   generator-class="increment"
+    */
+   protected Long getPartId() {
+     return partId;
+   }
+ 
+   /**
+    * Set the part id
+    * @param id The part id
+    */
+   private void setPartId(Long id) {
+     this.partId = id;
+   }
+ 
+   /**
     * Return the hash code of the object
     * @return The hash
***************
*** 56,58 ****
--- 80,90 ----
      return getId().equals(p.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Part[" + super.toString() + "]";
+   }
  }

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Edge.java	18 Jul 2005 09:25:05 -0000	1.2
--- Edge.java	28 Jul 2005 06:48:54 -0000	1.3
***************
*** 13,16 ****
--- 13,19 ----
  /**
   * The edge
+  * @hibernate.class
+  *   table="EDGE"
+  *   lazy="false"
   */
  public class Edge implements Serializable {
***************
*** 18,24 ****
    private static Logger log = Logger.getLogger(Edge.class);
  
-   /** Id generator */
-   private static long l = 0;
- 
    /** The id */
    private Long id;
--- 21,24 ----
***************
*** 44,51 ****
     */
    public Edge(String name) {
!     setId(new Long(l++));
      setName(name);
!     setFrom(new Vertex());
!     setTo(new Vertex());
    }
  
--- 44,51 ----
     */
    public Edge(String name) {
!     super();
      setName(name);
!     setFrom(null);
!     setTo(null);
    }
  
***************
*** 53,56 ****
--- 53,59 ----
     * Get the id
     * @return The id
+    * @hibernate.id
+    *   column="EDGE_ID"
+    *   generator-class="increment"
     */
    public Long getId() {
***************
*** 69,72 ****
--- 72,76 ----
     * Get the name
     * @return The name
+    * @hibernate.property
     */
    public String getName() {
***************
*** 85,88 ****
--- 89,95 ----
     * Get the to vertex
     * @return The end vertex
+    * @hibernate.many-to-one
+    *   column="TO_ID"
+    *   class="net.sourceforge.bprocessor.model.Vertex"
     */
    public Vertex getTo() {
***************
*** 101,104 ****
--- 108,114 ----
     * Get the from vertex
     * @return The begin vertex
+    * @hibernate.many-to-one
+    *   column="FROM_ID"
+    *   class="net.sourceforge.bprocessor.model.Vertex"
     */
    public Vertex getFrom() {
***************
*** 136,138 ****
--- 146,156 ----
      return this.id.equals(e.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Edge[id=" + id + ",name=" + name + ",from=" + from + ",to=" + to + "]";
+   }
  }

Index: ConstructionSpace.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ConstructionSpace.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ConstructionSpace.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- ConstructionSpace.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 11,14 ****
--- 11,19 ----
  /**
   * The construction space
+  * @hibernate.joined-subclass
+  *   table="CONSTRUCTIONSPACE"
+  *   lazy="false"
+  * @hibernate.key
+  *   column="SPACE_ID"
   */
  public class ConstructionSpace extends Space {
***************
*** 16,21 ****
    private static Logger log = Logger.getLogger(ConstructionSpace.class);
  
!   /** Id generator */
!   private static long l = 0;
  
    /**
--- 21,26 ----
    private static Logger log = Logger.getLogger(ConstructionSpace.class);
  
!   /** The construction space id */
!   private Long constructionSpaceId;
  
    /**
***************
*** 30,35 ****
     */
    public ConstructionSpace(String name) {
!     super(new Long(l++));
      setName(name);
    }
  
--- 35,60 ----
     */
    public ConstructionSpace(String name) {
!     super();
      setName(name);
+     setElements(null);
+   }
+ 
+   /**
+    * Get the construction space id
+    * @return The construction space id
+    * @hibernate.id
+    *   column="CONSTRUCTIONSPACE_ID"
+    *   generator-class="increment"
+    */
+   protected Long getConstructionSpaceId() {
+     return constructionSpaceId;
+   }
+ 
+   /**
+    * Set the construction space id
+    * @param id The construction space id
+    */
+   private void setConstructionSpaceId(Long id) {
+     this.constructionSpaceId = id;
    }
  
***************
*** 56,58 ****
--- 81,91 ----
      return getId().equals(cs.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "ConstructionSpace[" + super.toString() + "]";
+   }
  }

Index: Attribute.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Attribute.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- Attribute.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 13,16 ****
--- 13,20 ----
  /**
   * The attribute
+  *
+  * @hibernate.class
+  *   table="ATTRIBUTE"
+  *   lazy="false"
   */
  public class Attribute implements Serializable {
***************
*** 18,24 ****
    private static Logger log = Logger.getLogger(Attribute.class);
  
-   /** Id generator */
-   private static long l = 0;
- 
    /** The id */
    private Long id;
--- 22,25 ----
***************
*** 31,35 ****
  
    /** The value */
!   private Object value;
  
    /**
--- 32,36 ----
  
    /** The value */
!   private String value;
  
    /**
***************
*** 45,50 ****
     * @param value The value
     */
!   public Attribute(String name, String type, Object value) {
!     setId(new Long(l++));
      setName(name);
      setType(type);
--- 46,51 ----
     * @param value The value
     */
!   public Attribute(String name, String type, String value) {
!     super();
      setName(name);
      setType(type);
***************
*** 55,58 ****
--- 56,61 ----
     * Get the id
     * @return The id
+    * @hibernate.id
+    *   generator-class="increment"
     */
    public Long getId() {
***************
*** 71,74 ****
--- 74,78 ----
     * Get the name
     * @return The name
+    * @hibernate.property
     */
    public String getName() {
***************
*** 87,90 ****
--- 91,95 ----
     * Get the type
     * @return The type
+    * @hibernate.property
     */
    public String getType() {
***************
*** 103,108 ****
     * Get the value
     * @return The value
     */
!   public Object getValue() {
      return value;
    }
--- 108,114 ----
     * Get the value
     * @return The value
+    * @hibernate.property
     */
!   public String getValue() {
      return value;
    }
***************
*** 112,116 ****
     * @param value The value
     */
!   public void setValue(Object value) {
      this.value = value;
    }
--- 118,122 ----
     * @param value The value
     */
!   public void setValue(String value) {
      this.value = value;
    }
***************
*** 138,140 ****
--- 144,154 ----
      return this.id.equals(a.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Attribute[id=" + id + ",name=" + name + ",type=" + type + ",value=" + value + "]";
+   }
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Space.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- Space.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
- import java.util.HashSet;
  import java.util.Set;
  
--- 7,10 ----
***************
*** 14,17 ****
--- 13,21 ----
  /**
   * The space
+  * @hibernate.joined-subclass
+  *   table="SPACE"
+  *   lazy="false"
+  * @hibernate.key
+  *   column="DOMAIN_ID"
   */
  public abstract class Space extends Domain {
***************
*** 19,22 ****
--- 23,29 ----
    private static Logger log = Logger.getLogger(Space.class);
  
+   /** The space id */
+   private Long spaceId;
+ 
    /** The elements */
    private Set elements;
***************
*** 29,38 ****
  
    /**
!    * Constructor
!    * @param id The id
     */
!   protected Space(Long id) {
!     super(id); 
!     setElements(new HashSet());
    }
  
--- 36,55 ----
  
    /**
!    * Get the space id
!    * @return The space id
!    * @hibernate.id
!    *   column="SPACE_ID"
!    *   generator-class="increment"
     */
!   protected Long getSpaceId() {
!     return spaceId;
!   }
! 
!   /**
!    * Set the space id
!    * @param id The space id
!    */
!   private void setSpaceId(Long id) {
!     this.spaceId = id;
    }
  
***************
*** 40,43 ****
--- 57,67 ----
     * Get the elements
     * @return The elements
+    * @hibernate.set
+    *   cascade="delete"
+    *   lazy="false"
+    * @hibernate.key
+    *   column="SPACE_ID"
+    * @hibernate.one-to-many
+    *   class="net.sourceforge.bprocessor.model.Element"
     */
    public Set getElements() {
***************
*** 52,54 ****
--- 76,86 ----
      this.elements = elements;
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Space[" + super.toString() + ",elements=" + elements.size() + "]";
+   }
  }

Index: SurfaceFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SurfaceFacade.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SurfaceFacade.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- SurfaceFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static SurfaceFacade instance;
  
-   /** Surfaces */
-   private Set surfaces;
- 
    /**
     * Constructor
     */
    private SurfaceFacade() {
-     surfaces = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,54 ****
  
    /**
!    * Add a surface
     * @param s The surface
     */
!   public synchronized void add(Surface s) {
!     surfaces.add(s);
    }
  
--- 46,89 ----
  
    /**
!    * Create a surface
     * @param s The surface
+    * @return The created surface
     */
!   public synchronized Surface create(Surface s) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(s);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return s;
!   }
! 
!   /**
!    * Update a surface
!    * @param s The surface
!    */
!   public synchronized void update(Surface s) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.update(s);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
***************
*** 58,70 ****
     */
    public synchronized void remove(Surface s) {
!     surfaces.remove(s);
    }
  
    /**
     * Find all surfaces
!    * @return The surfaces (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(surfaces); 
    }
  
--- 93,138 ----
     */
    public synchronized void remove(Surface s) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.delete(s);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
    /**
     * Find all surfaces
!    * @return The surfaces
     */
    public Set findAll() {
!     Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT s FROM Surface AS s");
!       
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((Surface)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return result;
    }
  
***************
*** 74,86 ****
     * @return The surface
     */
!   public synchronized Surface findById(Long id) {
!     Iterator it = surfaces.iterator();
!     while (it.hasNext()) {
!       Surface s = (Surface)it.next();
!       if (s.getId().equals(id)) {
!         return s;
!       }
      }
!     return null;
    }
  
--- 142,163 ----
     * @return The surface
     */
!   public Surface findById(Long id) {
!     Surface result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       result = (Surface)session.load(Surface.class, id);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
      }
! 
!     return result;
    }
  
***************
*** 90,102 ****
     * @return The surface
     */
!   public synchronized Surface findByName(String name) {
!     Iterator it = surfaces.iterator();
!     while (it.hasNext()) {
!       Surface s = (Surface)it.next();
!       if (s.getName().equals(name)) {
!         return s;
        }
      }
!     return null;
    }
  }
--- 167,194 ----
     * @return The surface
     */
!   public Surface findByName(String name) {
!     Surface result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT s FROM Surface AS s WHERE s.name = :name");
!       q.setString("name", name);
!     
!       Iterator it = q.iterate();
!       if (it.hasNext()) {
!         result = (Surface)it.next();
        }
+ 
+       tx.commit();
+     } catch (Exception ex) {
+       log.error(ex.getMessage(), ex);
+     } finally {
+       hu.closeSession();
      }
! 
!     return result;
    }
  }

Index: VertexFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/VertexFacade.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VertexFacade.java	11 Jul 2005 09:31:24 -0000	1.1
--- VertexFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static VertexFacade instance;
  
-   /** Vertexs */
-   private Set vertexs;
- 
    /**
     * Constructor
     */
    private VertexFacade() {
-     vertexs = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,54 ****
  
    /**
!    * Add a vertex
     * @param v The vertex
     */
!   public synchronized void add(Vertex v) {
!     vertexs.add(v);
    }
  
--- 46,89 ----
  
    /**
!    * Create a vertex
     * @param v The vertex
+    * @return The vertex
     */
!   public synchronized Vertex create(Vertex v) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(v);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return v;
!   }
! 
!   /**
!    * Update a vertex
!    * @param v The vertex
!    */
!   public synchronized void update(Vertex v) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.update(v);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
***************
*** 58,70 ****
     */
    public synchronized void remove(Vertex v) {
!     vertexs.remove(v);
    }
  
    /**
     * Find all vertexs
!    * @return The vertexs (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(vertexs); 
    }
  
--- 93,138 ----
     */
    public synchronized void remove(Vertex v) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.delete(v);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
    /**
     * Find all vertexs
!    * @return The vertexs
     */
    public Set findAll() {
!     Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT v FROM Vertex AS v");
!     
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((Vertex)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return result;
    }
  
***************
*** 74,86 ****
     * @return The vertex
     */
!   public synchronized Vertex findById(Long id) {
!     Iterator it = vertexs.iterator();
!     while (it.hasNext()) {
!       Vertex v = (Vertex)it.next();
!       if (v.getId().equals(id)) {
!         return v;
!       }
      }
!     return null;
    }
  
--- 142,163 ----
     * @return The vertex
     */
!   public Vertex findById(Long id) {
!     Vertex result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       result = (Vertex)session.load(Vertex.class, id);
!       
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
      }
! 
!     return result;
    }
  
***************
*** 90,102 ****
     * @return The vertex
     */
!   public synchronized Vertex findByName(String name) {
!     Iterator it = vertexs.iterator();
!     while (it.hasNext()) {
!       Vertex v = (Vertex)it.next();
!       if (v.getName().equals(name)) {
!         return v;
        }
      }
!     return null;
    }
  }
--- 167,194 ----
     * @return The vertex
     */
!   public Vertex findByName(String name) {
!     Vertex result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT v FROM Vertex AS v WHERE v.name = :name");
!       q.setString("name", name);
!     
!       Iterator it = q.iterate();
!       if (it.hasNext()) {
!         result = (Vertex)it.next();
        }
+ 
+       tx.commit();
+     } catch (Exception ex) {
+       log.error(ex.getMessage(), ex);
+     } finally {
+       hu.closeSession();
      }
!     
!     return result;
    }
  }

Index: Domain.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Domain.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Domain.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- Domain.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 8,12 ****
  
  import java.io.Serializable;
- import java.util.HashSet;
  import java.util.Set;
  
--- 8,11 ----
***************
*** 15,18 ****
--- 14,20 ----
  /**
   * The domain
+  * @hibernate.class
+  *   table="DOMAIN"
+  *   lazy="false"
   */
  public abstract class Domain implements Serializable {
***************
*** 39,54 ****
  
    /**
-    * Constructor
-    * @param id The id
-    */
-   protected Domain(Long id) {
-     setId(id);
-     setAttributes(new HashSet());
-     setSurfaces(new HashSet());
-   }
- 
-   /**
     * Get the id
     * @return The id
     */
    public Long getId() {
--- 41,49 ----
  
    /**
     * Get the id
     * @return The id
+    * @hibernate.id
+    *   column="DOMAIN_ID"
+    *   generator-class="increment"
     */
    public Long getId() {
***************
*** 67,70 ****
--- 62,66 ----
     * Get the name
     * @return The name
+    * @hibernate.property
     */
    public String getName() {
***************
*** 83,86 ****
--- 79,89 ----
     * Get the attributes
     * @return The attributes
+    * @hibernate.set
+    *   cascade="delete"
+    *   lazy="false"
+    * @hibernate.key
+    *   column="DOMAIN_ID"
+    * @hibernate.one-to-many
+    *   class="net.sourceforge.bprocessor.model.Attribute"
     */
    public Set getAttributes() {
***************
*** 99,102 ****
--- 102,112 ----
     * Get the surfaces
     * @return The surfaces
+    * @hibernate.set
+    *   cascade="delete"
+    *   lazy="false"
+    * @hibernate.key
+    *   column="DOMAIN_ID"
+    * @hibernate.one-to-many
+    *   class="net.sourceforge.bprocessor.model.Surface"
     */
    public Set getSurfaces() {
***************
*** 111,113 ****
--- 121,132 ----
      this.surfaces = surfaces;
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Domain[id=" + id + ",name=" + name + ",attributes=" + attributes.size() +
+       ",surfaces=" + surfaces.size() + "]";
+   }
  }

Index: Element.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Element.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Element.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- Element.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
- import java.util.HashSet;
  import java.util.Set;
  
--- 7,10 ----
***************
*** 14,17 ****
--- 13,21 ----
  /**
   * The element
+  * @hibernate.joined-subclass
+  *   table="ELEMENT"
+  *   lazy="false"
+  * @hibernate.key
+  *   column="DOMAIN_ID"
   */
  public class Element extends Domain {
***************
*** 19,24 ****
    private static Logger log = Logger.getLogger(Element.class);
  
!   /** Id generator */
!   private static long l = 0;
  
    /** The parts */
--- 23,28 ----
    private static Logger log = Logger.getLogger(Element.class);
  
!   /** The element id */
!   private Long elementId;
  
    /** The parts */
***************
*** 36,42 ****
     */
    public Element(String name) {
!     super(new Long(l++));
      setName(name);
!     setParts(new HashSet());
    }
  
--- 40,65 ----
     */
    public Element(String name) {
!     super();
      setName(name);
!     setParts(null);
!   }
! 
!   /**
!    * Get the element id
!    * @return The element id
!    * @hibernate.id
!    *   column="ELEMENT_ID"
!    *   generator-class="increment"
!    */
!   protected Long getElementId() {
!     return elementId;
!   }
! 
!   /**
!    * Set the element id
!    * @param id The element id
!    */
!   private void setElementId(Long id) {
!     this.elementId = id;
    }
  
***************
*** 44,47 ****
--- 67,77 ----
     * Get the parts
     * @return The parts
+    * @hibernate.set
+    *   cascade="delete"
+    *   lazy="false"
+    * @hibernate.key
+    *   column="ELEMENT_ID"
+    * @hibernate.one-to-many
+    *   class="net.sourceforge.bprocessor.model.Part"
     */
    public Set getParts() {
***************
*** 79,81 ****
--- 109,119 ----
      return getId().equals(e.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Element[" + super.toString() + ",parts=" + parts.size() + "]";
+   }
  }

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Vertex.java	18 Jul 2005 09:21:16 -0000	1.2
--- Vertex.java	28 Jul 2005 06:48:54 -0000	1.3
***************
*** 8,13 ****
  
  import java.io.Serializable;
- import java.util.HashSet;
- import java.util.Set;
  
  import org.apache.log4j.Logger;
--- 8,11 ----
***************
*** 15,18 ****
--- 13,19 ----
  /**
   * The vertex
+  * @hibernate.class
+  *   table="VERTEX"
+  *   lazy="false"
   */
  public class Vertex implements Serializable {
***************
*** 20,26 ****
    private static Logger log = Logger.getLogger(Vertex.class);
  
-   /** Id generator */
-   private static long l = 0;
- 
    /** The id */
    private Long id;
--- 21,24 ----
***************
*** 41,47 ****
    private double w;
    
-   /** The edge relationship */
-   private Set edges;
- 
    /**
     * Constructor for persistence layer
--- 39,42 ----
***************
*** 55,59 ****
     */
    public Vertex(String name) {
!     setId(new Long(l++));
      setName(name);
      setX(0.0);
--- 50,54 ----
     */
    public Vertex(String name) {
!     super();
      setName(name);
      setX(0.0);
***************
*** 61,65 ****
      setZ(0.0);
      setW(0.0);
-     setEdges(new HashSet());
    }
  
--- 56,59 ----
***************
*** 67,70 ****
--- 61,67 ----
     * Get the id
     * @return The id
+    * @hibernate.id
+    *   column="VERTEX_ID"
+    *   generator-class="increment"
     */
    public Long getId() {
***************
*** 83,86 ****
--- 80,84 ----
     * Get the name
     * @return The name
+    * @hibernate.property
     */
    public String getName() {
***************
*** 99,102 ****
--- 97,101 ----
     * Get the x coordinate
     * @return The x coordinate
+    * @hibernate.property
     */
    public double getX() {
***************
*** 115,118 ****
--- 114,118 ----
     * Get the y coordinate
     * @return The y coordinate
+    * @hibernate.property
     */
    public double getY() {
***************
*** 131,134 ****
--- 131,135 ----
     * Get the z coordinate
     * @return The z coordinate
+    * @hibernate.property
     */
    public double getZ() {
***************
*** 147,150 ****
--- 148,152 ----
     * Get the w coordinate
     * @return The w coordinate
+    * @hibernate.property
     */
    public double getW() {
***************
*** 161,180 ****
  
    /**
-    * Get the edges
-    * @return The edges
-    */
-   public Set getEdges() {
-     return edges;
-   }
- 
-   /**
-    * Set the edges
-    * @param edges The edges
-    */
-   public void setEdges(Set edges) {
-     this.edges = edges;
-   }
-   
-   /**
     * Return the hash code of the object
     * @return The hash
--- 163,166 ----
***************
*** 198,200 ****
--- 184,195 ----
      return this.id.equals(v.getId());
    }
+ 
+   /**
+    * String representation of the object
+    * @return The string
+    */
+   public String toString() {
+     return "Vertex[id=" + id + ",name=" + name + ",x=" + x + ",y=" + y +
+       ",z=" + z + ",w=" + w + "]";
+   }
  }

Index: PartFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/PartFacade.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PartFacade.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- PartFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static PartFacade instance;
  
-   /** Parts */
-   private Set parts;
- 
    /**
     * Constructor
     */
    private PartFacade() {
-     parts = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,54 ****
  
    /**
!    * Add a part
     * @param p The part
     */
!   public synchronized void add(Part p) {
!     parts.add(p);
    }
  
--- 46,89 ----
  
    /**
!    * Create a part
     * @param p The part
+    * @return The part
     */
!   public synchronized Part create(Part p) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(p);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return p;
!   }
! 
!   /**
!    * Update a part
!    * @param p The part
!    */
!   public synchronized void update(Part p) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.update(p);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
***************
*** 58,70 ****
     */
    public synchronized void remove(Part p) {
!     parts.remove(p);
    }
  
    /**
     * Find all parts
!    * @return The parts (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(parts); 
    }
  
--- 93,138 ----
     */
    public synchronized void remove(Part p) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.delete(p);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
    }
  
    /**
     * Find all parts
!    * @return The parts
     */
    public Set findAll() {
!     Set result = new HashSet();
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT p FROM Part AS p");
!     
!       Iterator it = q.iterate();
!       while (it.hasNext()) {
!         result.add((Part)it.next());
!       }
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
!     }
! 
!     return result;
    }
  
***************
*** 74,86 ****
     * @return The part
     */
!   public synchronized Part findById(Long id) {
!     Iterator it = parts.iterator();
!     while (it.hasNext()) {
!       Part p = (Part)it.next();
!       if (p.getId().equals(id)) {
!         return p;
!       }
      }
!     return null;
    }
  
--- 142,163 ----
     * @return The part
     */
!   public Part findById(Long id) {
!     Part result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       result = (Part)session.load(Part.class, id);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
!       hu.closeSession();
      }
! 
!     return result;
    }
  
***************
*** 90,102 ****
     * @return The part
     */
!   public synchronized Part findByName(String name) {
!     Iterator it = parts.iterator();
!     while (it.hasNext()) {
!       Part p = (Part)it.next();
!       if (p.getName().equals(name)) {
!         return p;
        }
      }
!     return null;
    }
  }
--- 167,194 ----
     * @return The part
     */
!   public Part findByName(String name) {
!     Part result = null;
! 
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       Query q = session.createQuery("SELECT p FROM Part AS p WHERE p.name = :name");
!       q.setString("name", name);
!     
!       Iterator it = q.iterate();
!       if (it.hasNext()) {
!         result = (Part)it.next();
        }
+ 
+       tx.commit();
+     } catch (Exception ex) {
+       log.error(ex.getMessage(), ex);
+     } finally {
+       hu.closeSession();
      }
! 
!     return result;
    }
  }

Index: FunctionalSpaceFacade.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/FunctionalSpaceFacade.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionalSpaceFacade.java	27 Jun 2005 09:31:14 -0000	1.1.1.1
--- FunctionalSpaceFacade.java	28 Jul 2005 06:48:54 -0000	1.2
***************
*** 7,11 ****
  package net.sourceforge.bprocessor.model;
  
! import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
--- 7,12 ----
  package net.sourceforge.bprocessor.model;
  
! import net.sourceforge.bprocessor.model.db.HibernateUtil;
! 
  import java.util.HashSet;
  import java.util.Iterator;
***************
*** 13,16 ****
--- 14,20 ----
  
  import org.apache.log4j.Logger;
+ import org.hibernate.Query;
+ import org.hibernate.Session;
+ import org.hibernate.Transaction;
  
  /**
***************
*** 24,35 ****
    private static FunctionalSpaceFacade instance;
  
-   /** Functional spaces */
-   private Set functionalSpaces;
- 
    /**
     * Constructor
     */
    private FunctionalSpaceFacade() {
-     functionalSpaces = new HashSet();
    }
  
--- 28,35 ----
***************
*** 46,70 ****
  
    /**
!    * Add a functional space
!    * @param c The functional space
     */
!   public synchronized void add(FunctionalSpace c) {
!     functionalSpaces.add(c);
    }
  
    /**
     * Remove a functional space
!    * @param c The functional space
     */
!   public synchronized void remove(FunctionalSpace c) {
!     functionalSpaces.remove(c);
    }
  
    /**
     * Find all functional spaces
!    * @return The functional spaces (unmodifiable)
     */
    public Set findAll() {
!     return Collections.unmodifiableSet(functionalSpaces); 
    }
  
--- 46,138 ----
  
    /**
!    * Create a functional space
!    * @param f The functional space
!    * @return The functional space
     */
!   public synchronized FunctionalSpace create(FunctionalSpace f) {
!     HibernateUtil hu = HibernateUtil.getInstance();
!     try {
!       Session session = hu.currentSession();
!       Transaction tx = session.beginTransaction();
! 
!       session.save(f);
! 
!       tx.commit();
!     } catch (Exception ex) {
!       log.error(ex.getMessage(), ex);
!     } finally {
...
 
[truncated message content]

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.1,1.2

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7490

Modified Files:
	AbstractTool.java 
Log Message:
Added paramerete resets before tool shift

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractTool.java	26 Jul 2005 12:33:39 -0000	1.1
--- AbstractTool.java	27 Jul 2005 11:04:32 -0000	1.2
***************
*** 101,108 ****
        v.zoom(0.9);
      } else if (e.getKeyCode() == KeyEvent.VK_Q) {
        glv.changeTool(Tool.SELECT_TOOL);
      } else if (e.getKeyCode() == KeyEvent.VK_W) {
        glv.changeTool(Tool.DRAW_TOOL);
!     }
      glv.repaint();
    }
--- 101,110 ----
        v.zoom(0.9);
      } else if (e.getKeyCode() == KeyEvent.VK_Q) {
+       glv.getView().setAlignVertex(null);
+       glv.getView().setSnapVertex(null);
        glv.changeTool(Tool.SELECT_TOOL);
      } else if (e.getKeyCode() == KeyEvent.VK_W) {
        glv.changeTool(Tool.DRAW_TOOL);
!     } 
      glv.repaint();
    }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SelectTool.java,1.1,1.2

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706

Modified Files:
	SelectTool.java 
Log Message:
Added edge selecting

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectTool.java	26 Jul 2005 12:34:09 -0000	1.1
--- SelectTool.java	27 Jul 2005 11:01:54 -0000	1.2
***************
*** 13,16 ****
--- 13,18 ----
  import net.sourceforge.bprocessor.kernel.notification.Notifier;
  
+ import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.EdgeFacade;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.VertexFacade;
***************
*** 22,27 ****
  
  import org.apache.log4j.Logger;
  /**
!  * The abstracttool
   */
  public class SelectTool extends AbstractTool {
--- 24,30 ----
  
  import org.apache.log4j.Logger;
+ 
  /**
!  * The selecttool
   */
  public class SelectTool extends AbstractTool {
***************
*** 30,34 ****
  
    /**
!    * KeyListener for the GL Canvas
     * @param glv The 3D canvas
     */
--- 33,37 ----
  
    /**
!    * The constructor
     * @param glv The 3D canvas
     */
***************
*** 73,78 ****
--- 76,120 ----
          Notification n = new Notification(Notification.VERTEX_SELECTED, v.getId());
          Notifier.getInstance().sendNotification(n);
+       } else {
+         Edge edge = edgeCollide(coords);
+         if (edge != null) {
+           Notification n = new Notification(Notification.EDGE_SELECTED, edge.getId());
+           Notifier.getInstance().sendNotification(n);
+         }
+       }
+     }
+   }
+ 
+  /**
+    * Check if this cordinate collide with an edge
+    * @param coord The cordinate to check for collision at
+    * @return The excisting edge on that coord, null if there ain't any
+    */
+   protected Edge edgeCollide(double[] coord) {
+     Set edges = EdgeFacade.getInstance().findAll();
+     Iterator it = edges.iterator();
+     while (it.hasNext()) {
+       Edge e = (Edge)it.next();
+       double[] r = new double[] {e.getTo().getX() - e.getFrom().getX(), 
+                                  e.getTo().getY() - e.getFrom().getY(),
+                                  e.getTo().getZ() - e.getFrom().getZ()};
+       double[] ppo = new double[] {coord[0] - e.getFrom().getX(),
+                                    coord[1] - e.getFrom().getY(),
+                                    coord[2] - e.getFrom().getZ()};
+       double normr =  Math.abs(Math.sqrt(r[0] * r[0] + r[1] * r[1] + r[2] * r[2]));
+       double[] temp = new double[] {r[1] * ppo[2] - ppo[1] * r[2], 
+                                     r[2] * ppo[0] - ppo[2] * r[0],
+                                     r[0] * ppo[1] - ppo[0] * r[1]};
+       double t = Math.abs(Math.sqrt(temp[0] * temp[0] + 
+                                     temp[1] * temp[1] +
+                                     temp[2] * temp[2]));
+       double normppo = Math.abs(Math.sqrt(ppo[0] * ppo[0] + ppo[1] * ppo[1] + ppo[2] * ppo[2]));
+       double rppo = r[0] * ppo[0] + r[1] * ppo[1] + r[2] * ppo[2];
+ 
+       if (t / normr < EPSILON && normppo <= normr && rppo > 0) {
+         return e;
        }
      }
+     return null;
    }
  

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool DrawTool.java,1.2,1.3

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6547

Modified Files:
	DrawTool.java 
Log Message:
Added snapping on excisting vertexes

Index: DrawTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DrawTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DrawTool.java	27 Jul 2005 08:36:12 -0000	1.2
--- DrawTool.java	27 Jul 2005 10:59:56 -0000	1.3
***************
*** 46,63 ****
     */
    protected void moved(MouseEvent e) {
!     if (view.getActiveEdge != null) { 
!       int x = e.getX();
!       int y = e.getY();
!       View v = glv.getView();
!       double[] coord = v.toCanvasCoords(new double[] {x, y});
!       
!       coord = snapToGrid(coord);
!       // snap to vertexes
!       coord = aligned(coord);
!       //check for snap point change
!       checkVertexSnap(coord);
!       //change the activeEdge according to mouse position
!       changeTo(coord);
!     }
    }
  
--- 46,60 ----
     */
    protected void moved(MouseEvent e) {
!     int x = e.getX();
!     int y = e.getY();
!     View v = glv.getView();
!     double[] coord = v.toCanvasCoords(new double[] {x, y});
!     coord = snapToGrid(coord);
!     // snap to vertexes
!     coord = aligned(coord);
!     //check for snap point change
!     checkVertexSnap(coord);
!     //change the activeEdge according to mouse position
!     changeTo(coord);
    }
  
***************
*** 139,143 ****
    protected void addEdge(double[] coord) {
      if (edges.isEmpty()) {
!       Vertex from = createVertex(coord);
        Vertex to = createVertex(coord);
        Edge activeEdge = createEdge(to, from);
--- 136,144 ----
    protected void addEdge(double[] coord) {
      if (edges.isEmpty()) {
!       Vertex from = vertexCollide(coord);
!       if (from == null) {
!         log.info("[addEdge] made new from");
!         from = createVertex(coord);
!       }
        Vertex to = createVertex(coord);
        Edge activeEdge = createEdge(to, from);
***************
*** 182,197 ****
    protected Vertex vertexCollide(double[] coord) {
      Edge e = glv.getView().getActiveEdge();
!     if (e != null) {
!       Set vertexes = VertexFacade.getInstance().findAll();
!       Iterator it = vertexes.iterator();
!       while (it.hasNext()) {
!         Vertex v = (Vertex)it.next();
!         if (collide(v.getX(), coord[0]) &&
!             collide(v.getY(), coord[1]) &&
!             collide(v.getZ(), coord[2]) &&
!             !v.equals(e.getTo()) && 
!             !v.equals(e.getFrom())) {
!           return v;
!         }
        }
      }
--- 183,195 ----
    protected Vertex vertexCollide(double[] coord) {
      Edge e = glv.getView().getActiveEdge();
!     Set vertexes = VertexFacade.getInstance().findAll();
!     Iterator it = vertexes.iterator();
!     while (it.hasNext()) {
!       Vertex v = (Vertex)it.next();
!       if (collide(v.getX(), coord[0]) &&
!           collide(v.getY(), coord[1]) &&
!           collide(v.getZ(), coord[2]) &&
!           (e == null || (!v.equals(e.getTo()) && !v.equals(e.getFrom())))) {
!         return v;
        }
      }
***************
*** 219,223 ****
      View view = glv.getView();
      Edge e = view.getActiveEdge();
!     if (v != null && !v.equals(e.getTo()) && !v.equals(e.getFrom())) {
        view.setAlignVertex(v);
        view.setSnapVertex(v);
--- 217,221 ----
      View view = glv.getView();
      Edge e = view.getActiveEdge();
!     if (v != null) {
        view.setAlignVertex(v);
        view.setSnapVertex(v);

[Bprocessor-commit] tools/xdoclet commons-collections.jar,NONE,1.1 commons-logging.jar,NONE,1.1 log4j.jar,NONE,1.1 xdoclet-hibernate-module.jar,NONE,1.1 xdoclet.jar,NONE,1.1 xdoclet-xdoclet-module.jar,NONE,1.1 xjavadoc.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/xdoclet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3907

Added Files:
	commons-collections.jar commons-logging.jar log4j.jar 
	xdoclet-hibernate-module.jar xdoclet.jar 
	xdoclet-xdoclet-module.jar xjavadoc.jar 
Log Message:
XDoclet 1.2.4-20050725

--- NEW FILE: log4j.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: commons-logging.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xdoclet.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xdoclet-hibernate-module.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xjavadoc.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: commons-collections.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xdoclet-xdoclet-module.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/xdoclet - New directory

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/xdoclet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3630/xdoclet

Log Message:
Directory /cvsroot/bprocessor/tools/xdoclet added to the repository

[Bprocessor-commit] tools/hsqldb hsqldb.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/hsqldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3573/hsqldb

Added Files:
	hsqldb.jar 
Log Message:
HSQLDB 1.8.0

--- NEW FILE: hsqldb.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/hsqldb - New directory

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/hsqldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3449/hsqldb

Log Message:
Directory /cvsroot/bprocessor/tools/hsqldb added to the repository

[Bprocessor-commit] tools/jta jta.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/jta
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/jta

Added Files:
	jta.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: jta.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/hibernate hibernate3.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/hibernate

Added Files:
	hibernate3.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: hibernate3.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/ehcache ehcache.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/ehcache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/ehcache

Added Files:
	ehcache.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: ehcache.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/dom4j dom4j.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/dom4j
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/dom4j

Added Files:
	dom4j.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: dom4j.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/commons-logging commons-logging.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/commons-logging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/commons-logging

Added Files:
	commons-logging.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: commons-logging.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/asm asm-attrs.jar,NONE,1.1 asm.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/asm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/asm

Added Files:
	asm-attrs.jar asm.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: asm.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: asm-attrs.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/commons-collections commons-collections.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/commons-collections
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/commons-collections

Added Files:
	commons-collections.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: commons-collections.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/cglib cglib.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/cglib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/cglib

Added Files:
	cglib.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: cglib.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/antlr antlr.jar,NONE,1.1

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/antlr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2749/antlr

Added Files:
	antlr.jar 
Log Message:
Hibernate 3.1beta1 files

--- NEW FILE: antlr.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] tools/jta - New directory

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/tools/jta
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2691/jta

Log Message:
Directory /cvsroot/bprocessor/tools/jta added to the repository