[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java,1.15,1.16

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

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

Modified Files:
	Project.java 
Log Message:
Some name cleanup

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Project.java	4 Jan 2006 14:30:07 -0000	1.15
--- Project.java	16 Jan 2006 10:07:32 -0000	1.16
***************
*** 86,114 ****
      changed(this);
    }
-   /**
-    * Intern an attribute
-    * @param a The attribute
-    */
-   public void intern(Attribute a) {
-     DatabaseFacade.getInstance().intern((Object) a);
-   }
- 
-   /**
-    * Remove an attribute
-    * @param a The attribute
-    */
-   public void remove(Attribute a) {
-     DatabaseFacade.getInstance().remove(a);
-   }
- 
-   /**
-    * Find a attribute by id
-    * @param id The id
-    * @return The attribute
-    */
-   public  Attribute findAttributeById(Long id) {
-     return DatabaseFacade.getInstance().findAttributeById(id);
-   }
    
    /**
     * Create a space
--- 86,91 ----
      changed(this);
    }
    
+ 
    /**
     * Create a space
***************
*** 116,158 ****
     */
    public void intern(Space space) {
!     if (space.isConstructionSpace()) {
!       intern((ConstructionSpace) space);
!     }
!     if (space.isFunctionalSpace()) {
!       intern((FunctionalSpace) space);
!     }
!   }
!   
!   /**
!    * Create a construction space
!    * @param c The construction space
!    */
!   public void intern(ConstructionSpace c) {
!     DatabaseFacade.getInstance().intern((Object) c);
!     changed(this);
!   }
! 
!   /**
!    * Remove a construction space
!    * @param c The construction space
!    */
!   public void remove(ConstructionSpace c) {
!     Set surfaces = c.getSurfaces();
!     if (surfaces != null) {
!       Iterator surfIt = surfaces.iterator();
!       while (surfIt.hasNext()) {
!         Surface surface = (Surface)surfIt.next();
!         Space back = surface.getBackDomain();
!         if (back == c) {
!           surface.setBackDomain(null);
!         } else {
!           Space front = surface.getFrontDomain();
!           if (front == c) {
!             surface.setFrontDomain(null);
!           }
!         }
!       }
!     }
!     DatabaseFacade.getInstance().remove(c);
      changed(this);
    }
--- 93,97 ----
     */
    public void intern(Space space) {
!     DatabaseFacade.getInstance().intern((Object) space);
      changed(this);
    }
***************
*** 167,183 ****
  
    /**
-    * Find a construction space by id
-    * @param id The id
-    * @return The construction space
-    */
-   public ConstructionSpace findConstructionSpaceById(Long id) {
-     return DatabaseFacade.getInstance().findConstructionSpaceById(id);
-   }
- 
-   /**
     * Find all domains
     * @return the set of all domains
     */
!   public Set getDomains() {
      return DatabaseFacade.getInstance().getDomains();
    }
--- 106,113 ----
  
    /**
     * Find all domains
     * @return the set of all domains
     */
!   public Set getSpaces() {
      return DatabaseFacade.getInstance().getDomains();
    }
***************
*** 188,192 ****
     * @return The domain
     */
!   public Space findDomainById(Long id) {
      return DatabaseFacade.getInstance().findDomainById(id);
    }
--- 118,122 ----
     * @return The domain
     */
!   public Space findSpaceById(Long id) {
      return DatabaseFacade.getInstance().findDomainById(id);
    }
***************
*** 228,240 ****
    
    /**
-    * Intern a functional space
-    * @param f The functional space
-    */
-   public void intern(FunctionalSpace f) {
-     DatabaseFacade.getInstance().intern((Object) f);
-     changed(this);
-   }
- 
-   /**
     * Remove a space
     * @param space The space to remove
--- 158,161 ----
***************
*** 262,293 ****
      changed(this);
    }
! 
!   /**
!    * Remove a functional space
!    * @param f The functional space
!    */
!   public void remove(FunctionalSpace f) {
!     Set surfaces = f.getSurfaces();
!     if (surfaces != null) {
!       Iterator surfIt = surfaces.iterator();
!       while (surfIt.hasNext()) {
!         Surface surface = (Surface)surfIt.next();
!         Space back = surface.getBackDomain();
!         if (back == f) {
!           surface.setBackDomain(null);
!           DatabaseFacade.getInstance().update(surface);
!         } else {
!           Space front = surface.getFrontDomain();
!           if (front == f) {
!             surface.setFrontDomain(null);
!             DatabaseFacade.getInstance().update(surface);
!           }
!         }
!       }
!     }      
!     DatabaseFacade.getInstance().remove(f);
!     changed(this);
!   }
! 
    /**
     * Find all functional spaces
--- 183,187 ----
      changed(this);
    }
!   
    /**
     * Find all functional spaces
***************
*** 297,309 ****
      return DatabaseFacade.getInstance().getFunctionalSpaces();
    }
- 
-   /**
-    * Find a functional space by id
-    * @param id The id
-    * @return The functional space
-    */
-   public FunctionalSpace findFunctionalSpaceById(Long id) {
-     return DatabaseFacade.getInstance().findFunctionalSpaceById(id);
-   }
    
    /**
--- 191,194 ----