Browse Source

Changed SchedulingRule for generator to workspace.ruelFactory.buildRule

benjamin.schwertfeger@gmail.com 13 years ago
parent
commit
46fa888e60

+ 3 - 2
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/GeneratorExecutor.java

@@ -55,7 +55,8 @@ public class GeneratorExecutor {
 				return Status.OK_STATUS;
 			}
 		};
-		generatorJob.setRule(file);
+		generatorJob.setRule(file.getProject().getWorkspace().getRuleFactory()
+				.buildRule());
 		generatorJob.schedule();
 	}
 
@@ -66,7 +67,7 @@ public class GeneratorExecutor {
 		// if (provider != null) {
 		// resource = provider.get(file.getProject()).getResource(uri, true);
 		// } else {
-			resource = new ResourceSetImpl().getResource(uri, true);
+		resource = new ResourceSetImpl().getResource(uri, true);
 		// }
 		return resource;
 	}

+ 2 - 1
test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/test/CTestAdapterTest.java

@@ -69,7 +69,8 @@ public class CTestAdapterTest {
 
 		IFile file = project.getFile("GenModelC.sgen");
 		generatorExecutor.executeGenerator(file);
-		waitForJobFinished(file);
+		waitForJobFinished(file.getProject().getWorkspace().getRuleFactory()
+				.buildRule());
 
 		// TODO parameterize cmake skript and call appropriate with conversion
 		// for to junit.xml