Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29237/src/net/sourceforge/bprocessor/model
Modified Files:
Project.java
Added Files:
ParameterBlock.java
Log Message:
Added globals to D-View and Project
--- NEW FILE: ParameterBlock.java ---
//---------------------------------------------------------------------------------
// $Id: ParameterBlock.java,v 1.1 2006/05/24 13:43:36 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.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
/**
* ParameterBlock
*/
public class ParameterBlock implements Parametric {
/** Parameters */
private List parameters;
/**
* Constructor ParameterBlock
*/
public ParameterBlock() {
super();
parameters = new LinkedList();
}
/**
* setAttributes
* @param attributes List of Attribute
*/
public void setAttributes(List attributes) {
parameters = attributes;
}
/**
* getAttributes
* @return List if Attribute
*/
public List getAttributes() {
return parameters;
}
/**
* Put
* @param key String
* @param value double
*/
public void put(String key, double value) {
parameters.add(new Attribute(key, new Double(value)));
}
/**
* Get as environment
* @return HashMap
*/
public HashMap environment() {
HashMap env = new HashMap();
Iterator iter = parameters.iterator();
while (iter.hasNext()) {
Attribute current = (Attribute) iter.next();
String key = current.getName();
Object value = current.getValue();
if (value instanceof Double) {
env.put(key, value);
}
}
return env;
}
/**
* Name
* @return String
*/
public String getGeneralName() {
return "Parameters";
}
}
Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Project.java 15 May 2006 10:32:10 -0000 1.57
--- Project.java 24 May 2006 13:43:36 -0000 1.58
***************
*** 50,53 ****
--- 50,56 ----
private Collection constraints;
+ /** The globals */
+ private ParameterBlock globals;
+
/** Has changes been made */
private boolean dirty;
***************
*** 98,101 ****
--- 101,106 ----
world.setId(new Long(0));
constraints = new LinkedList();
+ globals = new ParameterBlock();
+ globals.put("pi", Math.PI);
}
***************
*** 117,120 ****
--- 122,142 ----
/**
+ * Set globals
+ * @param globals ParameterBlock
+ */
+ public void setGlobals(ParameterBlock globals) {
+ this.globals = globals;
+ }
+
+
+ /**
+ * Get globals
+ * @return ParameterBlock
+ */
+ public ParameterBlock getGlobals() {
+ return globals;
+ }
+
+ /**
* Add observer
* @param observer The observer
|
