[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Classification.java, 1.2, 1.3 Space.java, 1.97, 1.98 Attribute.java, 1.14, 1.15

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

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

Modified Files:
	Classification.java Space.java Attribute.java 
Log Message:
Further implementation of the classificaion view

Index: Attribute.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Attribute.java	30 Oct 2006 00:02:12 -0000	1.14
--- Attribute.java	10 Nov 2006 13:48:45 -0000	1.15
***************
*** 30,33 ****
--- 30,36 ----
    private Classification classification;
    
+   /** The level of the space ie if its space, element or part level */
+   private int level;
+   
    /** The precision of the object */
    private int precision;
***************
*** 92,100 ****
     * @param value The value
     * @param classification The classification
     */
!   public Attribute(String name, Object value, Classification classification) {
      setName(name);
      setValue(value);
      setClassification(classification);
      editable = true;
    }
--- 95,105 ----
     * @param value The value
     * @param classification The classification
+    * @param level the level of the space ie 1: space, 2: element or 3: part
     */
!   public Attribute(String name, Object value, Classification classification, int level) {
      setName(name);
      setValue(value);
      setClassification(classification);
+     setLevel(level);
      editable = true;
    }
***************
*** 208,211 ****
--- 213,230 ----
    }
  
+   /**
+    * @return Returns the level.
+    */
+   public int getLevel() {
+     return level;
+   }
+   
+   /**
+    * @param level The level of the space.
+    */
+   public void setLevel(int level) {
+     this.level = level;
+   }
+ 
  
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** Space.java	7 Nov 2006 09:53:59 -0000	1.97
--- Space.java	10 Nov 2006 13:48:44 -0000	1.98
***************
*** 1425,1435 ****
    public List getAttributes() {
      ArrayList res = new ArrayList();
!     res.add(new Attribute("Name", getName()));
!     res.add(new Attribute("ID", getId().toString(), false));
!     res.add(new Attribute("Owner", getOwner(), false));
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
          res.add(new Attribute("Classification", 
!             Project.getInstance().getClassification(), getClassification()));
        } else {
          //res.add(new Attribute("Classification", functionalOptions, getClassification()));
--- 1425,1433 ----
    public List getAttributes() {
      ArrayList res = new ArrayList();
!     //res.add(new Attribute("Name", getName()));
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
          res.add(new Attribute("Classification", 
!             Project.getInstance().getClassification(), getClassification(), 1));
        } else {
          //res.add(new Attribute("Classification", functionalOptions, getClassification()));
***************
*** 1441,1448 ****
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification()));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getClassification(), getClassification()));
            }
          } else {
--- 1439,1446 ----
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), 2));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getClassification(), getClassification(), 2));
            }
          } else {
***************
*** 1453,1460 ****
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification()));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getClassification(), getClassification()));
            }
          } else {
--- 1451,1458 ----
            if (getOwner().getClassification() != null) {
              res.add(new Attribute("Classification", 
!                 getOwner().getClassification(), getClassification(), 3));
            } else {
              res.add(new Attribute("Classification", 
!                 Project.getInstance().getClassification(), getClassification(), 3));
            }
          } else {
***************
*** 1463,1466 ****
--- 1461,1466 ----
        }
      }
+     res.add(new Attribute("ID", getId().toString(), false));
+     res.add(new Attribute("Owner", getOwner(), false));
      if (isConstructionSpace()) {
        if (isTransparent()) {

Index: Classification.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Classification.java	27 Oct 2006 10:25:14 -0000	1.2
--- Classification.java	10 Nov 2006 13:48:44 -0000	1.3
***************
*** 43,46 ****
--- 43,55 ----
    
    /**
+    * Constructor for a custom name element
+    * @param name the name
+    */
+   public Classification(String name) {
+     setName(name);
+     setId(new Integer(-1));
+   }
+   
+   /**
     * Constructor for base element
     */