preliminary work for #325 (#1636)

* #325 - preliminary work: Separate Expressions Interpreter * #325 - preliminary work: Separate Expressions Interpreter * #325 - preliminary work: Separate Expressions Interpreter * #325 - preliminary work: Separate Expressions Interpreter * #325 - preliminary work: Separate Expressions Interpreter * #325 - preliminary work: Separate SRuntime Model into own plugin * #325 - preliminary work:remove dependency from sruntime to sgraph this allows using expression interpreter without dependencies to SGraph and the like * #325 - adopted to expression language * #325 - Proposal Provider bugfix * Moved TypeSpecifier to Expressions.xtext * Added Property Definitions to SGen Model * Added validation and scoping * Add xtext nature, fix genmodel, regenerate
itemisCREATE · Sep 11, 2017 · f82ce9c · f82ce9c
1 parent 1cfef6f
commit f82ce9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/org/yakindu/sct/generator/core/filesystem/DefaultFileSystemAccessFactory.java b/src/org/yakindu/sct/generator/core/filesystem/DefaultFileSystemAccessFactory.java
@@ -52,7 +52,7 @@ protected void initTargetProject(ISCTFileSystemAccess access, GeneratorEntry ent
 
 	protected void initDefaultOutput(ISCTFileSystemAccess access, GeneratorEntry entry) {
 		access.setOutputPath(IFileSystemAccess.DEFAULT_OUTPUT,
-				helper.getTargetFolderValue(entry).getExpression().toString());
+				helper.getTargetFolderValue(entry).getStringValue());
 		access.getOutputConfigurations().get(IFileSystemAccess.DEFAULT_OUTPUT).setCreateOutputDirectory(true);
 	}
 

diff --git a/src/org/yakindu/sct/generator/core/library/impl/CoreLibraryDefaultFeatureValueProvider.java b/src/org/yakindu/sct/generator/core/library/impl/CoreLibraryDefaultFeatureValueProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
 import org.yakindu.sct.generator.core.library.AbstractDefaultFeatureValueProvider;
-import org.yakindu.sct.model.sgen.BoolLiteral;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;
 import org.yakindu.sct.model.sgen.FeatureType;
 import org.yakindu.sct.model.sgen.FeatureTypeLibrary;
@@ -58,7 +57,7 @@ protected void setDefaultValue(FeatureType featureType, FeatureParameterValue pa
 	public IStatus validateParameterValue(FeatureParameterValue parameterValue) {
 		String parameterName = parameterValue.getParameter().getName();
 		if (OUTLET_FEATURE_TARGET_PROJECT.equals(parameterName) && !access.projectExists(parameterValue.getStringValue()))
-			return error(String.format("The Project %s does not exist.", parameterValue.getExpression()));
+			return error(String.format("The Project %s does not exist.", parameterValue.getStringValue()));
 		if (OUTLET_FEATURE_TARGET_PROJECT.equals(parameterName) && access.projectExists(parameterValue.getStringValue())
 				&& !access.projectOpened(parameterValue.getStringValue()))
 			return error(String.format("The Project %s is not open.", parameterValue.getExpression()));
@@ -70,13 +69,9 @@ public IStatus validateParameterValue(FeatureParameterValue parameterValue) {
 			String targetProjectName = targetProjectParam != null ? targetProjectParam.getStringValue() : null;
 			if (targetProjectName != null && !access.folderExists(targetProjectName, parameterValue.getStringValue())) {
 				return warning(String.format("The Folder %s does not exist in Project %s",
-						parameterValue.getExpression(), targetProjectName));
+						parameterValue.getStringValue(), targetProjectName));
 			}
 		}
-		if (DEBUG_FEATURE_DUMP_SEXEC.equals(parameterName)
-				&& !(parameterValue.getExpression() instanceof BoolLiteral)) {
-			return error("Illegal Value. Must be 'true' or 'false'");
-		}
 		return Status.OK_STATUS;
 	}
 }
diff --git a/src/org/yakindu/sct/generator/core/library/impl/DefaultCoreLibraryHelper.java b/src/org/yakindu/sct/generator/core/library/impl/DefaultCoreLibraryHelper.java
@@ -50,8 +50,8 @@ public FeatureParameterValue getTargetProjectValue(GeneratorEntry entry) {
 
 	@Override
 	public String getRelativeTargetFolder(GeneratorEntry entry) {
-		String projectFolderName = getTargetProjectValue(entry).getExpression().toString();
-		String targetFolderValue = getTargetFolderValue(entry).getExpression().toString();
+		String projectFolderName = getTargetProjectValue(entry).getStringValue();
+		String targetFolderValue = getTargetFolderValue(entry).getStringValue();
 		return projectFolderName + Path.SEPARATOR + targetFolderValue;
 	}