Mail Archive Home | fractal-commits List | September 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Friday, September 15, 2006 @ 15:35:59
Author: pcdavid
Path: /cvsroot/fractal/fscript
Modified: LICENSE src/org/objectweb/fractal/fscript/Console.java
src/org/objectweb/fractal/fscript/FBean.java
src/org/objectweb/fractal/fscript/actions/BindAction.java
src/org/objectweb/fractal/fscript/axes/ChildAxis.java
src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java
src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
src/org/objectweb/fractal/fscript/axes/ParentAxis.java
src/org/objectweb/fractal/fscript/axes/SiblingAxis.java
src/org/objectweb/fractal/fscript/functions/FalseFunction.java
src/org/objectweb/fractal/fscript/functions/TrueFunction.java
src/org/objectweb/fractal/fscript/nodes/ComponentNode.java
src/org/objectweb/fractal/fscript/nodes/FractalNode.java
src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java
src/org/objectweb/fractal/fscript/nodes/MethodNode.java
src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java
src/org/objectweb/fractal/fscript/statements/Statement.java
src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java
tests/org/objectweb/fractal/fscript/AllTests.java
tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java
tests/org/objectweb/fractal/fscript/ExpressionsTests.java
tests/org/objectweb/fractal/fscript/FScriptTestCase.java
Updated contact information to use a valid email address.
----------------------------------------------------------------------------+
LICENSE |
2
src/org/objectweb/fractal/fscript/Console.java |
2
src/org/objectweb/fractal/fscript/FBean.java |
2
src/org/objectweb/fractal/fscript/actions/BindAction.java |
2
src/org/objectweb/fractal/fscript/axes/ChildAxis.java |
2
src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java |
2
src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java |
2
src/org/objectweb/fractal/fscript/axes/ParentAxis.java |
2
src/org/objectweb/fractal/fscript/axes/SiblingAxis.java |
2
src/org/objectweb/fractal/fscript/functions/FalseFunction.java |
2
src/org/objectweb/fractal/fscript/functions/TrueFunction.java |
2
src/org/objectweb/fractal/fscript/nodes/ComponentNode.java |
7 ++
src/org/objectweb/fractal/fscript/nodes/FractalNode.java |
14 ++++-
src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java |
7 ++
src/org/objectweb/fractal/fscript/nodes/MethodNode.java |
25 ++++++++++
src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java |
2
src/org/objectweb/fractal/fscript/statements/Statement.java |
2
src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java |
2
tests/org/objectweb/fractal/fscript/AllTests.java |
2
tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java |
2
tests/org/objectweb/fractal/fscript/ExpressionsTests.java |
2
tests/org/objectweb/fractal/fscript/FScriptTestCase.java |
2
22 files changed, 68 insertions(+), 21 deletions(-)
Index: fscript/LICENSE
diff -u fscript/LICENSE:1.4 fscript/LICENSE:1.5
--- fscript/LICENSE:1.4 Tue Jul 18 20:52:17 2006
+++ fscript/LICENSE Fri Sep 15 15:35:58 2006
@@ -14,4 +14,4 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Contact: Pierre-Charles David <PierreCharles.David@xxxxxxxxxxxxxxxxx>
+Contact: Pierre-Charles David <pcdavid@xxxxxxxxx>
Index: fscript/src/org/objectweb/fractal/fscript/Console.java
diff -u fscript/src/org/objectweb/fractal/fscript/Console.java:1.2
fscript/src/org/objectweb/fractal/fscript/Console.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/Console.java:1.2 Tue Jul 18
20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/Console.java Fri Sep 15
15:35:58 2006
@@ -29,7 +29,7 @@
import org.objectweb.fractal.fscript.statements.Statement;
/**
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*
*/
public class Console implements Runnable {
Index: fscript/src/org/objectweb/fractal/fscript/FBean.java
diff -u fscript/src/org/objectweb/fractal/fscript/FBean.java:1.3
fscript/src/org/objectweb/fractal/fscript/FBean.java:1.4
--- fscript/src/org/objectweb/fractal/fscript/FBean.java:1.3 Thu Sep 14
10:12:46 2006
+++ fscript/src/org/objectweb/fractal/fscript/FBean.java Fri Sep 15
15:35:58 2006
@@ -37,7 +37,7 @@
* This class provides utility methods to discover and manipulate Fractal
* components attributes in a generic way.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class FBean {
private static String capitalize(String str) {
Index: fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java
diff -u fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java:1.2
fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java:1.2
Tue Jul 18 20:52:16 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java Fri
Sep 15 15:35:58 2006
@@ -29,7 +29,7 @@
/**
* The <code>bind()</code> primitive action.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class BindAction extends AbstractAction {
public static final Signature SIGNATURE = new Signature(new Class[] {
InterfaceNode.class,
Index: fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java:1.2
fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java:1.2 Tue
Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java Fri
Sep 15 15:35:58 2006
@@ -35,7 +35,7 @@
* Implements the <code>child</code>, <code>child-or-self</code>,
* <code>descendant</code>, <code>descendant-or-self</code> axes.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class ChildAxis extends AbstractAxis {
/**
Index: fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java
diff -u
fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java:1.2
fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java Fri
Sep 15 15:35:58 2006
@@ -32,7 +32,7 @@
/**
* Selects all the external interfaces of a component.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class InterfacesAxis extends AbstractAxis {
public InterfacesAxis(NodeFactory factory) {
Index:
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
diff -u
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java:1.2
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java:1.3
---
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java:1.2
Tue Jul 18 20:52:17 2006
+++
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
Fri Sep 15 15:35:58 2006
@@ -36,7 +36,7 @@
/**
* Selects all the internal interfaces of a component.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class InternalInterfacesAxis extends AbstractAxis {
public InternalInterfacesAxis(NodeFactory factory) {
Index: fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java:1.2
fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java:1.2 Tue
Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java Fri
Sep 15 15:35:58 2006
@@ -35,7 +35,7 @@
* Implements the <code>parent</code>, <code>parent-or-self</code>,
* <code>ancestor</code> and <code>ancestor-or-self</code> axes.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class ParentAxis extends AbstractAxis {
/**
Index: fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java:1.2
fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java:1.2 Tue
Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java Fri
Sep 15 15:35:58 2006
@@ -32,7 +32,7 @@
* Selects all the siblings of a component, i.e. all the components which
share
* at least one parent with the initial one.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class SiblingAxis extends AbstractAxis {
public SiblingAxis(NodeFactory factory, boolean includeSelf) {
Index: fscript/src/org/objectweb/fractal/fscript/functions/FalseFunction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/functions/FalseFunction.java:1.2
fscript/src/org/objectweb/fractal/fscript/functions/FalseFunction.java:1.3
---
fscript/src/org/objectweb/fractal/fscript/functions/FalseFunction.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/functions/FalseFunction.java
Fri Sep 15 15:35:58 2006
@@ -24,7 +24,7 @@
import org.objectweb.fractal.fscript.Signature;
/**
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class FalseFunction extends AbstractFunction {
public static final Signature SIGNATURE = new Signature(new Class[0],
Boolean.class);
Index: fscript/src/org/objectweb/fractal/fscript/functions/TrueFunction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/functions/TrueFunction.java:1.2
fscript/src/org/objectweb/fractal/fscript/functions/TrueFunction.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/functions/TrueFunction.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/functions/TrueFunction.java
Fri Sep 15 15:35:58 2006
@@ -24,7 +24,7 @@
import org.objectweb.fractal.fscript.Signature;
/**
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class TrueFunction extends AbstractFunction {
public static final Signature SIGNATURE = new Signature(new Class[0],
Boolean.class);
Index: fscript/src/org/objectweb/fractal/fscript/nodes/ComponentNode.java
diff -u
fscript/src/org/objectweb/fractal/fscript/nodes/ComponentNode.java:1.2
fscript/src/org/objectweb/fractal/fscript/nodes/ComponentNode.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/nodes/ComponentNode.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/nodes/ComponentNode.java Fri
Sep 15 15:35:58 2006
@@ -62,6 +62,13 @@
return "";
}
}
+
+ /* (non-Javadoc)
+ * @see org.objectweb.fractal.fscript.nodes.FractalNode#getValue()
+ */
+ public Object getValue() {
+ return getComponent();
+ }
/*
* (non-Javadoc)
Index: fscript/src/org/objectweb/fractal/fscript/nodes/FractalNode.java
diff -u fscript/src/org/objectweb/fractal/fscript/nodes/FractalNode.java:1.2
fscript/src/org/objectweb/fractal/fscript/nodes/FractalNode.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/nodes/FractalNode.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/nodes/FractalNode.java Fri
Sep 15 15:35:58 2006
@@ -22,8 +22,8 @@
import org.objectweb.fractal.api.Component;
/**
- * Every Fractal element manipulated in FScript is represented as a node in a
- * virtual graph, implementing this interface.
+ * Every Fractal element manipulated in FScript is represented as a node in
a virtual
+ * graph, implementing this interface.
*
* @author Pierre-Charles David <PierreCharles.David@xxxxxxxxxxxxxxxxx>
*/
@@ -44,7 +44,15 @@
Component getComponent();
/**
- * Converts this node into a string value.
+ * Returns the model-level object this node represents. The actual type
of the object
+ * returned depends on thhe concrete type of node.
+ *
+ * @return the model-level object this node represents.
+ */
+ Object getValue();
+
+ /**
+ * Converts this node into a string value.
*
* @return a string representation of this node.
*/
Index: fscript/src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java
diff -u
fscript/src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java:1.2
fscript/src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java Fri
Sep 15 15:35:58 2006
@@ -52,6 +52,13 @@
public Interface getInterface() {
return value;
}
+
+ /* (non-Javadoc)
+ * @see org.objectweb.fractal.fscript.nodes.FractalNode#getValue()
+ */
+ public Object getValue() {
+ return getInterface();
+ }
/*
* (non-Javadoc)
Index: fscript/src/org/objectweb/fractal/fscript/nodes/MethodNode.java
diff -u fscript/src/org/objectweb/fractal/fscript/nodes/MethodNode.java:1.2
fscript/src/org/objectweb/fractal/fscript/nodes/MethodNode.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/nodes/MethodNode.java:1.2 Tue
Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/nodes/MethodNode.java Fri
Sep 15 15:35:58 2006
@@ -63,6 +63,31 @@
public Component getComponent() {
return itf.getFcItfOwner();
}
+
+ /* (non-Javadoc)
+ * @see org.objectweb.fractal.fscript.nodes.FractalNode#getValue()
+ */
+ public Object getValue() {
+ return getMethod();
+ }
+
+ /**
+ * Returns the language-level method wrapped by this node.
+ *
+ * @return the method represented by this node.
+ */
+ public Method getMethod() {
+ return method;
+ }
+
+ /**
+ * Returns the Fractal interface this method belongs to.
+ *
+ * @return the the Fractal interface this method belongs to.
+ */
+ public Interface getInterface() {
+ return itf;
+ }
/*
* (non-Javadoc)
Index:
fscript/src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java
diff -u
fscript/src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java:1.2
fscript/src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java:1.3
---
fscript/src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java:1.2
Tue Jul 18 20:52:17 2006
+++
fscript/src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java
Fri Sep 15 15:35:58 2006
@@ -31,7 +31,7 @@
* Wraps <code>BindingController#bindFc(itfName, serverItf)</code> into an
* atomic action.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class BindReconfiguration extends AbstractReconfiguration {
private Component client;
Index: fscript/src/org/objectweb/fractal/fscript/statements/Statement.java
diff -u
fscript/src/org/objectweb/fractal/fscript/statements/Statement.java:1.2
fscript/src/org/objectweb/fractal/fscript/statements/Statement.java:1.3
--- fscript/src/org/objectweb/fractal/fscript/statements/Statement.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/src/org/objectweb/fractal/fscript/statements/Statement.java Fri
Sep 15 15:35:57 2006
@@ -25,7 +25,7 @@
/**
* Represents an FScript statement to be executed.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public interface Statement {
/**
Index:
fscript/src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java
diff -u
fscript/src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java:1.2
fscript/src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java:1.3
---
fscript/src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java:1.2
Tue Jul 18 20:52:17 2006
+++
fscript/src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java
Fri Sep 15 15:35:57 2006
@@ -27,7 +27,7 @@
/**
* Represents a user-defined (i.e. non-primitive) function or action.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class UserDefinedProcedure extends AbstractProcedure {
private String name;
Index: fscript/tests/org/objectweb/fractal/fscript/AllTests.java
diff -u fscript/tests/org/objectweb/fractal/fscript/AllTests.java:1.2
fscript/tests/org/objectweb/fractal/fscript/AllTests.java:1.3
--- fscript/tests/org/objectweb/fractal/fscript/AllTests.java:1.2 Tue
Jul 18 20:52:17 2006
+++ fscript/tests/org/objectweb/fractal/fscript/AllTests.java Fri Sep 15
15:35:58 2006
@@ -24,7 +24,7 @@
import junit.framework.TestSuite;
/**
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class AllTests {
Index: fscript/tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java
diff -u
fscript/tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java:1.2
fscript/tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java:1.3
--- fscript/tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java
Fri Sep 15 15:35:58 2006
@@ -22,7 +22,7 @@
/**
* Tests for functions which do not involve Fractal.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class BasicFunctionsTests extends FScriptTestCase {
public void testTrueFunction() throws Exception {
Index: fscript/tests/org/objectweb/fractal/fscript/ExpressionsTests.java
diff -u fscript/tests/org/objectweb/fractal/fscript/ExpressionsTests.java:1.2
fscript/tests/org/objectweb/fractal/fscript/ExpressionsTests.java:1.3
--- fscript/tests/org/objectweb/fractal/fscript/ExpressionsTests.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/tests/org/objectweb/fractal/fscript/ExpressionsTests.java Fri
Sep 15 15:35:58 2006
@@ -28,7 +28,7 @@
* This test cases tests expressions which do not involve Fractal components
and
* nodes.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public class ExpressionsTests extends TestCase {
private FScriptInterpreter fscript;
Index: fscript/tests/org/objectweb/fractal/fscript/FScriptTestCase.java
diff -u fscript/tests/org/objectweb/fractal/fscript/FScriptTestCase.java:1.2
fscript/tests/org/objectweb/fractal/fscript/FScriptTestCase.java:1.3
--- fscript/tests/org/objectweb/fractal/fscript/FScriptTestCase.java:1.2
Tue Jul 18 20:52:17 2006
+++ fscript/tests/org/objectweb/fractal/fscript/FScriptTestCase.java Fri
Sep 15 15:35:58 2006
@@ -26,7 +26,7 @@
/**
* Abstract test class with helper methods for other test cases.
*
- * @author Pierre-Charles David <pierrecharles.david@xxxxxxxxxxxxxxxxx>
+ * @author Pierre-Charles David <pcdavid@xxxxxxxxx>
*/
public abstract class FScriptTestCase extends TestCase {
protected FScriptInterpreter fscript;
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.