[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.185, 1.186 Attribute.java, 1.24, 1.25

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

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

Modified Files:
	Space.java Attribute.java 
Log Message:
got rid of some code

Index: Attribute.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Attribute.java	18 Oct 2007 11:59:20 -0000	1.24
--- Attribute.java	18 Oct 2007 13:47:47 -0000	1.25
***************
*** 32,38 ****
    private String name;
    
-   /** The space the classification is for */
-   private Space level;
-   
    /** If the attribute can be modified or not */
    private boolean editable;
--- 32,35 ----
***************
*** 76,108 ****
    }
    
-   
-   /**
-    * Constructor
-    * @param name The name
-    * @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, Space  level) {
-     setName(name);
-     setThe2ndValue(value);
-     setValue(classification);
-     setLevel(level);
-     editable = true;
-   }
- 
    /**
     * Constructor for Classification Attribute
     * @param name The name
!    * @param rootClassification The outermost possible type (null for a link)
!    * @param selectedClassification The chosen type (can be null)
     */
    public Attribute(String name, 
!       ClassificationType rootClassification, 
!       ClassificationType selectedClassification) {
      setName(name);
!     setValue(selectedClassification);
!     setThe2ndValue(rootClassification);
!     editable = true;
    }
  
--- 73,91 ----
    }
    
    /**
     * Constructor for Classification Attribute
     * @param name The name
!    * @param the2nd The outermost possible type (null for a link)
!    * @param value The chosen type (can be null)
!    * @param b editable
     */
    public Attribute(String name, 
!       Object the2nd, 
!       Object value,
!       boolean b) {
      setName(name);
!     setValue(value);
!     setThe2ndValue(the2nd);
!     editable = b;
    }
  
***************
*** 192,209 ****
    }
  
-   /**
-    * @return Returns the level.
-    */
-   public Space getLevel() {
-     return level;
-   }
-   
-   /**
-    * @param level The level of the space.
-    */
-   public void setLevel(Space level) {
-     this.level = level;
-   }
- 
    /** {@inheritDoc} */
    @Override
--- 175,178 ----

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** Space.java	17 Oct 2007 09:08:15 -0000	1.185
--- Space.java	18 Oct 2007 13:47:47 -0000	1.186
***************
*** 1340,1347 ****
        if (isConstructionSpace()) { 
          res.add(new Attribute("Classification", 
!             Project.getInstance().getConstructionClas(), getClassification(), this));
        } else {
          res.add(new Attribute("Classification", 
!             Project.getInstance().getFunctionalClas(), getClassification(), this));
        }
      } else {
--- 1340,1347 ----
        if (isConstructionSpace()) { 
          res.add(new Attribute("Classification", 
!             Project.getConstructionClas(), getClassification(), true));
        } else {
          res.add(new Attribute("Classification", 
!             Project.getFunctionalClas(), getClassification(), true));
        }
      } else {
***************
*** 1349,1364 ****
          if (getOwner().getClassification() != null) {
            res.add(new Attribute("Classification", 
!               getOwner().getClassification(), getClassification(), this));
          } else {
            res.add(new Attribute("Classification", 
!               Project.getInstance().getConstructionClas(), getClassification(), this));
          }
        } else {
          if (getOwner() != null && getOwner().getClassification() != null) {
            res.add(new Attribute("Classification", 
!               getOwner().getClassification(), getClassification(), this));
          } else {
            res.add(new Attribute("Classification", 
!               Project.getInstance().getFunctionalClas(), getClassification(), this));
          }
        }
--- 1349,1364 ----
          if (getOwner().getClassification() != null) {
            res.add(new Attribute("Classification", 
!               getOwner().getClassification(), getClassification(), true));
          } else {
            res.add(new Attribute("Classification", 
!               Project.getConstructionClas(), getClassification(), true));
          }
        } else {
          if (getOwner() != null && getOwner().getClassification() != null) {
            res.add(new Attribute("Classification", 
!               getOwner().getClassification(), getClassification(), true));
          } else {
            res.add(new Attribute("Classification", 
!               Project.getFunctionalClas(), getClassification(), true));
          }
        }
***************
*** 1366,1370 ****
      if (getClassification() != null && getClassificationType() != null) {
        res.add(new Attribute("Type", getClassification().getPossibleTypes(), 
!           getClassificationType()));
        HashMap<String, Object> param = getOwnParameters();
        for (String s : param.keySet()) {
--- 1366,1370 ----
      if (getClassification() != null && getClassificationType() != null) {
        res.add(new Attribute("Type", getClassification().getPossibleTypes(), 
!           getClassificationType(), true));
        HashMap<String, Object> param = getOwnParameters();
        for (String s : param.keySet()) {