Moving some helpers to their client classes + PreLauncher -> Preproce…

…ssorLauncher
d3scomp · Mar 5, 2013 · 5c4a877 · 5c4a877
1 parent c5d2a98
commit 5c4a877
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/...d3s/deeco/invokable/AnnotationHelper.java → ...d3s/deeco/processor/AnnotationHelper.java b/...d3s/deeco/invokable/AnnotationHelper.java → ...d3s/deeco/processor/AnnotationHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package cz.cuni.mff.d3s.deeco.invokable;
+package cz.cuni.mff.d3s.deeco.processor;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ComponentParser.java
@@ -15,15 +15,13 @@
 import cz.cuni.mff.d3s.deeco.annotations.DEECoStrongLocking;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoWeakLocking;
 import cz.cuni.mff.d3s.deeco.annotations.ELockingMode;
-import cz.cuni.mff.d3s.deeco.invokable.AnnotationHelper;
 import cz.cuni.mff.d3s.deeco.invokable.SchedulableComponentProcess;
 import cz.cuni.mff.d3s.deeco.invokable.creators.ParametrizedMethodCreator;
 import cz.cuni.mff.d3s.deeco.invokable.creators.SchedulableComponentProcessCreator;
 import cz.cuni.mff.d3s.deeco.knowledge.ComponentKnowledge;
 import cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManager;
 import cz.cuni.mff.d3s.deeco.scheduling.ProcessPeriodicSchedule;
 import cz.cuni.mff.d3s.deeco.scheduling.ProcessSchedule;
-import cz.cuni.mff.d3s.deeco.scheduling.ScheduleHelper;
 
 public class ComponentParser {
 

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/EnsembleParser.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/EnsembleParser.java
@@ -7,7 +7,6 @@
 import cz.cuni.mff.d3s.deeco.annotations.DEECoEnsembleMembership;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoPeriodicScheduling;
 import cz.cuni.mff.d3s.deeco.ensemble.Ensemble;
-import cz.cuni.mff.d3s.deeco.invokable.AnnotationHelper;
 import cz.cuni.mff.d3s.deeco.invokable.SchedulableEnsembleProcess;
 import cz.cuni.mff.d3s.deeco.invokable.creators.BooleanMembershipCreator;
 import cz.cuni.mff.d3s.deeco.invokable.creators.FuzzyMembershipCreator;
@@ -17,7 +16,6 @@
 import cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManager;
 import cz.cuni.mff.d3s.deeco.scheduling.ProcessPeriodicSchedule;
 import cz.cuni.mff.d3s.deeco.scheduling.ProcessSchedule;
-import cz.cuni.mff.d3s.deeco.scheduling.ScheduleHelper;
 
 public class EnsembleParser {
 

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ParserHelper.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ParserHelper.java
@@ -7,7 +7,6 @@
 import java.util.List;
 
 import cz.cuni.mff.d3s.deeco.exceptions.ComponentEnsembleParseException;
-import cz.cuni.mff.d3s.deeco.invokable.AnnotationHelper;
 import cz.cuni.mff.d3s.deeco.invokable.Parameter;
 import cz.cuni.mff.d3s.deeco.knowledge.KPBuilder;
 import cz.cuni.mff.d3s.deeco.path.grammar.KnowledgePath;

diff --git a/.../d3s/deeco/scheduling/ScheduleHelper.java → ...f/d3s/deeco/processor/ScheduleHelper.java b/.../d3s/deeco/scheduling/ScheduleHelper.java → ...f/d3s/deeco/processor/ScheduleHelper.java
@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package cz.cuni.mff.d3s.deeco.scheduling;
+package cz.cuni.mff.d3s.deeco.processor;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
 
 import cz.cuni.mff.d3s.deeco.annotations.DEECoPeriodicScheduling;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoTrigger;
-import cz.cuni.mff.d3s.deeco.invokable.AnnotationHelper;
 import cz.cuni.mff.d3s.deeco.invokable.Parameter;
+import cz.cuni.mff.d3s.deeco.scheduling.ProcessPeriodicSchedule;
+import cz.cuni.mff.d3s.deeco.scheduling.ProcessSchedule;
+import cz.cuni.mff.d3s.deeco.scheduling.ProcessTriggeredSchedule;
 
 /**
  * Helper class for used for scheduling information retrieval.

diff --git a/...ni/mff/d3s/deeco/runtime/PreLauncher.java → ...s/deeco/runtime/PreprocessorLauncher.java b/...ni/mff/d3s/deeco/runtime/PreLauncher.java → ...s/deeco/runtime/PreprocessorLauncher.java
@@ -13,7 +13,7 @@
  * @author Michal Kit
  * 
  */
-public class PreLauncher {
+public class PreprocessorLauncher {
 
 	/**
 	 * Parses and serializes components and ensembles into a file.

diff --git a/jdeeco-demo/build.xml b/jdeeco-demo/build.xml
@@ -113,7 +113,7 @@
 
 	<!-- run cloud demo under jpf -->
 	<target name="jpf-cloud">
-		<java fork="true" classname="cz.cuni.mff.d3s.deeco.runtime.PreLauncher" dir="${dist}">
+		<java fork="true" classname="cz.cuni.mff.d3s.deeco.runtime.PreprocessorLauncher" dir="${dist}">
 			<arg value="cloud.jar"/>
 			<classpath>
 				<pathelement location="${dist}/jdeeco.jar"/>
@@ -134,7 +134,7 @@
 
 	<!-- run convoy demo under jpf -->
 	<target name="jpf-convoy">
-		<java fork="true" classname="cz.cuni.mff.d3s.deeco.runtime.PreLauncher" dir="${dist}">
+		<java fork="true" classname="cz.cuni.mff.d3s.deeco.runtime.PreprocessorLauncher" dir="${dist}">
 			<arg value="convoy.jar"/>
 			<classpath>
 				<pathelement location="${dist}/jdeeco.jar"/>

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
@@ -5,7 +5,7 @@
 import cz.cuni.mff.d3s.deeco.knowledge.local.LocalKnowledgeRepository;
 import cz.cuni.mff.d3s.deeco.provider.AbstractDEECoObjectProvider;
 import cz.cuni.mff.d3s.deeco.provider.PreLauncherDEECoObjectProvider;
-import cz.cuni.mff.d3s.deeco.runtime.PreLauncher;
+import cz.cuni.mff.d3s.deeco.runtime.PreprocessorLauncher;
 import cz.cuni.mff.d3s.deeco.runtime.Runtime;
 import cz.cuni.mff.d3s.deeco.scheduling.MultithreadedSchedulerJPF;
 import cz.cuni.mff.d3s.deeco.scheduling.Scheduler;
@@ -22,7 +22,7 @@ public class LocalLauncherConvoyJPF {
 	 * @param args
 	 */
 	public static void main(String[] args) {
-		//PreLauncher.main(args);
+		//PreprocessorLauncher.main(args);
 		KnowledgeManager km = new RepositoryKnowledgeManager(
 				new LocalKnowledgeRepository());
 		Scheduler scheduler = new MultithreadedSchedulerJPF();