bprocessor-commit

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

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

Modified Files:
	Space.java 
Log Message:
space got name again

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** Space.java	13 Aug 2007 11:36:21 -0000	1.167
--- Space.java	23 Aug 2007 12:45:23 -0000	1.168
***************
*** 380,395 ****
    }
    
!   /**
!    * Get the name
!    * @return The name
!    * @hibernate.property
!    */
    @Override
    public String getName() {
!     if (getClassification() != null) {
!       return getClassification().toString();
!     } else {
!       return name;
!     }
    }
    
--- 380,387 ----
    }
    
!   /** {@inheritDoc} */
    @Override
    public String getName() {
!     return name;
    }
    
***************
*** 1349,1353 ****
    public List<Attribute> getAttributes() {
      ArrayList<Attribute> res = new ArrayList<Attribute>();
!     //res.add(new Attribute("Name", getName()));
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
--- 1341,1345 ----
    public List<Attribute> getAttributes() {
      ArrayList<Attribute> res = new ArrayList<Attribute>();
!     res.add(new Attribute("Name", getName()));
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
***************
*** 1439,1443 ****
    
    /**
!    * Display name
     * @return display name
     */
--- 1431,1436 ----
    
    /**
!    * Display name used for all occasions where the
!    * this space is displayed in the gui.
     * @return display name
     */