Fixing launchers in projects other than core

d3scomp · Jul 25, 2014 · 70b19e5 · 70b19e5
1 parent d7dc35e
commit 70b19e5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloud.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloud.java
@@ -20,10 +20,10 @@
 public class LocalLauncherCloud {
 
 	public static void main(String[] args) throws AnnotationProcessorException {
-		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
 		RuntimeMetadata model = RuntimeMetadataFactoryExt.eINSTANCE.createRuntimeMetadata();
+		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE, model);
 
-		processor.process(model, 
+		processor.process( 
 							new NodeB(), new NodeA("NodeA", .5f, 1), // Components 
 							MigrationEnsemble.class // Ensembles
 							);

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherDynamicCloud.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherDynamicCloud.java
@@ -34,10 +34,10 @@
  */
 public class LocalLauncherDynamicCloud {
         public static void main(String[] args) throws AnnotationProcessorException {
-        	AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
         	RuntimeMetadata model = RuntimeMetadataFactoryExt.eINSTANCE.createRuntimeMetadata();
-
-        	processor.process(model, 
+        	AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE, model);
+
+        	processor.process( 
         						new NodeB(), new NodeA(), // Components 
         						MigrationEnsemble.class // Ensembles
         						);

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloud.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloud.java
@@ -20,10 +20,10 @@
 public class TSLauncherCloud {
 
 	public static void main(String[] args) throws AnnotationProcessorException {
-		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
 		RuntimeMetadata model = RuntimeMetadataFactoryExt.eINSTANCE.createRuntimeMetadata();
+		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE, model);
 
-		processor.process(model, 
+		processor.process( 
 							new NodeA(), new NodeB(), // Components 
 							MigrationEnsemble.class // Ensembles
 							);

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFHexacopterLauncher.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFHexacopterLauncher.java
@@ -21,10 +21,10 @@ public class FFHexacopterLauncher {
 
 	public static void main(String[] args) throws AnnotationProcessorException {
 
-		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
 		RuntimeMetadata model = RuntimeMetadataFactoryExt.eINSTANCE.createRuntimeMetadata();
+		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE, model);
 
-		processor.process(model, 
+		processor.process( 
 						new GroupMember("FF1", "T1"), new GroupMember("FF2", "T1"),
 						new GroupMember("FF3", "T1"), new GroupMember("FF4", "T2"),
 						new GroupMember("FF5", "T2"), new GroupMember("FF6", "T2"),

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java
@@ -21,10 +21,10 @@ public class FFLauncher {
 
 	public static void main(String[] args) throws AnnotationProcessorException {
 
-		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
 		RuntimeMetadata model = RuntimeMetadataFactoryExt.eINSTANCE.createRuntimeMetadata();
+		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE, model);
 
-		processor.process(model, 
+		processor.process( 
 						new GroupMember("FF1", "T1"), new GroupMember("FF2", "T1"),
 						new GroupMember("FF3", "T1"), new GroupMember("FF4", "T2"),
 						new GroupMember("FF5", "T2"), new GroupMember("FF6", "T2"),

diff --git a/jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java b/jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
@@ -70,7 +70,6 @@ public static void main(String[] args) throws AnnotationProcessorException, IOEx
 		Simulation sim = new Simulation();
 		sim.initialize(); //loads Library
 
-		AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
 		SimulationRuntimeBuilder builder = new SimulationRuntimeBuilder();
 
 		SiteConfigParser siteParser = new SiteConfigParser(siteCfg);
@@ -111,7 +110,8 @@ public boolean gossipTo(String recipient) {
 		while ((component = parser.parseComponent()) != null) {
 			components.add(component);
 			RuntimeMetadata model = RuntimeMetadataFactoryExt.eINSTANCE.createRuntimeMetadata();
-			processor.process(model, component, MemberDataAggregation.class); 
+			AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE, model);
+			processor.process(component, MemberDataAggregation.class); 
 
 			omnetConfig.append(String.format(
 					"**.node[%s].mobility.initialX = %dm\n", 

diff --git a/jdeeco-simulation-demo/test/cz/cuni/mff/d3s/deeco/network/TestKnowledgeDataSize.java b/jdeeco-simulation-demo/test/cz/cuni/mff/d3s/deeco/network/TestKnowledgeDataSize.java
@@ -41,10 +41,10 @@ public void setUp() throws Exception {
 
 
 
-		processor = new AnnotationProcessor(factory);
 		model = factory.createRuntimeMetadata();
+		processor = new AnnotationProcessor(factory, model);
 
-		processor.process(model, new Member("M1", "T1", new Position(1, 2), false));
+		processor.process(new Member("M1", "T1", new Position(1, 2), false));
 		component = model.getComponentInstances().get(0); 
 
 		KnowledgePath empty = factory.createKnowledgePath();