Mail Archive Home | fractal-commits List | July 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, July 18, 2006 @ 20:52:17
Author: pcdavid
Path: /cvsroot/fractal/fscript
Modified: .classpath .cvsignore LICENSE etc/execute.properties
src/org/objectweb/fractal/fscript/AbstractProcedure.java
src/org/objectweb/fractal/fscript/CodeGenerator.java
src/org/objectweb/fractal/fscript/Console.java
src/org/objectweb/fractal/fscript/DefaultModel.java
src/org/objectweb/fractal/fscript/Environment.java
src/org/objectweb/fractal/fscript/FBean.java
src/org/objectweb/fractal/fscript/FSciptClassLoader.java
src/org/objectweb/fractal/fscript/FScriptException.java
src/org/objectweb/fractal/fscript/FScriptInterpreter.java
src/org/objectweb/fractal/fscript/LoggedProcedure.java
src/org/objectweb/fractal/fscript/Model.java
src/org/objectweb/fractal/fscript/NodeFactory.java
src/org/objectweb/fractal/fscript/Procedure.java
src/org/objectweb/fractal/fscript/Signature.java
src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java
src/org/objectweb/fractal/fscript/Util.java
src/org/objectweb/fractal/fscript/Values.java
src/org/objectweb/fractal/fscript/actions/AbstractAction.java
src/org/objectweb/fractal/fscript/actions/AddAction.java
src/org/objectweb/fractal/fscript/actions/BindAction.java
src/org/objectweb/fractal/fscript/actions/EchoAction.java
src/org/objectweb/fractal/fscript/actions/InstanciateAction.java
src/org/objectweb/fractal/fscript/actions/RemoveAction.java
src/org/objectweb/fractal/fscript/actions/SetNameAction.java
src/org/objectweb/fractal/fscript/actions/SetValueAction.java
src/org/objectweb/fractal/fscript/actions/StartAction.java
src/org/objectweb/fractal/fscript/actions/StopAction.java
src/org/objectweb/fractal/fscript/actions/UnbindAction.java
src/org/objectweb/fractal/fscript/axes/AbstractAxis.java
src/org/objectweb/fractal/fscript/axes/AttributesAxis.java
src/org/objectweb/fractal/fscript/axes/Axis.java
src/org/objectweb/fractal/fscript/axes/BindingAxis.java
src/org/objectweb/fractal/fscript/axes/ChildAxis.java
src/org/objectweb/fractal/fscript/axes/ComponentAxis.java
src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java
src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
src/org/objectweb/fractal/fscript/axes/MethodAxis.java
src/org/objectweb/fractal/fscript/axes/ParentAxis.java
src/org/objectweb/fractal/fscript/axes/SiblingAxis.java
src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java
src/org/objectweb/fractal/fscript/expressions/AndExpression.java
src/org/objectweb/fractal/fscript/expressions/CallExpression.java
src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java
src/org/objectweb/fractal/fscript/expressions/Expression.java
src/org/objectweb/fractal/fscript/expressions/FPathExpression.java
src/org/objectweb/fractal/fscript/expressions/NodePredicate.java
src/org/objectweb/fractal/fscript/expressions/OrExpression.java
src/org/objectweb/fractal/fscript/expressions/Step.java
src/org/objectweb/fractal/fscript/expressions/VariableExpression.java
src/org/objectweb/fractal/fscript/functions/AbstractFunction.java
src/org/objectweb/fractal/fscript/functions/AdditionFunction.java
src/org/objectweb/fractal/fscript/functions/BoundFunction.java
src/org/objectweb/fractal/fscript/functions/ClientFunction.java
src/org/objectweb/fractal/fscript/functions/CollectionItfFunction.java
src/org/objectweb/fractal/fscript/functions/CompatibleFunction.java
src/org/objectweb/fractal/fscript/functions/ConcatFunction.java
src/org/objectweb/fractal/fscript/functions/CurrentFunction.java
src/org/objectweb/fractal/fscript/functions/DifferentFunction.java
src/org/objectweb/fractal/fscript/functions/DivisionFunction.java
src/org/objectweb/fractal/fscript/functions/EndsWithFunction.java
src/org/objectweb/fractal/fscript/functions/EqualsFunction.java
src/org/objectweb/fractal/fscript/functions/ExternalItfFunction.java
src/org/objectweb/fractal/fscript/functions/FalseFunction.java
src/org/objectweb/fractal/fscript/functions/GreaterThanFunction.java
src/org/objectweb/fractal/fscript/functions/GreaterThanOrEqualFunction.java
src/org/objectweb/fractal/fscript/functions/InternalItfFunction.java
src/org/objectweb/fractal/fscript/functions/LessThanFunction.java
src/org/objectweb/fractal/fscript/functions/LessThanOrEqualFunction.java
src/org/objectweb/fractal/fscript/functions/MandatoryFunction.java
src/org/objectweb/fractal/fscript/functions/MinusFunction.java
src/org/objectweb/fractal/fscript/functions/MultiplicationFunction.java
src/org/objectweb/fractal/fscript/functions/NameFunction.java
src/org/objectweb/fractal/fscript/functions/NotFunction.java
src/org/objectweb/fractal/fscript/functions/OptionalFunction.java
src/org/objectweb/fractal/fscript/functions/ServerFunction.java
src/org/objectweb/fractal/fscript/functions/SignatureFunction.java
src/org/objectweb/fractal/fscript/functions/SingleItfFunction.java
src/org/objectweb/fractal/fscript/functions/SizeFunction.java
src/org/objectweb/fractal/fscript/functions/StartedFunction.java
src/org/objectweb/fractal/fscript/functions/StartsWithFunction.java
src/org/objectweb/fractal/fscript/functions/StateFunction.java
src/org/objectweb/fractal/fscript/functions/StoppedFunction.java
src/org/objectweb/fractal/fscript/functions/SubstractionFunction.java
src/org/objectweb/fractal/fscript/functions/TrueFunction.java
src/org/objectweb/fractal/fscript/functions/ValueFunction.java
src/org/objectweb/fractal/fscript/nodes/AttributeNode.java
src/org/objectweb/fractal/fscript/nodes/ComponentNode.java
src/org/objectweb/fractal/fscript/nodes/DefaultNodeFactory.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/parser/FScriptLexer.java
src/org/objectweb/fractal/fscript/parser/FScriptLexer.smap
src/org/objectweb/fractal/fscript/parser/FScriptLexerTokenTypes.java
src/org/objectweb/fractal/fscript/parser/FScriptLexerTokenTypes.txt
src/org/objectweb/fractal/fscript/parser/FScriptParser.java
src/org/objectweb/fractal/fscript/parser/FScriptParser.smap
src/org/objectweb/fractal/fscript/parser/FScriptParserTokenTypes.java
src/org/objectweb/fractal/fscript/parser/FScriptParserTokenTypes.txt
src/org/objectweb/fractal/fscript/parser/fscript.g
src/org/objectweb/fractal/fscript/parser/lexer.g
src/org/objectweb/fractal/fscript/reconfiguration/AbstractReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/AddReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/EchoReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/InstanciateReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/LifeCycleReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/Reconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/ReconfigurationFailedException.java
src/org/objectweb/fractal/fscript/reconfiguration/ReconfigurationHelper.java
src/org/objectweb/fractal/fscript/reconfiguration/ReconfigurationManager.java
src/org/objectweb/fractal/fscript/reconfiguration/RemoveReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/SetNameReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/SetValueReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/StartReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/StopReconfiguration.java
src/org/objectweb/fractal/fscript/reconfiguration/Transaction.java
src/org/objectweb/fractal/fscript/reconfiguration/UnbindReconfiguration.java
src/org/objectweb/fractal/fscript/statements/AssignmentStatement.java
src/org/objectweb/fractal/fscript/statements/BlockStatement.java
src/org/objectweb/fractal/fscript/statements/ExpressionStatement.java
src/org/objectweb/fractal/fscript/statements/ForeachStatement.java
src/org/objectweb/fractal/fscript/statements/IfStatement.java
src/org/objectweb/fractal/fscript/statements/ReturnStatement.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/AxesTests.java
tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java
tests/org/objectweb/fractal/fscript/EnvironmentTests.java
tests/org/objectweb/fractal/fscript/ExpressionsTests.java
tests/org/objectweb/fractal/fscript/FPathTests.java
tests/org/objectweb/fractal/fscript/FScriptTestCase.java
tests/org/objectweb/fractal/fscript/FractalTestCase.java
tests/org/objectweb/fractal/fscript/NodesTests.java
* Removed accents from copyright statements to avoid encoding problems.
* Converted all files to use Unix-style line terminators.
* Added build folder to .cvsignore.
---------------------------------------------------------------------------------------+
.classpath
| 46
.cvsignore
| 1
LICENSE
| 4
etc/execute.properties
| 10
src/org/objectweb/fractal/fscript/AbstractProcedure.java
| 54
src/org/objectweb/fractal/fscript/CodeGenerator.java
| 296 -
src/org/objectweb/fractal/fscript/Console.java
| 4
src/org/objectweb/fractal/fscript/DefaultModel.java
| 208
src/org/objectweb/fractal/fscript/Environment.java
| 4
src/org/objectweb/fractal/fscript/FBean.java
| 4
src/org/objectweb/fractal/fscript/FSciptClassLoader.java
| 128
src/org/objectweb/fractal/fscript/FScriptException.java
| 4
src/org/objectweb/fractal/fscript/FScriptInterpreter.java
| 4
src/org/objectweb/fractal/fscript/LoggedProcedure.java
| 188
src/org/objectweb/fractal/fscript/Model.java
| 58
src/org/objectweb/fractal/fscript/NodeFactory.java
| 66
src/org/objectweb/fractal/fscript/Procedure.java
| 4
src/org/objectweb/fractal/fscript/Signature.java
| 102
src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java
| 190
src/org/objectweb/fractal/fscript/Util.java
| 4
src/org/objectweb/fractal/fscript/Values.java
| 4
src/org/objectweb/fractal/fscript/actions/AbstractAction.java
| 56
src/org/objectweb/fractal/fscript/actions/AddAction.java
| 4
src/org/objectweb/fractal/fscript/actions/BindAction.java
| 4
src/org/objectweb/fractal/fscript/actions/EchoAction.java
| 4
src/org/objectweb/fractal/fscript/actions/InstanciateAction.java
| 4
src/org/objectweb/fractal/fscript/actions/RemoveAction.java
| 4
src/org/objectweb/fractal/fscript/actions/SetNameAction.java
| 4
src/org/objectweb/fractal/fscript/actions/SetValueAction.java
| 4
src/org/objectweb/fractal/fscript/actions/StartAction.java
| 4
src/org/objectweb/fractal/fscript/actions/StopAction.java
| 4
src/org/objectweb/fractal/fscript/actions/UnbindAction.java
| 4
src/org/objectweb/fractal/fscript/axes/AbstractAxis.java
| 112
src/org/objectweb/fractal/fscript/axes/AttributesAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/Axis.java
| 4
src/org/objectweb/fractal/fscript/axes/BindingAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/ChildAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/ComponentAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/MethodAxis.java
| 140
src/org/objectweb/fractal/fscript/axes/ParentAxis.java
| 4
src/org/objectweb/fractal/fscript/axes/SiblingAxis.java
| 4
src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java
| 4
src/org/objectweb/fractal/fscript/expressions/AndExpression.java
| 4
src/org/objectweb/fractal/fscript/expressions/CallExpression.java
| 4
src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java
| 4
src/org/objectweb/fractal/fscript/expressions/Expression.java
| 4
src/org/objectweb/fractal/fscript/expressions/FPathExpression.java
| 4
src/org/objectweb/fractal/fscript/expressions/NodePredicate.java
| 52
src/org/objectweb/fractal/fscript/expressions/OrExpression.java
| 4
src/org/objectweb/fractal/fscript/expressions/Step.java
| 4
src/org/objectweb/fractal/fscript/expressions/VariableExpression.java
| 4
src/org/objectweb/fractal/fscript/functions/AbstractFunction.java
| 68
src/org/objectweb/fractal/fscript/functions/AdditionFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/BoundFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/ClientFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/CollectionItfFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/CompatibleFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/ConcatFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/CurrentFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/DifferentFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/DivisionFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/EndsWithFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/EqualsFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/ExternalItfFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/FalseFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/GreaterThanFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/GreaterThanOrEqualFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/InternalItfFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/LessThanFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/LessThanOrEqualFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/MandatoryFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/MinusFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/MultiplicationFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/NameFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/NotFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/OptionalFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/ServerFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/SignatureFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/SingleItfFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/SizeFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/StartedFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/StartsWithFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/StateFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/StoppedFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/SubstractionFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/TrueFunction.java
| 4
src/org/objectweb/fractal/fscript/functions/ValueFunction.java
| 4
src/org/objectweb/fractal/fscript/nodes/AttributeNode.java
| 4
src/org/objectweb/fractal/fscript/nodes/ComponentNode.java
| 4
src/org/objectweb/fractal/fscript/nodes/DefaultNodeFactory.java
| 98
src/org/objectweb/fractal/fscript/nodes/FractalNode.java
| 4
src/org/objectweb/fractal/fscript/nodes/InterfaceNode.java
| 4
src/org/objectweb/fractal/fscript/nodes/MethodNode.java
| 224
src/org/objectweb/fractal/fscript/parser/FScriptLexer.java
| 2553 ++++------
src/org/objectweb/fractal/fscript/parser/FScriptLexer.smap
| 1436 ++---
src/org/objectweb/fractal/fscript/parser/FScriptLexerTokenTypes.java
| 150
src/org/objectweb/fractal/fscript/parser/FScriptLexerTokenTypes.txt
| 100
src/org/objectweb/fractal/fscript/parser/FScriptParser.java
| 1902 +++----
src/org/objectweb/fractal/fscript/parser/FScriptParser.smap
| 1370 ++---
src/org/objectweb/fractal/fscript/parser/FScriptParserTokenTypes.java
| 158
src/org/objectweb/fractal/fscript/parser/FScriptParserTokenTypes.txt
| 100
src/org/objectweb/fractal/fscript/parser/fscript.g
| 4
src/org/objectweb/fractal/fscript/parser/lexer.g
| 4
src/org/objectweb/fractal/fscript/reconfiguration/AbstractReconfiguration.java
| 72
src/org/objectweb/fractal/fscript/reconfiguration/AddReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/BindReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/EchoReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/InstanciateReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/LifeCycleReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/Reconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/ReconfigurationFailedException.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/ReconfigurationHelper.java
| 160
src/org/objectweb/fractal/fscript/reconfiguration/ReconfigurationManager.java
| 184
src/org/objectweb/fractal/fscript/reconfiguration/RemoveReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/SetNameReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/SetValueReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/StartReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/StopReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/Transaction.java
| 4
src/org/objectweb/fractal/fscript/reconfiguration/UnbindReconfiguration.java
| 4
src/org/objectweb/fractal/fscript/statements/AssignmentStatement.java
| 4
src/org/objectweb/fractal/fscript/statements/BlockStatement.java
| 4
src/org/objectweb/fractal/fscript/statements/ExpressionStatement.java
| 4
src/org/objectweb/fractal/fscript/statements/ForeachStatement.java
| 4
src/org/objectweb/fractal/fscript/statements/IfStatement.java
| 4
src/org/objectweb/fractal/fscript/statements/ReturnStatement.java
| 4
src/org/objectweb/fractal/fscript/statements/Statement.java
| 4
src/org/objectweb/fractal/fscript/statements/UserDefinedProcedure.java
| 4
tests/org/objectweb/fractal/fscript/AllTests.java
| 4
tests/org/objectweb/fractal/fscript/AxesTests.java
| 4
tests/org/objectweb/fractal/fscript/BasicFunctionsTests.java
| 4
tests/org/objectweb/fractal/fscript/EnvironmentTests.java
| 4
tests/org/objectweb/fractal/fscript/ExpressionsTests.java
| 4
tests/org/objectweb/fractal/fscript/FPathTests.java
| 4
tests/org/objectweb/fractal/fscript/FScriptTestCase.java
| 4
tests/org/objectweb/fractal/fscript/FractalTestCase.java
| 4
tests/org/objectweb/fractal/fscript/NodesTests.java
| 4
139 files changed, 5331 insertions(+), 5387 deletions(-)
Index: fscript/.classpath
diff -u fscript/.classpath:1.3 fscript/.classpath:1.4
--- fscript/.classpath:1.3 Tue Jul 18 19:54:11 2006
+++ fscript/.classpath Tue Jul 18 20:52:17 2006
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="src" path="etc"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
- <classpathentry kind="lib" path="lib/asm.jar"/>
- <classpathentry
sourcepath="C:/workspace/fractal-all-2.3.1/fractal/src" kind="lib"
path="lib/fractal-2.0.1.jar"/>
- <classpathentry sourcepath="C:/workspace/fractal-all-2.3.1/adl/src"
kind="lib" path="lib/fractal-adl-2.1.3.jar"/>
- <classpathentry kind="lib" path="lib/dtdparser.jar"/>
- <classpathentry kind="lib" path="lib/julia-asm-2.1.3.jar"/>
- <classpathentry kind="lib" path="lib/julia-mixins-2.1.3.jar"/>
- <classpathentry kind="lib" path="lib/julia-runtime-2.1.3.jar"/>
- <classpathentry kind="lib" path="lib/naming-2.0.1.jar"/>
- <classpathentry kind="lib" path="lib/ow_deployment_scheduling.jar"/>
- <classpathentry kind="lib" path="lib/ow_monolog.jar"/>
- <classpathentry kind="lib" path="lib/ow_util_log_api.jar"/>
- <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
- <classpathentry kind="lib" path="lib/helloworld.jar"/>
- <classpathentry kind="lib" path="lib/comanche.jar"/>
- <classpathentry kind="output" path="build"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="tests"/>
+ <classpathentry kind="src" path="etc"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
+ <classpathentry kind="lib" path="lib/asm.jar"/>
+ <classpathentry
sourcepath="C:/workspace/fractal-all-2.3.1/fractal/src" kind="lib"
path="lib/fractal-2.0.1.jar"/>
+ <classpathentry sourcepath="C:/workspace/fractal-all-2.3.1/adl/src"
kind="lib" path="lib/fractal-adl-2.1.3.jar"/>
+ <classpathentry kind="lib" path="lib/dtdparser.jar"/>
+ <classpathentry kind="lib" path="lib/julia-asm-2.1.3.jar"/>
+ <classpathentry kind="lib" path="lib/julia-mixins-2.1.3.jar"/>
+ <classpathentry kind="lib" path="lib/julia-runtime-2.1.3.jar"/>
+ <classpathentry kind="lib" path="lib/naming-2.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/ow_deployment_scheduling.jar"/>
+ <classpathentry kind="lib" path="lib/ow_monolog.jar"/>
+ <classpathentry kind="lib" path="lib/ow_util_log_api.jar"/>
+ <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
+ <classpathentry kind="lib" path="lib/helloworld.jar"/>
+ <classpathentry kind="lib" path="lib/comanche.jar"/>
+ <classpathentry kind="output" path="build"/>
+</classpath>
Index: fscript/.cvsignore
diff -u /dev/null fscript/.cvsignore:1.3
--- /dev/null Tue Jul 18 20:52:18 2006
+++ fscript/.cvsignore Tue Jul 18 20:52:17 2006
@@ -0,0 +1 @@
+build
Index: fscript/LICENSE
diff -u fscript/LICENSE:1.3 fscript/LICENSE:1.4
--- fscript/LICENSE:1.3 Tue Jul 18 19:54:11 2006
+++ fscript/LICENSE Tue Jul 18 20:52:17 2006
@@ -1,5 +1,5 @@
-Copyright (c) 2004-2005 Université de Nantes (LINA)
-Copyright (c) 2005-2006 France Télécom
+Copyright (c) 2004-2005 Universite de Nantes (LINA)
+Copyright (c) 2005-2006 France Telecom
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Index: fscript/etc/execute.properties
diff -u fscript/etc/execute.properties:1.1 fscript/etc/execute.properties:1.2
--- fscript/etc/execute.properties:1.1 Tue Jul 18 19:54:12 2006
+++ fscript/etc/execute.properties Tue Jul 18 20:52:17 2006
@@ -1,5 +1,5 @@
-fractal.provider org.objectweb.fractal.julia.Julia
-julia.loader org.objectweb.fractal.julia.loader.DynamicLoader
-julia.config etc/julia.cfg
-
-run.classname org.objectweb.fractal.fscript.Console
+fractal.provider org.objectweb.fractal.julia.Julia
+julia.loader org.objectweb.fractal.julia.loader.DynamicLoader
+julia.config etc/julia.cfg
+
+run.classname org.objectweb.fractal.fscript.Console
Index: fscript/src/org/objectweb/fractal/fscript/AbstractProcedure.java
diff -u fscript/src/org/objectweb/fractal/fscript/AbstractProcedure.java:1.1
fscript/src/org/objectweb/fractal/fscript/AbstractProcedure.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/AbstractProcedure.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/AbstractProcedure.java Tue
Jul 18 20:52:17 2006
@@ -1,27 +1,27 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-public abstract class AbstractProcedure implements Procedure {
- @Override
- public String toString() {
- return getName() + "(" + (getSignature() != null ? getSignature() :
"...") + ")";
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+public abstract class AbstractProcedure implements Procedure {
+ @Override
+ public String toString() {
+ return getName() + "(" + (getSignature() != null ? getSignature() :
"...") + ")";
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/CodeGenerator.java
diff -u fscript/src/org/objectweb/fractal/fscript/CodeGenerator.java:1.1
fscript/src/org/objectweb/fractal/fscript/CodeGenerator.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/CodeGenerator.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/CodeGenerator.java Tue
Jul 18 20:52:17 2006
@@ -1,148 +1,148 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import java.io.PrintStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.Interface;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.util.Fractal;
-
-public class CodeGenerator {
- private List<Object[]> log;
- private PrintStream out;
- private int dynamicComponents;
- private Map<Component, String> identifiers;
-
- public CodeGenerator(List<Object[]> log, PrintStream out) {
- assert (log != null);
- this.log = log;
- this.out = out;
- this.identifiers = new HashMap<Component, String>();
- this.dynamicComponents = 0;
- collectIdentifiers();
- }
-
- public void generate() {
- out.println("#include <fractal/api/ComponentIdentity.idl.h>");
- out.println("#include <fscript.h>");
- out.println("#include \"addresses.h\"");
- out.println();
- out.println("#ifdef DUMMY_NAMES");
- for (String id : identifiers.values()) {
- out.println("#define " + id + " 0x0000");
- }
- out.println("#endif");
- out.println();
- out.println("int main(int argc, char *argv[])");
- out.println("{");
- for (Object[] entry : log) {
- String action = (String) entry[0];
- Component retVal = (Component) entry[entry.length - 1];
- Object[] args = new Object[entry.length - 2];
- System.arraycopy(entry, 1, args, 0, args.length);
- dumpEntry(action, args, retVal);
- }
- out.println(" return 0;");
- out.println("}");
- }
-
- private void collectIdentifiers() {
- for (Object[] entry : log) {
- for (int i = 1; i < entry.length - 1; i++) {
- Component c = null;
- if (entry[i] instanceof Component) {
- c = (Component) entry[i];
- } else if (entry[i] instanceof Interface) {
- c = ((Interface) entry[i]).getFcItfOwner();
- }
- if (c != null && !identifiers.containsKey(c)) {
- identifiers.put(c, getFullName(c));
- }
- }
- }
- }
-
- private String getFullName(Component c) {
- Component[] parents = null;
- try {
- parents = Fractal.getSuperController(c).getFcSuperComponents();
- } catch (NoSuchInterfaceException nsie) {
- // No parents
- }
- if (parents == null || parents.length == 0) {
- // Top-level: full name is local name
- return getLocalName(c);
- } else {
- Component father = parents[0];
- return getFullName(father) + "__" + getLocalName(c);
- }
- }
-
- private String getLocalName(Component c) {
- try {
- return Fractal.getNameController(c).getFcName();
- } catch (NoSuchInterfaceException e) {
- throw new RuntimeException("Can not generat identifier for " + c
- + ": no name-controller interface available.");
- }
- }
-
- private void dumpEntry(String action, Object[] args, Component retVal) {
- out.print(" ");
- if (retVal != null) {
- // Dynamic component created: override the name found by
- // collectIdentifiers.
- String var = "comp_" + dynamicComponents++;
- identifiers.put(retVal, var);
- out.print("Rfractal_api_ComponentIdentity *" + var + " = ");
- }
- out.print("fscript_" + action.replace('-', '_'));
- out.print("(");
- for (int i = 0; i < args.length; i++) {
- out.print(repr(args[i]));
- if (i < args.length - 1) {
- out.print(", ");
- }
- }
- out.println(");");
- }
-
- private String repr(Object v) {
- if (v instanceof String) {
- String s = (String) v;
- return "\"" + s.replace("\"", "\\\"") + "\"";
- } else if (v instanceof Component) {
- return identifiers.get(v);
- } else if (v instanceof Interface) {
- Interface itf = (Interface) v;
- Component c = itf.getFcItfOwner();
- return identifiers.get(c) + ", \"" + itf.getFcItfName() + "\"";
- } else if (v != null) {
- return v.toString();
- } else {
- return "NULL";
- }
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.objectweb.fractal.api.Component;
+import org.objectweb.fractal.api.Interface;
+import org.objectweb.fractal.api.NoSuchInterfaceException;
+import org.objectweb.fractal.util.Fractal;
+
+public class CodeGenerator {
+ private List<Object[]> log;
+ private PrintStream out;
+ private int dynamicComponents;
+ private Map<Component, String> identifiers;
+
+ public CodeGenerator(List<Object[]> log, PrintStream out) {
+ assert (log != null);
+ this.log = log;
+ this.out = out;
+ this.identifiers = new HashMap<Component, String>();
+ this.dynamicComponents = 0;
+ collectIdentifiers();
+ }
+
+ public void generate() {
+ out.println("#include <fractal/api/ComponentIdentity.idl.h>");
+ out.println("#include <fscript.h>");
+ out.println("#include \"addresses.h\"");
+ out.println();
+ out.println("#ifdef DUMMY_NAMES");
+ for (String id : identifiers.values()) {
+ out.println("#define " + id + " 0x0000");
+ }
+ out.println("#endif");
+ out.println();
+ out.println("int main(int argc, char *argv[])");
+ out.println("{");
+ for (Object[] entry : log) {
+ String action = (String) entry[0];
+ Component retVal = (Component) entry[entry.length - 1];
+ Object[] args = new Object[entry.length - 2];
+ System.arraycopy(entry, 1, args, 0, args.length);
+ dumpEntry(action, args, retVal);
+ }
+ out.println(" return 0;");
+ out.println("}");
+ }
+
+ private void collectIdentifiers() {
+ for (Object[] entry : log) {
+ for (int i = 1; i < entry.length - 1; i++) {
+ Component c = null;
+ if (entry[i] instanceof Component) {
+ c = (Component) entry[i];
+ } else if (entry[i] instanceof Interface) {
+ c = ((Interface) entry[i]).getFcItfOwner();
+ }
+ if (c != null && !identifiers.containsKey(c)) {
+ identifiers.put(c, getFullName(c));
+ }
+ }
+ }
+ }
+
+ private String getFullName(Component c) {
+ Component[] parents = null;
+ try {
+ parents = Fractal.getSuperController(c).getFcSuperComponents();
+ } catch (NoSuchInterfaceException nsie) {
+ // No parents
+ }
+ if (parents == null || parents.length == 0) {
+ // Top-level: full name is local name
+ return getLocalName(c);
+ } else {
+ Component father = parents[0];
+ return getFullName(father) + "__" + getLocalName(c);
+ }
+ }
+
+ private String getLocalName(Component c) {
+ try {
+ return Fractal.getNameController(c).getFcName();
+ } catch (NoSuchInterfaceException e) {
+ throw new RuntimeException("Can not generat identifier for " + c
+ + ": no name-controller interface available.");
+ }
+ }
+
+ private void dumpEntry(String action, Object[] args, Component retVal) {
+ out.print(" ");
+ if (retVal != null) {
+ // Dynamic component created: override the name found by
+ // collectIdentifiers.
+ String var = "comp_" + dynamicComponents++;
+ identifiers.put(retVal, var);
+ out.print("Rfractal_api_ComponentIdentity *" + var + " = ");
+ }
+ out.print("fscript_" + action.replace('-', '_'));
+ out.print("(");
+ for (int i = 0; i < args.length; i++) {
+ out.print(repr(args[i]));
+ if (i < args.length - 1) {
+ out.print(", ");
+ }
+ }
+ out.println(");");
+ }
+
+ private String repr(Object v) {
+ if (v instanceof String) {
+ String s = (String) v;
+ return "\"" + s.replace("\"", "\\\"") + "\"";
+ } else if (v instanceof Component) {
+ return identifiers.get(v);
+ } else if (v instanceof Interface) {
+ Interface itf = (Interface) v;
+ Component c = itf.getFcItfOwner();
+ return identifiers.get(c) + ", \"" + itf.getFcItfName() + "\"";
+ } else if (v != null) {
+ return v.toString();
+ } else {
+ return "NULL";
+ }
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/Console.java
diff -u fscript/src/org/objectweb/fractal/fscript/Console.java:1.1
fscript/src/org/objectweb/fractal/fscript/Console.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Console.java:1.1 Tue Jul 18
19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Console.java Tue Jul 18
20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/DefaultModel.java
diff -u fscript/src/org/objectweb/fractal/fscript/DefaultModel.java:1.1
fscript/src/org/objectweb/fractal/fscript/DefaultModel.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/DefaultModel.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/DefaultModel.java Tue Jul 18
20:52:17 2006
@@ -1,104 +1,104 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.objectweb.fractal.adl.ADLException;
-import org.objectweb.fractal.adl.Factory;
-import org.objectweb.fractal.adl.FactoryFactory;
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.Interface;
-import org.objectweb.fractal.fscript.axes.*;
-import org.objectweb.fractal.fscript.nodes.*;
-
-public class DefaultModel implements Model {
- private NodeFactory factory;
- private Map<String, Axis> axes;
-
- public DefaultModel() {
- this.factory = new DefaultNodeFactory();
- axes = new HashMap<String, Axis>();
- defineAxes();
- }
-
- public Factory getComponentFactory() {
- try {
- return FactoryFactory.getFactory(FactoryFactory.FRACTAL_BACKEND);
- } catch (ADLException e) {
- return null;
- }
- }
-
- private void defineAxes() {
- defineAxis(new ComponentAxis(factory));
- defineAxis(new AttributesAxis(factory));
- defineAxis(new InterfacesAxis(this));
- defineAxis(new InternalInterfacesAxis(this));
- defineAxis(new BindingAxis(factory));
- //
- defineAxis(new ChildAxis(this, false, false));
- defineAxis(new ChildAxis(this, true, false));
- defineAxis(new ChildAxis(this, false, true));
- defineAxis(new ChildAxis(this, true, true));
- //
- defineAxis(new ParentAxis(this, false, false));
- defineAxis(new ParentAxis(this, true, false));
- defineAxis(new ParentAxis(this, false, true));
- defineAxis(new ParentAxis(this, true, true));
- //
- defineAxis(new SiblingAxis(this, false));
- defineAxis(new SiblingAxis(this, true));
- //
- defineAxis(new MethodAxis(this));
- }
-
- private void defineAxis(Axis axis) {
- axes.put(axis.getName(), axis);
- }
-
- public String[] getAxisNames() {
- Set<String> keys = axes.keySet();
- return keys.toArray(new String[keys.size()]);
- }
-
- public Axis getAxis(String name) {
- return axes.get(name);
- }
-
- public FractalNode createAttributeNode(Component c, String
attributeName) {
- return factory.createAttributeNode(c, attributeName);
- }
-
- public FractalNode createComponentNode(Component c) {
- return factory.createComponentNode(c);
- }
-
- public FractalNode createInterfaceNode(Interface itf) {
- return factory.createInterfaceNode(itf);
- }
-
- public FractalNode createMethodNode(Interface itf, Method meth) {
- return factory.createMethodNode(itf, meth);
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.objectweb.fractal.adl.ADLException;
+import org.objectweb.fractal.adl.Factory;
+import org.objectweb.fractal.adl.FactoryFactory;
+import org.objectweb.fractal.api.Component;
+import org.objectweb.fractal.api.Interface;
+import org.objectweb.fractal.fscript.axes.*;
+import org.objectweb.fractal.fscript.nodes.*;
+
+public class DefaultModel implements Model {
+ private NodeFactory factory;
+ private Map<String, Axis> axes;
+
+ public DefaultModel() {
+ this.factory = new DefaultNodeFactory();
+ axes = new HashMap<String, Axis>();
+ defineAxes();
+ }
+
+ public Factory getComponentFactory() {
+ try {
+ return FactoryFactory.getFactory(FactoryFactory.FRACTAL_BACKEND);
+ } catch (ADLException e) {
+ return null;
+ }
+ }
+
+ private void defineAxes() {
+ defineAxis(new ComponentAxis(factory));
+ defineAxis(new AttributesAxis(factory));
+ defineAxis(new InterfacesAxis(this));
+ defineAxis(new InternalInterfacesAxis(this));
+ defineAxis(new BindingAxis(factory));
+ //
+ defineAxis(new ChildAxis(this, false, false));
+ defineAxis(new ChildAxis(this, true, false));
+ defineAxis(new ChildAxis(this, false, true));
+ defineAxis(new ChildAxis(this, true, true));
+ //
+ defineAxis(new ParentAxis(this, false, false));
+ defineAxis(new ParentAxis(this, true, false));
+ defineAxis(new ParentAxis(this, false, true));
+ defineAxis(new ParentAxis(this, true, true));
+ //
+ defineAxis(new SiblingAxis(this, false));
+ defineAxis(new SiblingAxis(this, true));
+ //
+ defineAxis(new MethodAxis(this));
+ }
+
+ private void defineAxis(Axis axis) {
+ axes.put(axis.getName(), axis);
+ }
+
+ public String[] getAxisNames() {
+ Set<String> keys = axes.keySet();
+ return keys.toArray(new String[keys.size()]);
+ }
+
+ public Axis getAxis(String name) {
+ return axes.get(name);
+ }
+
+ public FractalNode createAttributeNode(Component c, String
attributeName) {
+ return factory.createAttributeNode(c, attributeName);
+ }
+
+ public FractalNode createComponentNode(Component c) {
+ return factory.createComponentNode(c);
+ }
+
+ public FractalNode createInterfaceNode(Interface itf) {
+ return factory.createInterfaceNode(itf);
+ }
+
+ public FractalNode createMethodNode(Interface itf, Method meth) {
+ return factory.createMethodNode(itf, meth);
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/Environment.java
diff -u fscript/src/org/objectweb/fractal/fscript/Environment.java:1.1
fscript/src/org/objectweb/fractal/fscript/Environment.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Environment.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Environment.java Tue Jul 18
20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/FBean.java
diff -u fscript/src/org/objectweb/fractal/fscript/FBean.java:1.1
fscript/src/org/objectweb/fractal/fscript/FBean.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/FBean.java:1.1 Tue Jul 18
19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/FBean.java Tue Jul 18
20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/FSciptClassLoader.java
diff -u fscript/src/org/objectweb/fractal/fscript/FSciptClassLoader.java:1.1
fscript/src/org/objectweb/fractal/fscript/FSciptClassLoader.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/FSciptClassLoader.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/FSciptClassLoader.java Tue
Jul 18 20:52:17 2006
@@ -1,64 +1,64 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-public class FSciptClassLoader extends URLClassLoader {
-
- public final static String FILE_PROTOCOL = "file";
-
- public FSciptClassLoader(URL[] urls, ClassLoader parent) {
- super(urls, parent);
- }
-
- public FSciptClassLoader(URL[] urls) {
- super(urls);
- }
-
- protected void addURL(URL url) {
- super.addURL(url);
- }
-
-public void loadJar(String path, String protocol, String host) throws
IOException {
- try {
- URL url;
- if (protocol.equals(FILE_PROTOCOL)) {
- File jarFile = new File(path);
- String jarPath = "/"
- +
jarFile.getCanonicalPath().replace(File.separator, "/");
- url = new URI(protocol, host, jarPath,
null).toURL();
- }
- else {
- url = new URI(protocol, host, path,
null).toURL();
- }
- addURL(url);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (URISyntaxException e) {
- e.printStackTrace();
- }
- }}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+public class FSciptClassLoader extends URLClassLoader {
+
+ public final static String FILE_PROTOCOL = "file";
+
+ public FSciptClassLoader(URL[] urls, ClassLoader parent) {
+ super(urls, parent);
+ }
+
+ public FSciptClassLoader(URL[] urls) {
+ super(urls);
+ }
+
+ protected void addURL(URL url) {
+ super.addURL(url);
+ }
+
+public void loadJar(String path, String protocol, String host) throws
IOException {
+ try {
+ URL url;
+ if (protocol.equals(FILE_PROTOCOL)) {
+ File jarFile = new File(path);
+ String jarPath = "/"
+ +
jarFile.getCanonicalPath().replace(File.separator, "/");
+ url = new URI(protocol, host, jarPath,
null).toURL();
+ }
+ else {
+ url = new URI(protocol, host, path,
null).toURL();
+ }
+ addURL(url);
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ }
+ }}
Index: fscript/src/org/objectweb/fractal/fscript/FScriptException.java
diff -u fscript/src/org/objectweb/fractal/fscript/FScriptException.java:1.1
fscript/src/org/objectweb/fractal/fscript/FScriptException.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/FScriptException.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/FScriptException.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/FScriptInterpreter.java
diff -u fscript/src/org/objectweb/fractal/fscript/FScriptInterpreter.java:1.1
fscript/src/org/objectweb/fractal/fscript/FScriptInterpreter.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/FScriptInterpreter.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/FScriptInterpreter.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/LoggedProcedure.java
diff -u fscript/src/org/objectweb/fractal/fscript/LoggedProcedure.java:1.1
fscript/src/org/objectweb/fractal/fscript/LoggedProcedure.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/LoggedProcedure.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/LoggedProcedure.java Tue
Jul 18 20:52:17 2006
@@ -1,94 +1,94 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import java.util.List;
-
-import org.objectweb.fractal.fscript.nodes.ComponentNode;
-import org.objectweb.fractal.fscript.nodes.FractalNode;
-import org.objectweb.fractal.fscript.nodes.InterfaceNode;
-
-public class LoggedProcedure implements Procedure {
- private Procedure delegate;
- private List<Object[]> log;
-
- public LoggedProcedure(Procedure delegate, List<Object[]> log) {
- assert(delegate != null);
- this.delegate = delegate;
- this.log = log;
- }
-
- public String getName() {
- return delegate.getName();
- }
-
- public Signature getSignature() {
- return delegate.getSignature();
- }
-
- public boolean hasSideEffects() {
- return delegate.hasSideEffects();
- }
-
- public Object apply(Object[] args, Environment env) throws
FScriptException {
- Object[] o = new Object[args.length + 2];
- o[0] = getName();
- for (int i = 0; i < args.length; i++) {
- o[i+1] = valueFor(args[i]);
- }
- Object result = null;
- try {
- result = delegate.apply(args, env);
- o[o.length - 1] = valueFor(result);
- } finally {
- log.add(o);
- }
- return result;
- }
-
- private Object valueFor(Object arg) {
- if (arg instanceof FractalNode[]) {
- FractalNode[] nodes = (FractalNode[]) arg;
- if (nodes.length > 0 && nodes[0] != null) {
- // HACK Works only because all primitives treat nodesets by
taking only
- // the first element.
- return valueFor(nodes[0]);
- } else {
- return null;
- }
- } else if (arg instanceof FractalNode) {
- return valueFor((FractalNode) arg);
- } else {
- return arg;
- }
- }
-
- private Object valueFor(FractalNode node) {
- if (node instanceof ComponentNode) {
- ComponentNode cn = (ComponentNode) node;
- return cn.getComponent();
- } else if (node instanceof InterfaceNode) {
- InterfaceNode in = (InterfaceNode) node;
- return in.getInterface();
- } else {
- return node;
- }
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import java.util.List;
+
+import org.objectweb.fractal.fscript.nodes.ComponentNode;
+import org.objectweb.fractal.fscript.nodes.FractalNode;
+import org.objectweb.fractal.fscript.nodes.InterfaceNode;
+
+public class LoggedProcedure implements Procedure {
+ private Procedure delegate;
+ private List<Object[]> log;
+
+ public LoggedProcedure(Procedure delegate, List<Object[]> log) {
+ assert(delegate != null);
+ this.delegate = delegate;
+ this.log = log;
+ }
+
+ public String getName() {
+ return delegate.getName();
+ }
+
+ public Signature getSignature() {
+ return delegate.getSignature();
+ }
+
+ public boolean hasSideEffects() {
+ return delegate.hasSideEffects();
+ }
+
+ public Object apply(Object[] args, Environment env) throws
FScriptException {
+ Object[] o = new Object[args.length + 2];
+ o[0] = getName();
+ for (int i = 0; i < args.length; i++) {
+ o[i+1] = valueFor(args[i]);
+ }
+ Object result = null;
+ try {
+ result = delegate.apply(args, env);
+ o[o.length - 1] = valueFor(result);
+ } finally {
+ log.add(o);
+ }
+ return result;
+ }
+
+ private Object valueFor(Object arg) {
+ if (arg instanceof FractalNode[]) {
+ FractalNode[] nodes = (FractalNode[]) arg;
+ if (nodes.length > 0 && nodes[0] != null) {
+ // HACK Works only because all primitives treat nodesets by
taking only
+ // the first element.
+ return valueFor(nodes[0]);
+ } else {
+ return null;
+ }
+ } else if (arg instanceof FractalNode) {
+ return valueFor((FractalNode) arg);
+ } else {
+ return arg;
+ }
+ }
+
+ private Object valueFor(FractalNode node) {
+ if (node instanceof ComponentNode) {
+ ComponentNode cn = (ComponentNode) node;
+ return cn.getComponent();
+ } else if (node instanceof InterfaceNode) {
+ InterfaceNode in = (InterfaceNode) node;
+ return in.getInterface();
+ } else {
+ return node;
+ }
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/Model.java
diff -u fscript/src/org/objectweb/fractal/fscript/Model.java:1.1
fscript/src/org/objectweb/fractal/fscript/Model.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Model.java:1.1 Tue Jul 18
19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Model.java Tue Jul 18
20:52:17 2006
@@ -1,29 +1,29 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import org.objectweb.fractal.adl.Factory;
-import org.objectweb.fractal.fscript.axes.Axis;
-
-public interface Model extends NodeFactory {
- String[] getAxisNames();
- Axis getAxis(String name);
- Factory getComponentFactory();
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import org.objectweb.fractal.adl.Factory;
+import org.objectweb.fractal.fscript.axes.Axis;
+
+public interface Model extends NodeFactory {
+ String[] getAxisNames();
+ Axis getAxis(String name);
+ Factory getComponentFactory();
+}
Index: fscript/src/org/objectweb/fractal/fscript/NodeFactory.java
diff -u fscript/src/org/objectweb/fractal/fscript/NodeFactory.java:1.1
fscript/src/org/objectweb/fractal/fscript/NodeFactory.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/NodeFactory.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/NodeFactory.java Tue Jul 18
20:52:17 2006
@@ -1,33 +1,33 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import java.lang.reflect.Method;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.Interface;
-import org.objectweb.fractal.fscript.nodes.FractalNode;
-
-public interface NodeFactory {
- FractalNode createComponentNode(Component c);
- FractalNode createAttributeNode(Component c, String attributeName);
- FractalNode createInterfaceNode(Interface itf);
- FractalNode createMethodNode(Interface itf, Method meth);
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import java.lang.reflect.Method;
+
+import org.objectweb.fractal.api.Component;
+import org.objectweb.fractal.api.Interface;
+import org.objectweb.fractal.fscript.nodes.FractalNode;
+
+public interface NodeFactory {
+ FractalNode createComponentNode(Component c);
+ FractalNode createAttributeNode(Component c, String attributeName);
+ FractalNode createInterfaceNode(Interface itf);
+ FractalNode createMethodNode(Interface itf, Method meth);
+}
Index: fscript/src/org/objectweb/fractal/fscript/Procedure.java
diff -u fscript/src/org/objectweb/fractal/fscript/Procedure.java:1.1
fscript/src/org/objectweb/fractal/fscript/Procedure.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Procedure.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Procedure.java Tue Jul 18
20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/Signature.java
diff -u fscript/src/org/objectweb/fractal/fscript/Signature.java:1.1
fscript/src/org/objectweb/fractal/fscript/Signature.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Signature.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Signature.java Tue Jul 18
20:52:17 2006
@@ -1,51 +1,51 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-public class Signature {
- private Class[] parameterTypes;
- private Class resultType;
-
- public Signature(Class[] parameterTypes, Class resultType) {
- this.parameterTypes = parameterTypes;
- this.resultType = resultType;
- }
-
- public Class[] getParametersType() {
- return parameterTypes;
- }
-
- public Class getResultType() {
- return resultType;
- }
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < parameterTypes.length; i++) {
- if (i > 0) {
- builder.append(", ");
- }
- builder.append(parameterTypes[i].getSimpleName());
- }
- builder.append(" -> " + resultType.getSimpleName());
- return builder.toString();
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+public class Signature {
+ private Class[] parameterTypes;
+ private Class resultType;
+
+ public Signature(Class[] parameterTypes, Class resultType) {
+ this.parameterTypes = parameterTypes;
+ this.resultType = resultType;
+ }
+
+ public Class[] getParametersType() {
+ return parameterTypes;
+ }
+
+ public Class getResultType() {
+ return resultType;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < parameterTypes.length; i++) {
+ if (i > 0) {
+ builder.append(", ");
+ }
+ builder.append(parameterTypes[i].getSimpleName());
+ }
+ builder.append(" -> " + resultType.getSimpleName());
+ return builder.toString();
+ }
+}
Index:
fscript/src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java
diff -u
fscript/src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java:1.1
fscript/src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/SignatureCheckedProcedure.java
Tue Jul 18 20:52:17 2006
@@ -1,95 +1,95 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript;
-
-import org.objectweb.fractal.fscript.nodes.FractalNode;
-
-public class SignatureCheckedProcedure implements Procedure {
- private Procedure delegate;
- private Signature signature;
-
- public SignatureCheckedProcedure(Procedure delegate) {
- assert (delegate != null);
- this.delegate = delegate;
- this.signature = delegate.getSignature();
- }
-
- public String getName() {
- return delegate.getName();
- }
-
- public boolean hasSideEffects() {
- return delegate.hasSideEffects();
- }
-
- public Signature getSignature() {
- return delegate.getSignature();
- }
-
- public Object apply(Object[] args, Environment env) throws
FScriptException {
- checkArguments(args);
- return delegate.apply(args, env);
- }
-
- private void checkArguments(Object[] args) throws FScriptException {
- if (signature == null) {
- return;
- }
- Class[] params = signature.getParametersType();
- int nargs = (args == null) ? 0 : args.length;
- if (nargs != params.length) {
- throw new FScriptException("Procedure " + delegate + " expected
" + params.length
- + " arguments, but " + nargs + " were passed.");
- }
- for (int i = 0; i < params.length; i++) {
- if (!compatible(params[i], args[i])) {
- Class actualType = (args[i] != null ? args[i].getClass() :
Void.TYPE);
- throw new FScriptException("Argument " + (i + 1) + " for
procedure "
- + delegate + " should be of type " +
params[i].getSimpleName()
- + " but " + actualType.getSimpleName() + " was
passed.");
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private boolean compatible(Class expectedType, Object actualValue) {
- if (actualValue instanceof FractalNode[]) {
- FractalNode[] values = (FractalNode[]) actualValue;
- if (values.length == 0 || values[0] == null) {
- System.out.println("Empty nodeset.");
- return false;
- } else {
- boolean result =
expectedType.isAssignableFrom(values[0].getClass());
- System.out.println(expectedType.getSimpleName() + "
isAssignableFrom "
- + values[0].getClass() + " => " + result);
- return result;
- }
- } else if (actualValue != null) {
- return expectedType.isAssignableFrom(actualValue.getClass());
- } else {
- return false;
- }
- }
-
- @Override
- public String toString() {
- return delegate.toString();
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript;
+
+import org.objectweb.fractal.fscript.nodes.FractalNode;
+
+public class SignatureCheckedProcedure implements Procedure {
+ private Procedure delegate;
+ private Signature signature;
+
+ public SignatureCheckedProcedure(Procedure delegate) {
+ assert (delegate != null);
+ this.delegate = delegate;
+ this.signature = delegate.getSignature();
+ }
+
+ public String getName() {
+ return delegate.getName();
+ }
+
+ public boolean hasSideEffects() {
+ return delegate.hasSideEffects();
+ }
+
+ public Signature getSignature() {
+ return delegate.getSignature();
+ }
+
+ public Object apply(Object[] args, Environment env) throws
FScriptException {
+ checkArguments(args);
+ return delegate.apply(args, env);
+ }
+
+ private void checkArguments(Object[] args) throws FScriptException {
+ if (signature == null) {
+ return;
+ }
+ Class[] params = signature.getParametersType();
+ int nargs = (args == null) ? 0 : args.length;
+ if (nargs != params.length) {
+ throw new FScriptException("Procedure " + delegate + " expected
" + params.length
+ + " arguments, but " + nargs + " were passed.");
+ }
+ for (int i = 0; i < params.length; i++) {
+ if (!compatible(params[i], args[i])) {
+ Class actualType = (args[i] != null ? args[i].getClass() :
Void.TYPE);
+ throw new FScriptException("Argument " + (i + 1) + " for
procedure "
+ + delegate + " should be of type " +
params[i].getSimpleName()
+ + " but " + actualType.getSimpleName() + " was
passed.");
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private boolean compatible(Class expectedType, Object actualValue) {
+ if (actualValue instanceof FractalNode[]) {
+ FractalNode[] values = (FractalNode[]) actualValue;
+ if (values.length == 0 || values[0] == null) {
+ System.out.println("Empty nodeset.");
+ return false;
+ } else {
+ boolean result =
expectedType.isAssignableFrom(values[0].getClass());
+ System.out.println(expectedType.getSimpleName() + "
isAssignableFrom "
+ + values[0].getClass() + " => " + result);
+ return result;
+ }
+ } else if (actualValue != null) {
+ return expectedType.isAssignableFrom(actualValue.getClass());
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return delegate.toString();
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/Util.java
diff -u fscript/src/org/objectweb/fractal/fscript/Util.java:1.1
fscript/src/org/objectweb/fractal/fscript/Util.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Util.java:1.1 Tue Jul 18
19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Util.java Tue Jul 18 20:52:17
2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/Values.java
diff -u fscript/src/org/objectweb/fractal/fscript/Values.java:1.1
fscript/src/org/objectweb/fractal/fscript/Values.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/Values.java:1.1 Tue Jul 18
19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/Values.java Tue Jul 18
20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/AbstractAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/AbstractAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/AbstractAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/AbstractAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/AbstractAction.java
Tue Jul 18 20:52:16 2006
@@ -1,28 +1,28 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript.actions;
-
-import org.objectweb.fractal.fscript.AbstractProcedure;
-
-public abstract class AbstractAction extends AbstractProcedure {
- public boolean hasSideEffects() {
- return true;
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript.actions;
+
+import org.objectweb.fractal.fscript.AbstractProcedure;
+
+public abstract class AbstractAction extends AbstractProcedure {
+ public boolean hasSideEffects() {
+ return true;
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/actions/AddAction.java
diff -u fscript/src/org/objectweb/fractal/fscript/actions/AddAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/AddAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/AddAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/AddAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java
diff -u fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/BindAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/EchoAction.java
diff -u fscript/src/org/objectweb/fractal/fscript/actions/EchoAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/EchoAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/EchoAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/EchoAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/actions/InstanciateAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/InstanciateAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/InstanciateAction.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/actions/InstanciateAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/InstanciateAction.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/RemoveAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/RemoveAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/RemoveAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/RemoveAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/RemoveAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/SetNameAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/SetNameAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/SetNameAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/SetNameAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/SetNameAction.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/SetValueAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/SetValueAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/SetValueAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/SetValueAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/SetValueAction.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/StartAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/StartAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/StartAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/StartAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/StartAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/StopAction.java
diff -u fscript/src/org/objectweb/fractal/fscript/actions/StopAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/StopAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/StopAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/StopAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/actions/UnbindAction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/actions/UnbindAction.java:1.1
fscript/src/org/objectweb/fractal/fscript/actions/UnbindAction.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/actions/UnbindAction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/actions/UnbindAction.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/AbstractAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/AbstractAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/AbstractAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/AbstractAxis.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/AbstractAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,56 +1,56 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript.axes;
-
-import java.lang.reflect.Method;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.Interface;
-import org.objectweb.fractal.fscript.NodeFactory;
-import org.objectweb.fractal.fscript.nodes.FractalNode;
-
-public abstract class AbstractAxis implements Axis {
- private NodeFactory factory;
-
- protected AbstractAxis(NodeFactory factory) {
- this.factory = factory;
- }
-
- protected FractalNode createAttributeNode(Component c, String
attributeName) {
- return factory.createAttributeNode(c, attributeName);
- }
-
- protected FractalNode createComponentNode(Component c) {
- return factory.createComponentNode(c);
- }
-
- protected FractalNode createInterfaceNode(Interface itf) {
- return factory.createInterfaceNode(itf);
- }
-
- protected FractalNode createMethodNode(Interface itf, Method meth) {
- return factory.createMethodNode(itf, meth);
- }
-
- @Override
- public String toString() {
- return "#<axis: " + getName() + ">";
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript.axes;
+
+import java.lang.reflect.Method;
+
+import org.objectweb.fractal.api.Component;
+import org.objectweb.fractal.api.Interface;
+import org.objectweb.fractal.fscript.NodeFactory;
+import org.objectweb.fractal.fscript.nodes.FractalNode;
+
+public abstract class AbstractAxis implements Axis {
+ private NodeFactory factory;
+
+ protected AbstractAxis(NodeFactory factory) {
+ this.factory = factory;
+ }
+
+ protected FractalNode createAttributeNode(Component c, String
attributeName) {
+ return factory.createAttributeNode(c, attributeName);
+ }
+
+ protected FractalNode createComponentNode(Component c) {
+ return factory.createComponentNode(c);
+ }
+
+ protected FractalNode createInterfaceNode(Interface itf) {
+ return factory.createInterfaceNode(itf);
+ }
+
+ protected FractalNode createMethodNode(Interface itf, Method meth) {
+ return factory.createMethodNode(itf, meth);
+ }
+
+ @Override
+ public String toString() {
+ return "#<axis: " + getName() + ">";
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/axes/AttributesAxis.java
diff -u
fscript/src/org/objectweb/fractal/fscript/axes/AttributesAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/AttributesAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/AttributesAxis.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/AttributesAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/Axis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/Axis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/Axis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/Axis.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/Axis.java Tue Jul 18
20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/BindingAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/BindingAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/BindingAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/BindingAxis.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/BindingAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/ChildAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/ComponentAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/ComponentAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/ComponentAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/ComponentAxis.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/ComponentAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java
diff -u
fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/InterfacesAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
diff -u
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java:1.1
Tue Jul 18 19:54:12 2006
+++
fscript/src/org/objectweb/fractal/fscript/axes/InternalInterfacesAxis.java
Tue Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/MethodAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/MethodAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/MethodAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/MethodAxis.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/MethodAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,70 +1,70 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript.axes;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.objectweb.fractal.api.Interface;
-import org.objectweb.fractal.api.type.InterfaceType;
-import org.objectweb.fractal.fscript.NodeFactory;
-import org.objectweb.fractal.fscript.expressions.NodePredicate;
-import org.objectweb.fractal.fscript.nodes.FractalNode;
-import org.objectweb.fractal.fscript.nodes.InterfaceNode;
-
-public class MethodAxis extends AbstractAxis {
- public MethodAxis(NodeFactory factory) {
- super(factory);
- }
-
- public String getName() {
- return "method";
- }
-
- public Collection<FractalNode> selectFrom(FractalNode node,
NodePredicate pred) {
- if (node instanceof InterfaceNode) {
- InterfaceNode itfNode = (InterfaceNode) node;
- List<FractalNode> nodes = new ArrayList<FractalNode>();
- for (Method meth : getAllMethods(itfNode.getInterface())) {
- FractalNode methodNode =
createMethodNode(itfNode.getInterface(), meth);
- if (pred.matches(methodNode)) {
- nodes.add(methodNode);
- }
- }
- return nodes;
- } else {
- return Collections.emptyList();
- }
- }
-
- private Method[] getAllMethods(Interface itf) {
- InterfaceType itfType = (InterfaceType) itf.getFcItfType();
- String signature = itfType.getFcItfSignature();
- try {
- Class klass = Class.forName(signature);
- return klass.getMethods();
- } catch (ClassNotFoundException e) {
- return new Method[0];
- }
- }
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript.axes;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.objectweb.fractal.api.Interface;
+import org.objectweb.fractal.api.type.InterfaceType;
+import org.objectweb.fractal.fscript.NodeFactory;
+import org.objectweb.fractal.fscript.expressions.NodePredicate;
+import org.objectweb.fractal.fscript.nodes.FractalNode;
+import org.objectweb.fractal.fscript.nodes.InterfaceNode;
+
+public class MethodAxis extends AbstractAxis {
+ public MethodAxis(NodeFactory factory) {
+ super(factory);
+ }
+
+ public String getName() {
+ return "method";
+ }
+
+ public Collection<FractalNode> selectFrom(FractalNode node,
NodePredicate pred) {
+ if (node instanceof InterfaceNode) {
+ InterfaceNode itfNode = (InterfaceNode) node;
+ List<FractalNode> nodes = new ArrayList<FractalNode>();
+ for (Method meth : getAllMethods(itfNode.getInterface())) {
+ FractalNode methodNode =
createMethodNode(itfNode.getInterface(), meth);
+ if (pred.matches(methodNode)) {
+ nodes.add(methodNode);
+ }
+ }
+ return nodes;
+ } else {
+ return Collections.emptyList();
+ }
+ }
+
+ private Method[] getAllMethods(Interface itf) {
+ InterfaceType itfType = (InterfaceType) itf.getFcItfType();
+ String signature = itfType.getFcItfSignature();
+ try {
+ Class klass = Class.forName(signature);
+ return klass.getMethods();
+ } catch (ClassNotFoundException e) {
+ return new Method[0];
+ }
+ }
+}
Index: fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/ParentAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java
diff -u fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java:1.1
fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/axes/SiblingAxis.java Tue
Jul 18 20:52:17 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++
fscript/src/org/objectweb/fractal/fscript/expressions/AbstractExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/AndExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/AndExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/AndExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/AndExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/expressions/AndExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/CallExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/CallExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/CallExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/CallExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/expressions/CallExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++
fscript/src/org/objectweb/fractal/fscript/expressions/ConstantExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/expressions/Expression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/Expression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/Expression.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/expressions/Expression.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/expressions/Expression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/FPathExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/FPathExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/FPathExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/FPathExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++
fscript/src/org/objectweb/fractal/fscript/expressions/FPathExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/NodePredicate.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/NodePredicate.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/NodePredicate.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/NodePredicate.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/expressions/NodePredicate.java
Tue Jul 18 20:52:16 2006
@@ -1,26 +1,26 @@
-/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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>
- */
-package org.objectweb.fractal.fscript.expressions;
-
-import org.objectweb.fractal.fscript.nodes.FractalNode;
-
-public interface NodePredicate {
- boolean matches(FractalNode node);
-}
+/*
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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>
+ */
+package org.objectweb.fractal.fscript.expressions;
+
+import org.objectweb.fractal.fscript.nodes.FractalNode;
+
+public interface NodePredicate {
+ boolean matches(FractalNode node);
+}
Index: fscript/src/org/objectweb/fractal/fscript/expressions/OrExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/OrExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/OrExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/OrExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/expressions/OrExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: fscript/src/org/objectweb/fractal/fscript/expressions/Step.java
diff -u fscript/src/org/objectweb/fractal/fscript/expressions/Step.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/Step.java:1.2
--- fscript/src/org/objectweb/fractal/fscript/expressions/Step.java:1.1 Tue
Jul 18 19:54:12 2006
+++ fscript/src/org/objectweb/fractal/fscript/expressions/Step.java Tue
Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/expressions/VariableExpression.java
diff -u
fscript/src/org/objectweb/fractal/fscript/expressions/VariableExpression.java:1.1
fscript/src/org/objectweb/fractal/fscript/expressions/VariableExpression.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/expressions/VariableExpression.java:1.1
Tue Jul 18 19:54:12 2006
+++
fscript/src/org/objectweb/fractal/fscript/expressions/VariableExpression.java
Tue Jul 18 20:52:16 2006
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004-2005 Université de Nantes (LINA)
- * Copyright (c) 2005-2006 France Télécom
+ * Copyright (c) 2004-2005 Universite de Nantes (LINA)
+ * Copyright (c) 2005-2006 France Telecom
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index:
fscript/src/org/objectweb/fractal/fscript/functions/AbstractFunction.java
diff -u
fscript/src/org/objectweb/fractal/fscript/functions/AbstractFunction.java:1.1
fscript/src/org/objectweb/fractal/fscript/functions/AbstractFunction.java:1.2
---
fscript/src/org/objectweb/fractal/fscript/functions/AbstractFunction.java:1.1
Tue Jul 18 19:54:12 2006
+++ fscript/sr