[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java,1.96,1.97 Space.java,1.34,1.35

[Nikolaj B. <nbr...@us...>]

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

Modified Files:
	Surface.java Space.java 
Log Message:
Att view now corretly shows if its space, element or a part surface that is seleceted.

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** Surface.java	15 May 2006 09:21:32 -0000	1.96
--- Surface.java	17 May 2006 12:20:39 -0000	1.97
***************
*** 1354,1358 ****
     */
    public String getGeneralName() {
!     return "Surface";
    }
  }
--- 1354,1366 ----
     */
    public String getGeneralName() {
!     if (getOwner() == Project.getInstance().world()) {
!       return "Space Surface";
!     }
!     
!     if (getOwner().getOwner() == Project.getInstance().world()) {
!       return "Element Surface";
!     } else {
!       return "Part Surface";
!     }
    }
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Space.java	17 May 2006 12:04:05 -0000	1.34
--- Space.java	17 May 2006 12:20:39 -0000	1.35
***************
*** 952,956 ****
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName()));
!     res.add(new Attribute("ID", getId().toString()));
      res.add(new Attribute("Description", getDescription()));
      return res;
--- 952,956 ----
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName()));
!     res.add(new Attribute("ID", getId().toString(), false));
      res.add(new Attribute("Description", getDescription()));
      return res;