[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Parameter.java, NONE, 1.1 Reference.java, NONE, 1.1 Surface.java, 1.212, 1.213

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

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

Modified Files:
	Surface.java 
Added Files:
	Parameter.java Reference.java 
Log Message:
Started refactoring of Attribute etc.

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** Surface.java	18 Dec 2007 08:02:53 -0000	1.212
--- Surface.java	18 Dec 2007 15:06:49 -0000	1.213
***************
*** 1880,1884 ****
--- 1880,1888 ----
    public List<Attribute> getAttributes() {
      ArrayList<Attribute> res = new ArrayList<Attribute>();
+     List<Material> materials = new LinkedList(Project.getInstance().getMaterials());
+     Entity.sort(materials);
+     
      res.add(new Attribute("Name", getName(), false));
+     
      if (getOwner() == Project.getInstance().world()) {
        res.add(new Attribute("Owner", Project.getInstance(), false));
***************
*** 1886,1927 ****
        res.add(new Attribute("Owner", getOwner(), false));
      }
-     if (getFrontDomain() != null) {
-       res.add(new Attribute("Space1", getFrontDomain(), true));
-     } else {
-       res.add(new Attribute("Space1", "None", true));
-     }
- 
-     if (getFrontMaterial() != null) {
-       res.add(new Attribute("Front Material", getFrontMaterial()));
-     } else {
-       if (getFrontDomain().isConstructionSpace()) {
-         res.add(new Attribute("Front Material", Defaults.getConstructionMaterial()));
-       } else if (getFrontDomain().isFunctionalSpace()) {
-         res.add(new Attribute("Front Material", Defaults.getFunctionalMaterial()));
-       } else {
-         res.add(new Attribute("Front Material", Defaults.getVoidMaterial()));
-       }
-     }
      
!     if (getBackDomain() != null) {
!       res.add(new Attribute("Space2", getBackDomain(), true));
!     } else {
!       res.add(new Attribute("Space2", "None", true));
!     }
      
!     if (getBackMaterial() != null) {
!       res.add(new Attribute("Back Material", getBackMaterial()));
!     } else {
!       if (getBackDomain().isConstructionSpace()) {
!         res.add(new Attribute("Back Material", Defaults.getConstructionMaterial()));
!       } else if (getBackDomain().isFunctionalSpace()) {
!         res.add(new Attribute("Back Material", Defaults.getFunctionalMaterial()));
!       } else {
!         res.add(new Attribute("Back Material", Defaults.getVoidMaterial()));
!       }
!     }
!     if (isInner()) {
        res.add(new Attribute("Exterior", getExterior(), false));     
      } 
      if (holes != null) {
        double holeArea = 0;
--- 1890,1903 ----
        res.add(new Attribute("Owner", getOwner(), false));
      }
      
!     res.add(new Attribute("Space1", getFrontDomain(), true));
!     res.add(new Attribute("Front Material", new Reference(frontMaterial(), materials)));
!     res.add(new Attribute("Space2", getBackDomain(), true));
!     res.add(new Attribute("Back Material", new Reference(backMaterial(), materials)));
      
!     if (exterior != null) {
        res.add(new Attribute("Exterior", getExterior(), false));     
      } 
+     
      if (holes != null) {
        double holeArea = 0;

--- NEW FILE: Reference.java ---
//---------------------------------------------------------------------------------
// $Id: Reference.java,v 1.1 2007/12/18 15:06:49 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.List;
import java.util.Map;

/**
 * 
 */
public class Reference implements Parameter {
  private Object object;
  private List legals;
  
  /**
   * 
   * @param object Object
   * @param legals List
   */
  public Reference(Object object, List legals) {
    this.object = object;
    this.legals = legals;
  }
  
  /**
   * 
   * @param value Object
   */
  public void setObject(Object value) {
    object = value;
  }
  
  /**
   * 
   * @return object
   */
  public Object getObject() {
    return object;
  }
  
  /**
   * 
   * @param list List
   */
  public void setLegals(List list) {
    legals = list;
  }
  
  /**
   * 
   * @return List
   */
  public List getLegals() {
    return legals;
  }
  
  /** {@inheritDoc} */
  public Object evaluate(Map<String, Object> env) {
    return object;
  }
}

--- NEW FILE: Parameter.java ---
//---------------------------------------------------------------------------------
// $Id: Parameter.java,v 1.1 2007/12/18 15:06:49 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.Map;

/**
 * 
 */
public interface Parameter {
  
  /**
   * Evaluates this Parameter in the given environment
   * @param env the environment to evaluate in
   * @return the result of the evaluation
   */
  public Object evaluate(Map<String, Object> env);
  
}