#899 removed BaseFeatureHelper, added as operation to GeneratorEntry

itemisCREATE · Aug 12, 2016 · 225becf · 225becf
1 parent 31c5f76
commit 225becf
Show file tree

Hide file tree

Showing 35 changed files with 76 additions and 75 deletions.
diff --git a/....sct.generator.core/src/org/yakindu/sct/generator/core/library/BaseSGenFeatureHelper.java b/....sct.generator.core/src/org/yakindu/sct/generator/core/library/BaseSGenFeatureHelper.java
diff --git a/...sct.generator.core/src/org/yakindu/sct/generator/core/library/DebugFeatureHelperImpl.java b/...sct.generator.core/src/org/yakindu/sct/generator/core/library/DebugFeatureHelperImpl.java
@@ -21,11 +21,11 @@
  * @author Johannes Dicks - Initial contribution and API
  *
  */
-public class DebugFeatureHelperImpl extends BaseSGenFeatureHelper implements IDebugFeatureHelper {
+public class DebugFeatureHelperImpl implements IDebugFeatureHelper {
 
 	@Override
 	public boolean isDumpSexec(GeneratorEntry entry) {
-		FeatureParameterValue dumpSexec = getFeatureParameter(entry, DEBUG_FEATURE, DEBUG_FEATURE_DUMP_SEXEC);
+		FeatureParameterValue dumpSexec = entry.getFeatureParameterValue(DEBUG_FEATURE, DEBUG_FEATURE_DUMP_SEXEC);
 		if (dumpSexec == null) {
 			return false;
 		}

diff --git a/...ct.generator.core/src/org/yakindu/sct/generator/core/library/OutletFeatureHelperImpl.java b/...ct.generator.core/src/org/yakindu/sct/generator/core/library/OutletFeatureHelperImpl.java
@@ -20,26 +20,27 @@
 /**
  * @author Johannes Dicks - Initial contribution and API
  */
-public class OutletFeatureHelperImpl extends BaseSGenFeatureHelper implements IOutletFeatureHelper {
+public class OutletFeatureHelperImpl implements IOutletFeatureHelper {
 
 	@Override
 	public FeatureParameterValue getTargetFolderValue(GeneratorEntry entry) {
-		return getFeatureParameter(entry, OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_TARGET_FOLDER);
+		return entry.getFeatureParameterValue(OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_TARGET_FOLDER);
 	}
 
 	@Override
 	public FeatureParameterValue getLibraryTargetFolderValue(GeneratorEntry entry) {
-		return getFeatureParameter(entry, OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_LIBRARY_TARGET_FOLDER);
+		return entry.getFeatureParameterValue(OUTLET_FEATURE,
+				ICoreFeatureConstants.OUTLET_FEATURE_LIBRARY_TARGET_FOLDER);
 	}
-	
+
 	@Override
 	public FeatureParameterValue getApiTargetFolderValue(GeneratorEntry entry) {
-		return getFeatureParameter(entry, OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_API_TARGET_FOLDER);
+		return entry.getFeatureParameterValue(OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_API_TARGET_FOLDER);
 	}
 
 	@Override
 	public FeatureParameterValue getTargetProjectValue(GeneratorEntry entry) {
-		return getFeatureParameter(entry, OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_TARGET_PROJECT);
+		return entry.getFeatureParameterValue(OUTLET_FEATURE, ICoreFeatureConstants.OUTLET_FEATURE_TARGET_PROJECT);
 	}
 
 	@Override
@@ -55,7 +56,7 @@ public String getRelativeLibraryFolder(GeneratorEntry entry) {
 		String libraryFolderName = getLibraryTargetFolderValue(entry).getStringValue();
 		return projectFolderName + Path.SEPARATOR + libraryFolderName;
 	}
-	
+
 	@Override
 	public String getRelativeApiFolder(GeneratorEntry entry) {
 		String projectFolderName = getTargetProjectValue(entry).getStringValue();

diff --git a/plugins/org.yakindu.sct.model.sgen/META-INF/MANIFEST.MF b/plugins/org.yakindu.sct.model.sgen/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Export-Package: org.yakindu.sct.model.sgen,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.yakindu.sct.model.sgraph;visibility:=reexport,
- org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.yakindu.base.types;visibility:=reexport,
  com.google.inject;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.yakindu.sct.model.sgen/model/emf/sgen.ecore b/plugins/org.yakindu.sct.model.sgen/model/emf/sgen.ecore
@@ -38,6 +38,10 @@
     <eOperations name="getFeatureConfiguration" eType="#//FeatureConfiguration">
       <eParameters name="featureName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
+    <eOperations name="getFeatureParameterValue" eType="#//FeatureParameterValue">
+      <eParameters name="featureName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters name="paramName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="elementRef" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="features" upperBound="-1"
         eType="#//FeatureConfiguration" containment="true"/>

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/BoolLiteral.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/BoolLiteral.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.BoolLiteral#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getBoolLiteral()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/DeprecatableElement.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/DeprecatableElement.java
@@ -19,11 +19,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.DeprecatableElement#isDeprecated <em>Deprecated</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.DeprecatableElement#getComment <em>Comment</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getDeprecatableElement()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureConfiguration.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureConfiguration.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureConfiguration#getType <em>Type</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureConfiguration#getParameterValues <em>Parameter Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getFeatureConfiguration()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureParameter.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureParameter.java
@@ -19,12 +19,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureParameter#getFeatureType <em>Feature Type</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureParameter#isOptional <em>Optional</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureParameter#getParameterType <em>Parameter Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getFeatureParameter()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureParameterValue.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureParameterValue.java
@@ -18,12 +18,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureParameterValue#getParameter <em>Parameter</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureParameterValue#getFeatureConfiguration <em>Feature Configuration</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureParameterValue#getExpression <em>Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getFeatureParameterValue()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureType.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureType.java
@@ -20,12 +20,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureType#getParameters <em>Parameters</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureType#getLibrary <em>Library</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureType#isOptional <em>Optional</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getFeatureType()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureTypeLibrary.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/FeatureTypeLibrary.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureTypeLibrary#getTypes <em>Types</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.FeatureTypeLibrary#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getFeatureTypeLibrary()
  * @model

diff --git a/...ins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/GeneratorConfiguration.java b/...ins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/GeneratorConfiguration.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.GeneratorConfiguration#getConfigurations <em>Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getGeneratorConfiguration()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/GeneratorEntry.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/GeneratorEntry.java
@@ -20,12 +20,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.GeneratorEntry#getElementRef <em>Element Ref</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.GeneratorEntry#getFeatures <em>Features</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.GeneratorEntry#getContentType <em>Content Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getGeneratorEntry()
  * @model
@@ -108,4 +108,12 @@ public interface GeneratorEntry extends EObject {
 	 */
 	FeatureConfiguration getFeatureConfiguration(String featureName);
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	FeatureParameterValue getFeatureParameterValue(String featureName, String paramName);
+
 } // GeneratorEntry
diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/GeneratorModel.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/GeneratorModel.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.GeneratorModel#getEntries <em>Entries</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.GeneratorModel#getGeneratorId <em>Generator Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getGeneratorModel()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/IntLiteral.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/IntLiteral.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.IntLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getIntLiteral()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/ParameterTypes.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/ParameterTypes.java
@@ -148,6 +148,8 @@ public enum ParameterTypes implements Enumerator {
 	 * Returns the '<em><b>Parameter Types</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ParameterTypes get(String literal) {
@@ -164,6 +166,8 @@ public static ParameterTypes get(String literal) {
 	 * Returns the '<em><b>Parameter Types</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ParameterTypes getByName(String name) {
@@ -180,6 +184,8 @@ public static ParameterTypes getByName(String name) {
 	 * Returns the '<em><b>Parameter Types</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ParameterTypes get(int value) {

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/RealLiteral.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/RealLiteral.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.RealLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getRealLiteral()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/StringLiteral.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/StringLiteral.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.StringLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.yakindu.sct.model.sgen.SGenPackage#getStringLiteral()
  * @model

diff --git a/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/BoolLiteralImpl.java b/plugins/org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/BoolLiteralImpl.java
@@ -24,10 +24,10 @@
  * <em><b>Bool Literal</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.BoolLiteralImpl#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

diff --git a/...g.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/DeprecatableElementImpl.java b/...g.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/DeprecatableElementImpl.java
@@ -26,11 +26,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.DeprecatableElementImpl#isDeprecated <em>Deprecated</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.DeprecatableElementImpl#getComment <em>Comment</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

diff --git a/....yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/FeatureConfigurationImpl.java b/....yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/FeatureConfigurationImpl.java
@@ -31,11 +31,11 @@
  * <em><b>Feature Configuration</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureConfigurationImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureConfigurationImpl#getParameterValues <em>Parameter Values</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

diff --git a/.../org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/FeatureParameterImpl.java b/.../org.yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/FeatureParameterImpl.java
@@ -29,14 +29,14 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterImpl#isDeprecated <em>Deprecated</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterImpl#getComment <em>Comment</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterImpl#getFeatureType <em>Feature Type</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterImpl#isOptional <em>Optional</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterImpl#getParameterType <em>Parameter Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */

diff --git a/...yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/FeatureParameterValueImpl.java b/...yakindu.sct.model.sgen/src/org/yakindu/sct/model/sgen/impl/FeatureParameterValueImpl.java
@@ -30,12 +30,12 @@
  * <em><b>Feature Parameter Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterValueImpl#getParameter <em>Parameter</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterValueImpl#getFeatureConfiguration <em>Feature Configuration</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgen.impl.FeatureParameterValueImpl#getExpression <em>Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */