diff --git a/src/org/yakindu/sct/generator/core/filesystem/DefaultFileSystemAccessFactory.java b/src/org/yakindu/sct/generator/core/filesystem/DefaultFileSystemAccessFactory.java index 424b3c6429..7b84a53518 100644 --- 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 index cdcc629339..b89ed73582 100644 --- 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 index d7bd511d9c..17d2429204 100644 --- 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; }