Browse Source

Removed bug in outlet path calculation (#152)

jos.itemis@gmail.com 14 years ago
parent
commit
a05dd21ced

+ 1 - 5
plugins/org.yakindu.sct.generator.base/src/org/yakindu/sct/generator/base/util/AbstractXpandCodeGeneratorSubscriber.java

@@ -33,11 +33,7 @@ public abstract class AbstractXpandCodeGeneratorSubscriber implements
 
 			ExecutionFlow executionFlow = GeneratorBaseUtil
 					.createExecutionFlowModel(statechart);
-			String absoluteTargetFolder = ResourcesPlugin.getWorkspace()
-					.getRoot().getLocation().toOSString()
-					+ File.separator
-					+ project.getFullPath().toOSString()
-					+ File.separator + getOutletPath(resource);
+			String absoluteTargetFolder = project.getRawLocation().toOSString() + File.separator + getOutletPath(resource);
 			GeneratorBaseUtil.generate(executionFlow, getTemplatePath(),
 					project, absoluteTargetFolder);
 		} catch (CoreException e) {

+ 1 - 7
plugins/org.yakindu.sct.generator.base/src/org/yakindu/sct/generator/base/util/GeneratorBaseUtil.java

@@ -95,14 +95,8 @@ public class GeneratorBaseUtil {
 	public static void generate(ExecutionFlow flow, String templatePath,
 			IProject project, String targetFolder) throws CoreException {
 
-		String absoluteTargetFolder = ResourcesPlugin.getWorkspace().getRoot()
-				.getLocation().toOSString()
-				+ File.separator
-				+ project.getFullPath().toOSString()
-				+ File.separator + targetFolder;
-
 		OutputImpl output = new OutputImpl();
-		Outlet outlet = new Outlet(absoluteTargetFolder);
+		Outlet outlet = new Outlet(targetFolder);
 		outlet.setOverwrite(true);
 		output.addOutlet(outlet);
 

+ 1 - 0
plugins/org.yakindu.sct.statechart.builder/src/org/yakindu/sct/builder/SCTBuilder.java

@@ -71,6 +71,7 @@ public class SCTBuilder extends IncrementalProjectBuilder {
 	public void doIt(IResource resource) {
 		List<IBuilderSubscriber> subscriber = SubscriberExtensions
 				.getSubscriber(resource.getLocation().toOSString());
+//		System.out.println("try to build: " + resource.getLocationURI());
 		for (IBuilderSubscriber builderSubscriber : subscriber) {
 			try {
 				builderSubscriber.doBuild(resource);