Inconsitency in inout and out parameters

d3scomp · Feb 11, 2013 · 06e2b10 · 06e2b10
1 parent 904652e
commit 06e2b10
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 92 deletions.
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/invokable/SchedulableProcess.java
@@ -153,12 +153,12 @@ protected ParametersPair[] getParameterMethodValues(List<Parameter> in,
 	 */
 	protected void putParameterMethodValues(ParametersPair[] parameterValues,
 			List<Parameter> inOut, List<Parameter> out) {
-		putParameterMethodValues(parameterValues, out, inOut, null, null, null);
+		putParameterMethodValues(parameterValues, inOut, out, null, null, null);
 	}
 
 	protected void putParameterMethodValues(ParametersPair[] parameterValues,
 			List<Parameter> inOut, List<Parameter> out, ISession session) {
-		putParameterMethodValues(parameterValues, out, inOut, session, null,
+		putParameterMethodValues(parameterValues, inOut, out, session, null,
 				null);
 	}
 

diff --git a/jdeeco-sde/plugin.xml b/jdeeco-sde/plugin.xml
@@ -2,90 +2,79 @@
 <?eclipse version="3.4"?>
 <plugin>				
 	<extension 
-		point="eu.sensoria_ist.casetool.core.tool">
-		<tool 
-			id="cz.cuni.mff.d3s.deeco.sde.manager.IJDEECoSDETool" 
-			name="JDEECo runtime manager tool" 
-			description="The tool controls the JDEECo runtime" 
-			class="cz.cuni.mff.d3s.deeco.sde.manager.JDEECoSDETool">
-			<category 
-				name="JDEECo">
-			</category>
-			<function 
-				name="start" 
-				returns="java.lang.String" 
-				returnsDescription="Returns confirmation message" 
-				description="Starts JDEECo runtime">
-			</function>
-			<function 
-				name="stop" 
-				returns="java.lang.String" 
-				returnsDescription="Returns confirmation message" 
-				description="Stops JDEECo runtime">
-			</function>
-			<function 
-				name="getComponentInfo" 
-				returns="java.lang.String" 
-				returnsDescription="String containing the component information" 
-				description="Prints all information regarding the specified component">
-				<parameter 
-					name="componentId" 
-					description="Component ID" 
-					type="java.lang.String">
-				</parameter>
-			</function>
-			<function 
-				name="listAllComponents" 
-				returns="java.lang.String" 
-				returnsDescription="String containing information about all components in the system" 
-				description="Prints all information about components in the system">
-			</function>
-			<function 
-				name="listAllEnsembles" 
-				returns="java.lang.String" 
-				returnsDescription="String containing information about all ensembles in the system" 
-				description="Prints all information about all ensembles in the system">
-			</function>
-			<function 
-				name="listAllKnowledge" 
-				returns="java.lang.String" 
-				returnsDescription="Returns list of all registered DEECo component knowledges" 
-				description="Lists all DEECo component knowledges currently available in the runtime">
-			</function>
-			<function 
-				name="getRuntimeInfo" 
-				returns="java.lang.String" 
-				returnsDescription="Returns Runtime information" 
-				description="Prints information about JDEECo runtime environment">
-			</function>
-			<function 
-				name="packageToOSGiBundle" 
-				returns="java.lang.String" 
-				returnsDescription="Returns textual feedback on execution result" 
-				description="Creates JDEECo and OSGi compliant bundle with use of wizard">
-			</function>
-			<function 
-				name="addDefinitions" 
-				returns="java.lang.String" 
-				returnsDescription="Returns textual feedback on execution result" 
-				description="Adds component and ensemble definitions">
-				<parameter 
-					name="path" 
-					description="Path to a JAR file or root directory with properly packeged class files" 
-					type="java.lang.String">
-				</parameter>
-			</function>
-			<function 
-				name="validateInJPF" 
-				returns="java.lang.String" 
-				returnsDescription="String containing information about the velidation result" 
-				description="Validates specified components and ensembles under the JPF">
-				<parameter 
-					name="jars" 
-					description="List of jar files containing component and ensemble definitions" 
-					type="java.util.List">
-				</parameter>
-			</function>
-		</tool>
-	</extension>
+	point="eu.sensoria_ist.casetool.core.tool">
+	<tool 
+		id="cz.cuni.mff.d3s.deeco.sde.manager.IJDEECoSDETool" 
+		name="JDEECo runtime manager tool" 
+		description="The tool controls the JDEECo runtime" 
+		class="cz.cuni.mff.d3s.deeco.sde.manager.JDEECoSDETool">
+		<category 
+			name="JDEECo">
+		</category>
+		<function 
+			name="start" 
+			returns="java.lang.String" 
+			returnsDescription="Returns confirmation message" 
+			description="Starts JDEECo runtime">
+		</function>
+		<function 
+			name="stop" 
+			returns="java.lang.String" 
+			returnsDescription="Returns confirmation message" 
+			description="Stops JDEECo runtime">
+		</function>
+		<function 
+			name="getComponentInfo" 
+			returns="java.lang.String" 
+			returnsDescription="String containing the component information" 
+			description="Prints all information regarding the specified component">
+			<parameter 
+				name="componentId" 
+				description="Component ID" 
+				type="java.lang.String">
+			</parameter>
+		</function>
+		<function 
+			name="listAllComponents" 
+			returns="java.lang.String" 
+			returnsDescription="String containing information about all components in the system" 
+			description="Prints all information about components in the system">
+		</function>
+		<function 
+			name="listAllEnsembles" 
+			returns="java.lang.String" 
+			returnsDescription="String containing information about all ensembles in the system" 
+			description="Prints all information about all ensembles in the system">
+		</function>
+		<function 
+			name="listAllKnowledge" 
+			returns="java.lang.String" 
+			returnsDescription="Returns list of all registered DEECo component knowledges" 
+			description="Lists all DEECo component knowledges currently available in the runtime">
+		</function>
+		<function 
+			name="getRuntimeInfo" 
+			returns="java.lang.String" 
+			returnsDescription="Returns Runtime information" 
+			description="Prints information about JDEECo runtime environment">
+		</function>
+		<function 
+			name="packageToOSGiBundle" 
+			returns="java.lang.String" 
+			returnsDescription="Returns textual feedback on execution result" 
+			description="Creates JDEECo and OSGi compliant bundle with use of wizard">
+		</function>
+		<function 
+			name="addDefinitions" 
+			returns="java.lang.String" 
+			returnsDescription="Returns textual feedback on execution result" 
+			description="Adds component and ensemble definitions">
+			<parameter 
+				name="path" 
+				description="Path to a JAR file or root directory with properly packeged class files" 
+				type="java.lang.String">
+			</parameter>
+		</function>
+	</tool>
+</extension>
 </plugin>
diff --git a/jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/manager/IJDEECoSDETool.java b/jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/manager/IJDEECoSDETool.java
@@ -56,9 +56,9 @@ public String getComponentInfo(
 	public String addDefinitions(
 			@SensoriaToolFunctionParameter(description = "Path to a JAR file or root directory with properly packeged class files") String path);
 
-	@SensoriaToolFunction(description = "Validates specified components and ensembles under the JPF")
-	@SensoriaToolFunctionReturns(description = "String containing information about the velidation result")
-	public String validateInJPF(
-			@SensoriaToolFunctionParameter(description = "List of jar files containing component and ensemble definitions") List<File> jars);
+//	@SensoriaToolFunction(description = "Validates specified components and ensembles under the JPF")
+//	@SensoriaToolFunctionReturns(description = "String containing information about the velidation result")
+//	public String validateInJPF(
+//			@SensoriaToolFunctionParameter(description = "List of jar files containing component and ensemble definitions") List<File> jars);
 
 }