Просмотр исходного кода

Changed generator core dependencies to sgen base types

Andreas Mülder 14 лет назад
Родитель
Сommit
79946e4265

+ 24 - 24
plugins/org.yakindu.sct.generator.core/library/CoreFeatureTypeLibrary.xmi

@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="ASCII"?>
-<sgen:FeatureTypeLibrary xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sgen="http://www.yakindu.org/sct/statechart/SGen" xsi:schemaLocation="http://www.yakindu.org/sct/statechart/SGen ../../org.yakindu.sct.model.sgen/model/emf/sgen.ecore" name="Core">
-  <types name="Outlet">
-    <parameters name="targetProject"/>
-    <parameters name="targetFolder"/>
-  </types>
-  <types name="Debug" optional="true">
-    <parameters name="dumpSexec" parameterType="BOOLEAN"/>
-  </types>
-  <types name="licenseHeader" optional="true">
-    <parameters name="licenseText"/>
-  </types>
-  <types name="FunctionInlining" optional="true">
-    <parameters name="inlineReactions" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineEntryActions" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineExitActions" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineEnterSequences" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineExitSequences" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineChoices" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineEnterRegion" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineExitRegion" optional="true" parameterType="BOOLEAN"/>
-    <parameters name="inlineEntries" optional="true" parameterType="BOOLEAN"/>
-  </types>
-</sgen:FeatureTypeLibrary>
+<?xml version="1.0" encoding="ASCII"?>
+<sgen:FeatureTypeLibrary xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:sgen="http://www.yakindu.org/sct/statechart/SGen" name="Core">
+  <types name="Outlet">
+    <parameters name="targetProject"/>
+    <parameters name="targetFolder"/>
+  </types>
+  <types name="Debug" optional="true">
+    <parameters name="dumpSexec" parameterType="BOOLEAN"/>
+  </types>
+  <types name="LicenseHeader" optional="true">
+    <parameters name="licenseText"/>
+  </types>
+  <types name="FunctionInlining" optional="true">
+    <parameters name="inlineReactions" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineEntryActions" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineExitActions" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineEnterSequences" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineExitSequences" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineChoices" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineEnterRegion" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineExitRegion" optional="true" parameterType="BOOLEAN"/>
+    <parameters name="inlineEntries" optional="true" parameterType="BOOLEAN"/>
+  </types>
+</sgen:FeatureTypeLibrary>

+ 4 - 3
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/features/impl/CoreLibraryDefaultFeatureValueProvider.java

@@ -19,6 +19,7 @@ import static org.yakindu.sct.generator.core.features.ICoreFeatureConstants.LICE
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.yakindu.sct.generator.core.features.AbstractDefaultFeatureValueProvider;
+import org.yakindu.sct.model.sgen.BoolLiteral;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;
 import org.yakindu.sct.model.sgen.FeatureTypeLibrary;
 import org.yakindu.sct.model.sgraph.Statechart;
@@ -54,7 +55,7 @@ public class CoreLibraryDefaultFeatureValueProvider extends
 		if (OUTLET_FEATURE_TARGET_PROJECT.equals(parameterName)
 				&& !projectExists(parameterValue.getStringValue()))
 			return warning(String.format("The Project %s does not exist",
-					parameterValue.getValue()));
+					parameterValue.getExpression()));
 		if (OUTLET_FEATURE_TARGET_FOLDER.equals(parameterName)) {
 			FeatureParameterValue targetProjectParam = parameterValue
 					.getFeatureConfiguration().getParameterValue(
@@ -66,11 +67,11 @@ public class CoreLibraryDefaultFeatureValueProvider extends
 							parameterValue.getStringValue())) {
 				return warning(String.format(
 						"The Folder %s does not exist in Project %s",
-						parameterValue.getValue(), targetProjectName));
+						parameterValue.getExpression(), targetProjectName));
 			}
 		}
 		if (DEBUG_FEATURE_DUMP_SEXEC.equals(parameterName)
-				&& !(parameterValue.getValue() instanceof Boolean)) {
+				&& !(parameterValue.getExpression() instanceof BoolLiteral)) {
 			return error("Illegal Value. Must be 'true' or 'false'");
 		}
 		return Status.OK_STATUS;

+ 1 - 1
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/AbstractXpandBasedCodeGenerator.java

@@ -123,7 +123,7 @@ public abstract class AbstractXpandBasedCodeGenerator extends
 				.getParameterValue(OUTLET_FEATURE_TARGET_FOLDER);
 
 		String absoluteTargetFolder = getTargetProject(entry).getLocation()
-				.toOSString() + File.separator + targetFolder.getValue();
+				.toOSString() + File.separator + targetFolder.getExpression().toString();
 		Output output = new OutputImpl();
 		Outlet outlet = new Outlet(absoluteTargetFolder);
 		for (PostProcessor postProcessor : getPostProcessors()) {