Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-11-20 03:44:20 -0500
committerHenrik Rentz-Reichert2013-11-20 03:44:20 -0500
commit77f180f3c9d37df9ed7fc345783ceb14404e4c76 (patch)
treed8e734a2b57ffd3d913622532c876ec29098df59
parent066548765fb227062011747531ed292115a22c1b (diff)
downloadorg.eclipse.etrice-77f180f3c9d37df9ed7fc345783ceb14404e4c76.tar.gz
org.eclipse.etrice-77f180f3c9d37df9ed7fc345783ceb14404e4c76.tar.xz
org.eclipse.etrice-77f180f3c9d37df9ed7fc345783ceb14404e4c76.zip
[*] fixed JavaDocs
-rw-r--r--plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.xtend10
-rw-r--r--plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java10
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore6
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java2
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java2
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java2
-rw-r--r--plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/config/util/ConfigUtil.java4
-rw-r--r--plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend6
-rw-r--r--plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/scoping/ConfigScopeProvider.java2
-rw-r--r--plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java6
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/BindingUtil.java2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java7
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java4
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java6
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java15
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java1
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenUtil.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java12
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java4
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IDataConfiguration.java1
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ITranslationProvider.java6
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend10
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend22
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java10
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java22
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java4
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/OptionalActorInterfaceBase.java2
31 files changed, 102 insertions, 88 deletions
diff --git a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.xtend b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.xtend
index 5f20fcbb1..ad1b5dc57 100644
--- a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.xtend
+++ b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.xtend
@@ -64,12 +64,12 @@ class DocuPostprocessor {
cls.setDocumentation('''
An annotation similar to Java annotations that can be used
to add {@link KeyValue} pairs to certain model items. The structure
- of Annotations are defined by {@AnnotationType}s.
+ of Annotations are defined by {@link AnnotationType}s.
''')
cls.getReference("type").setDocumentation(
'''
- The {@AnnotationType} that defines the structure of
+ The {@link AnnotationType} that defines the structure of
the annotation.
''')
@@ -104,14 +104,14 @@ class DocuPostprocessor {
)
cls.getAttribute("targets").setDocumentation(
'''A list of names representing the locations in which
- {@Annotation}s of this AnnotationType can occur'''
+ {@link Annotation}s of this AnnotationType can occur'''
)
cls.getReference("docu").setDocumentation(
'''Optional model-level documentation'''
)
cls.getReference("attributes").setDocumentation(
- '''Defines the {@link Attribute}s that are required or allowed in
- {@Annotation} instances of this AnnotationType'''
+ '''Defines the {@link AnnotationAttribute}s that are required or allowed in
+ {@link Annotation} instances of this AnnotationType'''
)
//------------------------------------------------------------------
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java
index 3c1a6d4dd..57c1ae5c1 100644
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java
+++ b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java
@@ -74,12 +74,12 @@ public class DocuPostprocessor {
_builder_5.newLine();
_builder_5.append("to add {@link KeyValue} pairs to certain model items. The structure ");
_builder_5.newLine();
- _builder_5.append("of Annotations are defined by {@AnnotationType}s.");
+ _builder_5.append("of Annotations are defined by {@link AnnotationType}s.");
_builder_5.newLine();
PostprocessingHelpers.setDocumentation(cls, _builder_5.toString());
EReference _reference_1 = PostprocessingHelpers.getReference(cls, "type");
StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("The {@AnnotationType} that defines the structure of ");
+ _builder_6.append("The {@link AnnotationType} that defines the structure of ");
_builder_6.newLine();
_builder_6.append("the annotation.");
_builder_6.newLine();
@@ -119,7 +119,7 @@ public class DocuPostprocessor {
_builder_13.append("A list of names representing the locations in which ");
_builder_13.newLine();
_builder_13.append("\t\t\t");
- _builder_13.append("{@Annotation}s of this AnnotationType can occur");
+ _builder_13.append("{@link Annotation}s of this AnnotationType can occur");
PostprocessingHelpers.setDocumentation(_attribute_3, _builder_13.toString());
EReference _reference_4 = PostprocessingHelpers.getReference(cls, "docu");
StringConcatenation _builder_14 = new StringConcatenation();
@@ -127,10 +127,10 @@ public class DocuPostprocessor {
PostprocessingHelpers.setDocumentation(_reference_4, _builder_14.toString());
EReference _reference_5 = PostprocessingHelpers.getReference(cls, "attributes");
StringConcatenation _builder_15 = new StringConcatenation();
- _builder_15.append("Defines the {@link Attribute}s that are required or allowed in ");
+ _builder_15.append("Defines the {@link AnnotationAttribute}s that are required or allowed in ");
_builder_15.newLine();
_builder_15.append("\t\t\t");
- _builder_15.append("{@Annotation} instances of this AnnotationType");
+ _builder_15.append("{@link Annotation} instances of this AnnotationType");
PostprocessingHelpers.setDocumentation(_reference_5, _builder_15.toString());
EClass _class_5 = PostprocessingHelpers.getClass(pckg, "AnnotationAttribute");
cls = _class_5;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore
index 2ad288b82..244758c27 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore
@@ -54,7 +54,7 @@
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;br>This is the logical system that contains the {@link #org.eclipse.etrice.core.room.SubSystemRef sub system reference}.&#xD;&#xA;"/>
+ <details key="documentation" value="&lt;br>This is the logical system that contains the {@link org.eclipse.etrice.core.room.SubSystemRef sub system reference}.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="subSystem" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
@@ -121,7 +121,7 @@
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="subSystem" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;br>This is the sub system that contains the {@link #getRefPath actor instance}.&#xD;&#xA;"/>
+ <details key="documentation" value="&lt;br>This is the sub system that contains the {@link #getPath actor instance}.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//RefPath"
@@ -259,7 +259,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="refs" upperBound="-1" eType="#//RefSegment"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;br>This is a path in the instance tree where each segment corresponds to the name of the&#xD;&#xA;corresponding {@link ActorContainerRef}.&#xD;&#xA;"/>
+ <details key="documentation" value="&lt;br>This is a path in the instance tree where each segment corresponds to the name of the&#xD;&#xA;corresponding {@link {@link org.eclipse.etrice.core.room.ActorContainerRef}}.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java
index cd16bb416..305e93e13 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java
@@ -71,7 +71,7 @@ public interface ActorInstanceConfig extends ConfigElement
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
- * <br>This is the sub system that contains the {@link #getRefPath actor instance}.
+ * <br>This is the sub system that contains the {@link #getPath actor instance}.
*
* <!-- end-model-doc -->
* @return the value of the '<em>Sub System</em>' reference.
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java
index c516b56bc..bc0856c7d 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java
@@ -36,7 +36,7 @@ public interface RefPath extends EObject
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* <br>This is a path in the instance tree where each segment corresponds to the name of the
- * corresponding {@link ActorContainerRef}.
+ * corresponding {@link {@link org.eclipse.etrice.core.room.ActorContainerRef}}.
*
* <!-- end-model-doc -->
* @return the value of the '<em>Refs</em>' containment reference list.
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java
index 7ae91672b..aecec2787 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/SubSystemConfig.java
@@ -35,7 +35,7 @@ public interface SubSystemConfig extends ConfigElement
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
- * <br>This is the logical system that contains the {@link #org.eclipse.etrice.core.room.SubSystemRef sub system reference}.
+ * <br>This is the logical system that contains the {@link org.eclipse.etrice.core.room.SubSystemRef sub system reference}.
*
* <!-- end-model-doc -->
* @return the value of the '<em>Root</em>' reference.
diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/config/util/ConfigUtil.java b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/config/util/ConfigUtil.java
index 78527f352..5cfb1731a 100644
--- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/config/util/ConfigUtil.java
+++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/config/util/ConfigUtil.java
@@ -115,11 +115,11 @@ public class ConfigUtil {
}
/**
- * returns first invalid path segment else null
+ * returns first invalid path segment else {@code null}
*
* @param root
* @param path
- * @return
+ * @return the first invalid path segment else {@code null}
*/
public static String checkPath(ActorContainerClass root, RefPath path) {
if (path == null)
diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend
index e62f68a84..981063c69 100644
--- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend
+++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.xtend
@@ -72,7 +72,7 @@ class DocuPostprocessor {
cls.getReference("root").setDocumentation(
'''
- This is the logical system that contains the {@link #org.eclipse.etrice.core.room.SubSystemRef sub system reference}.
+ This is the logical system that contains the {@link org.eclipse.etrice.core.room.SubSystemRef sub system reference}.
''')
cls.getReference("subSystem").setDocumentation(
@@ -212,7 +212,7 @@ class DocuPostprocessor {
cls.getReference("subSystem").setDocumentation(
'''
- This is the sub system that contains the {@link #getRefPath actor instance}.
+ This is the sub system that contains the {@link #getPath actor instance}.
''')
cls.getReference("path").setDocumentation(
@@ -348,7 +348,7 @@ class DocuPostprocessor {
cls.getReference("refs").setDocumentation(
'''
This is a path in the instance tree where each segment corresponds to the name of the
- corresponding {@link ActorContainerRef}.
+ corresponding {@link {@link org.eclipse.etrice.core.room.ActorContainerRef}}.
''')
//------------------------------------------------------------------
diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/scoping/ConfigScopeProvider.java b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/scoping/ConfigScopeProvider.java
index 22582151a..f19eb2aa1 100644
--- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/scoping/ConfigScopeProvider.java
+++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/scoping/ConfigScopeProvider.java
@@ -42,7 +42,7 @@ import org.eclipse.xtext.scoping.impl.SimpleScope;
/**
* This class contains custom scoping description.
*
- * @see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping on
+ * See <a href="http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping">scoping</a> on
* how and when to use it
*
*/
diff --git a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
index b539b960d..47f76a7d1 100644
--- a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
+++ b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
@@ -80,7 +80,7 @@ public class DocuPostprocessor {
PostprocessingHelpers.setDocumentation(cls, _builder_5.toString());
EReference _reference_2 = PostprocessingHelpers.getReference(cls, "root");
StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("This is the logical system that contains the {@link #org.eclipse.etrice.core.room.SubSystemRef sub system reference}.");
+ _builder_6.append("This is the logical system that contains the {@link org.eclipse.etrice.core.room.SubSystemRef sub system reference}.");
_builder_6.newLine();
PostprocessingHelpers.setDocumentation(_reference_2, _builder_6.toString());
EReference _reference_3 = PostprocessingHelpers.getReference(cls, "subSystem");
@@ -237,7 +237,7 @@ public class DocuPostprocessor {
PostprocessingHelpers.setDocumentation(_reference_11, _builder_24.toString());
EReference _reference_12 = PostprocessingHelpers.getReference(cls, "subSystem");
StringConcatenation _builder_25 = new StringConcatenation();
- _builder_25.append("This is the sub system that contains the {@link #getRefPath actor instance}.");
+ _builder_25.append("This is the sub system that contains the {@link #getPath actor instance}.");
_builder_25.newLine();
PostprocessingHelpers.setDocumentation(_reference_12, _builder_25.toString());
EReference _reference_13 = PostprocessingHelpers.getReference(cls, "path");
@@ -396,7 +396,7 @@ public class DocuPostprocessor {
StringConcatenation _builder_44 = new StringConcatenation();
_builder_44.append("This is a path in the instance tree where each segment corresponds to the name of the");
_builder_44.newLine();
- _builder_44.append("corresponding {@link ActorContainerRef}.");
+ _builder_44.append("corresponding {@link {@link org.eclipse.etrice.core.room.ActorContainerRef}}.");
_builder_44.newLine();
PostprocessingHelpers.setDocumentation(_reference_24, _builder_44.toString());
EClass _class_12 = PostprocessingHelpers.getClass(pckg, "RefSegment");
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/BindingUtil.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/BindingUtil.java
index c8aa0bd09..1960c6c11 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/BindingUtil.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/BindingUtil.java
@@ -115,8 +115,6 @@ public class BindingUtil {
/**
* create binding instances. Since bindings connect port instances the ports can point back to their bindings
* using EOpposite
- * @param si - create bindings for this actor instance
- * @param bindings - a list of bindings
*/
public void createBindingInstances() {
initPortInstanceMap();
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java
index 43d6132d8..b08e251be 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActiveTrigger.java
@@ -13,11 +13,14 @@
package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
+import org.eclipse.etrice.core.room.Guard;
import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
+import org.eclipse.etrice.core.room.State;
+import org.eclipse.etrice.core.room.TrPoint;
+import org.eclipse.etrice.core.room.Transition;
+import org.eclipse.etrice.core.room.Trigger;
import org.eclipse.etrice.core.room.TriggeredTransition;
/**
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java
index 71c97f05b..5e97b3efd 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ActorInstance.java
@@ -13,6 +13,10 @@
package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.etrice.core.room.ActorClass;
+import org.eclipse.etrice.core.room.ActorContainerRef;
+import org.eclipse.etrice.core.room.ActorRef;
+import org.eclipse.etrice.core.room.LogicalSystem;
+import org.eclipse.etrice.core.room.SubSystemClass;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java
index 93a4ccba9..64d848571 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ConnectionInstance.java
@@ -13,8 +13,8 @@
package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.etrice.core.room.LayerConnection;
+import org.eclipse.etrice.core.room.SPP;
/**
* <!-- begin-user-doc -->
@@ -67,7 +67,7 @@ public interface ConnectionInstance extends EObject {
* It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getOutgoing <em>Outgoing</em>}'.
* <!-- begin-user-doc -->
* <p>
- * This is the source {@link SPPRef} of this connection.
+ * This is the source {@link SPP} of this connection.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>From SPP</em>' reference.
@@ -94,7 +94,7 @@ public interface ConnectionInstance extends EObject {
* It is bidirectional and its opposite is '{@link org.eclipse.etrice.core.genmodel.etricegen.SPPInstance#getIncoming <em>Incoming</em>}'.
* <!-- begin-user-doc -->
* <p>
- * This is the destination {@link SPPRef} of this connection.
+ * This is the destination {@link SPP} of this connection.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>To SPP</em>' reference.
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java
index b82e5c39a..48754a7f5 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedActorClass.java
@@ -14,10 +14,13 @@ package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.impl.ExpandedActorClassImpl;
import org.eclipse.etrice.core.room.ActorClass;
+import org.eclipse.etrice.core.room.ChoicePoint;
import org.eclipse.etrice.core.room.ContinuationTransition;
import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.MessageFromIf;
+import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.StateGraph;
import org.eclipse.etrice.core.room.StateGraphItem;
@@ -158,7 +161,7 @@ public interface ExpandedActorClass extends EObject {
* <!-- begin-user-doc -->
* @param mif a message/interface item pair
* @return a string that can serve as the name of a constant representing this trigger.
- * @see {@link #getTriggerCodeName(ActiveTrigger)}
+ * @see #getTriggerCodeName(ActiveTrigger)
* <!-- end-user-doc -->
* @model
* @generated
@@ -169,7 +172,7 @@ public interface ExpandedActorClass extends EObject {
* <!-- begin-user-doc -->
* @param at the active trigger
* @return a string that can serve as the name of a constant representing this trigger.
- * @see {@link #getTriggerCodeName(MessageFromIf)}
+ * @see #getTriggerCodeName(MessageFromIf)
* <!-- end-user-doc -->
* @model
* @generated
@@ -210,7 +213,7 @@ public interface ExpandedActorClass extends EObject {
* <!-- begin-user-doc -->
* @return a sorted list of triggers of this actor class (including base classes).
* The elements are sorted by the trigger name (a concatenation of interface item name and message name).
- * @see {@link #getOwnTriggers()}
+ * @see #getOwnTriggers()
* <!-- end-user-doc -->
* @model kind="operation"
* @generated
@@ -221,7 +224,7 @@ public interface ExpandedActorClass extends EObject {
* <!-- begin-user-doc -->
* @return a sorted list of triggers of this actor class (including base classes).
* The elements are sorted by the trigger name (a concatenation of interface item name and message name).
- * @see {@link #getTriggers()}
+ * @see #getTriggers()
* <!-- end-user-doc -->
* @model kind="operation"
* @generated
@@ -293,7 +296,7 @@ public interface ExpandedActorClass extends EObject {
* {@link StateGraphItem}s. This methods maps back to the original object if applicable.
*
* @param copy a copied object
- * @return the original object of the {@link RoomModel}
+ * @return the original object of the {@link RoomModel1}
* <!-- end-user-doc -->
* @model
* @generated
@@ -303,7 +306,7 @@ public interface ExpandedActorClass extends EObject {
/**
* <!-- begin-user-doc -->
* @param trans a {@link Transition}
- * @return the common data type of the {@link TransitionChainBundle} associated with the transition
+ * @return the common data type of the TransitionChainBundle (see {@link ExpandedActorClassImpl}) associated with the transition
* <!-- end-user-doc -->
* @model
* @generated
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java
index 4d5b354c2..0ee1e8458 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/Root.java
@@ -323,7 +323,7 @@ public interface Root extends EObject {
/**
* <!-- begin-user-doc -->
- * @param cls a {@link RoomClass}, actually a {@link DataClass}, a {@link ProtocoClass} or an {@link ActorClass}
+ * @param cls a {@link RoomClass}, actually a {@link DataClass}, a {@link ProtocolClass} or an {@link ActorClass}
* @return all data classes that are directly or indirectly referenced by {@code cls} and also
* descending into base classes
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java
index 1b4d819be..501a884bd 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/StructureInstance.java
@@ -13,6 +13,7 @@
package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.room.ActorRef;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java
index 36a33bcb6..047c2592a 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/TransitionChain.java
@@ -13,9 +13,9 @@
package org.eclipse.etrice.core.genmodel.etricegen;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.core.room.Transition;
+import org.eclipse.etrice.core.room.TransitionPoint;
import org.eclipse.etrice.core.room.VarDecl;
/**
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenUtil.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenUtil.java
index 800d8c8d0..8a6ae6870 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenUtil.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenUtil.java
@@ -29,7 +29,7 @@ public class ETriceGenUtil {
* @param trigstr the encoded trigger string
* @return <code>true</code> if the encoded trigger string is matching the {@link Trigger}
*
- * @see {@link org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#isMatching(Trigger, String)}
+ * @see org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass#isMatching(Trigger, String)
*/
public static boolean isMatching(Trigger trig, String trigstr) {
return ETriceGenFactory.eINSTANCE.createExpandedActorClass().isMatching(trig, trigstr);
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
index ec63a8e65..ec6892dff 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
@@ -83,13 +83,13 @@ public abstract class AbstractGenerator implements IResourceURIAcceptor {
public static final String OPTION_DEBUG = "-debug";
/**
- * constant used as return value of {@link #runGenerator(String[])}
- * @see {@link #GENERATOR_ERROR}
+ * constant used as return value of {@link #runGenerator())}
+ * @see #GENERATOR_ERROR
*/
public static final int GENERATOR_OK = 0;
/**
- * constant used as return value of {@link #runGenerator(String[])}
- * @see {@link #GENERATOR_OK}
+ * constant used as return value of {@link #runGenerator()}
+ * @see #GENERATOR_OK
*/
public static final int GENERATOR_ERROR = 1;
@@ -110,7 +110,7 @@ public abstract class AbstractGenerator implements IResourceURIAcceptor {
* @param terminateOnError a flag that determines shut down behavior
* (this behavior is implemented in the concrete generator defining <code>main()</code>)
*
- * @see {@link #isTerminateOnError()}
+ * @see #isTerminateOnError()
*/
public static void setTerminateOnError(boolean terminateOnError) {
AbstractGenerator.terminateOnError = terminateOnError;
@@ -395,7 +395,7 @@ public abstract class AbstractGenerator implements IResourceURIAcceptor {
/**
* This resource set combines all resources processed by the generator
- * @return
+ * @return the resource set for the input models
*/
protected ResourceSet getResourceSet() {
return resourceSet;
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java
index 9f5807bc9..b58f0c659 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/CodegenHelpers.java
@@ -68,7 +68,7 @@ public class CodegenHelpers {
* @param s a {@link State} (must not be <code>null</code>)
* @return the path of the state that may serve as a unique identifier
*
- * @see {@link org.eclipse.etrice.core.naming.RoomNameProvider#getFullPath(StateGraphItem)}
+ * @see org.eclipse.etrice.core.naming.RoomNameProvider#getFullPath(StateGraphItem)
*/
public static String getGenStatePathName(State s) {
return RoomNameProvider.getFullPath(s);
@@ -88,7 +88,7 @@ public class CodegenHelpers {
/**
* @param s a {@link State} (may be <code>null</code>)
* @return an ID for the parent state of s
- * @see {@link #getGenStateId(State)}
+ * @see #getGenStateId(State)
*/
public static String getParentStateId(State s) {
return getGenStateId(RoomHelpers.getParentState(s));
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IDataConfiguration.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IDataConfiguration.java
index 22d070b06..fd478fb57 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IDataConfiguration.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/IDataConfiguration.java
@@ -22,6 +22,7 @@ import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
+import org.eclipse.etrice.core.room.PortClass;
import org.eclipse.etrice.core.room.ProtocolClass;
/**
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java
index 275263792..b553abe7a 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ILineOutputLogger.java
@@ -16,7 +16,7 @@ import org.eclipse.etrice.core.genmodel.base.ILogger;
/**
- * An ILineOutputLogger will send its output to the specified {@link org.eclipse.etrice.generator.base.ILogger ILogger} if one is set.
+ * An ILineOutputLogger will send its output to the specified {@link ILogger} if one is set.
*
* @author Henrik Rentz-Reichert
*
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ITranslationProvider.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ITranslationProvider.java
index 4892c0cbe..6cb20a2c6 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ITranslationProvider.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ITranslationProvider.java
@@ -15,12 +15,16 @@ package org.eclipse.etrice.generator.base;
import java.util.ArrayList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
+import org.eclipse.etrice.core.room.DataClass;
import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.EnumLiteral;
import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
import org.eclipse.etrice.core.room.Operation;
+import org.eclipse.etrice.core.room.PortClass;
+import org.eclipse.etrice.core.room.ProtocolClass;
/**
* This interface is used by the detail code parser to replace
@@ -37,7 +41,7 @@ import org.eclipse.etrice.core.room.Operation;
* </ul>
* </p>
*
- * @see {@link DetailCodeTranslator}
+ * @see DetailCodeTranslator
*
* @author Henrik Rentz-Reichert
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
index d4e054262..6041dd81b 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
@@ -126,7 +126,7 @@ class GenericStateMachineGenerator {
* @param xpac the {@link ExpandedActorClass}
* @return the generated code
*
- * @see {@link #genStateMachine}
+ * @see #genStateMachine
*/
def genStateMachine(ExpandedActorClass xpac) {
xpac.genStateMachine(true)
@@ -358,7 +358,7 @@ class GenericStateMachineGenerator {
* Asynchronous, data driven and event driven state machines are distinguished
*
* @param xpac the {@link ExpandedActorClass}
- * @param usesHdlr if the state machine uses no handler {@link TransitionPoints}
+ * @param usesHdlr if the state machine uses no handler {@link TransitionPoint}s
* at all then unused variables can be avoided by passing <code>true</code>
* @return the generated code
*/
@@ -480,8 +480,8 @@ class GenericStateMachineGenerator {
/**
* setter for history array
*
- * @param the ID of the state whose history should be set
- * @param the ID of the state that should be assigned
+ * @param state the ID of the state whose history should be set
+ * @param historyState the ID of the state that should be assigned
* @return the generated code
*/
def protected setHistory(String state, String historyState) {
@@ -573,7 +573,7 @@ class GenericStateMachineGenerator {
/**
* generate action code method implementations
*
- * @param xpax the {@link ExpandedActorClass}
+ * @param xpac the {@link ExpandedActorClass}
* @param state the {@link State}
* @return the generated code
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
index 1a96aca83..6ef85f92b 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
@@ -110,13 +110,13 @@ class ProcedureHelpers {
// Attributes
/**
- * @param attribs a list of {@link Attribute}s
+ * @param EnumTest a list of {@link Attribute}s
* @return code declaring the attributes
*/
- def attributes(List<Attribute> attribs) {
+ def attributes(List<Attribute> EnumTest) {
'''
/*--------------------- attributes ---------------------*/
- «FOR attribute : attribs»
+ «FOR attribute : EnumTest»
«attributeDeclaration(attribute)»
«ENDFOR»
'''
@@ -164,14 +164,14 @@ class ProcedureHelpers {
// Attribute setters & getters
/**
- * @param attribs a list of {@link Attribute}s
+ * @param EnumTest a list of {@link Attribute}s
* @param classname the name of the defining class
* @return code declaring setters and getters for the attributes
*/
- def attributeSettersGettersDeclaration(List<Attribute> attribs, String classname) {
+ def attributeSettersGettersDeclaration(List<Attribute> EnumTest, String classname) {
'''
/* --------------------- attribute setters and getters */
- «FOR attribute : attribs»
+ «FOR attribute : EnumTest»
«setterHeader(attribute, classname)»;
«getterHeader(attribute, classname)»;
«ENDFOR»
@@ -179,14 +179,14 @@ class ProcedureHelpers {
}
/**
- * @param attribs a list of {@link Attribute}s
+ * @param EnumTest a list of {@link Attribute}s
* @param classname the name of the defining class
* @return code defining setters and getters for the attributes
*/
- def attributeSettersGettersImplementation(List<Attribute> attribs, String classname) {
+ def attributeSettersGettersImplementation(List<Attribute> EnumTest, String classname) {
'''
/* --------------------- attribute setters and getters */
- «FOR attribute : attribs»«setterHeader(attribute, classname)» {
+ «FOR attribute : EnumTest»«setterHeader(attribute, classname)» {
«languageExt.memberAccess()»«attribute.name» = «attribute.name»;
}
«getterHeader(attribute, classname)» {
@@ -215,7 +215,7 @@ class ProcedureHelpers {
}
/**
- * @param attribs a list of {@link Attribute}s
+ * @param attributes a list of {@link Attribute}s
* @return an argument list for the attributes
*/
def argList(List<Attribute> attributes) {
@@ -223,7 +223,7 @@ class ProcedureHelpers {
}
/**
- * @param attribs an iterable of {@link Attribute}s representing a path
+ * @param EnumTest an iterable of {@link Attribute}s representing a path
* @param classname the name of the defining class
* @return the invocation code for the call of a setter
*/
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
index 6652289c9..b82b68584 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
@@ -105,8 +105,8 @@ class RoomExtensions {
/**
* a specialized version of {@link #union(Iterable, Iterable)}
- * @param l1 an iterable of type T
- * @param l2 a second iterable of type T
+ * @param in1 an iterable of type T
+ * @param in2 a second iterable of type T
* @return the union of the two iterables as new list
*/
def List<Port> punion(Iterable<Port> in1, Iterable<ExternalPort> in2){
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
index 21097f599..8a490ed40 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
@@ -217,7 +217,7 @@ public class GenericStateMachineGenerator {
* @param xpac the {@link ExpandedActorClass}
* @return the generated code
*
- * @see {@link #genStateMachine}
+ * @see #genStateMachine
*/
public CharSequence genStateMachine(final ExpandedActorClass xpac) {
CharSequence _genStateMachine = this.genStateMachine(xpac, true);
@@ -1124,7 +1124,7 @@ public class GenericStateMachineGenerator {
* Asynchronous, data driven and event driven state machines are distinguished
*
* @param xpac the {@link ExpandedActorClass}
- * @param usesHdlr if the state machine uses no handler {@link TransitionPoints}
+ * @param usesHdlr if the state machine uses no handler {@link TransitionPoint}s
* at all then unused variables can be avoided by passing <code>true</code>
* @return the generated code
*/
@@ -1471,8 +1471,8 @@ public class GenericStateMachineGenerator {
/**
* setter for history array
*
- * @param the ID of the state whose history should be set
- * @param the ID of the state that should be assigned
+ * @param state the ID of the state whose history should be set
+ * @param historyState the ID of the state that should be assigned
* @return the generated code
*/
protected String setHistory(final String state, final String historyState) {
@@ -1616,7 +1616,7 @@ public class GenericStateMachineGenerator {
/**
* generate action code method implementations
*
- * @param xpax the {@link ExpandedActorClass}
+ * @param xpac the {@link ExpandedActorClass}
* @param state the {@link State}
* @return the generated code
*/
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
index 126b66cae..a904304eb 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
@@ -227,15 +227,15 @@ public class ProcedureHelpers {
}
/**
- * @param attribs a list of {@link Attribute}s
+ * @param EnumTest a list of {@link Attribute}s
* @return code declaring the attributes
*/
- public CharSequence attributes(final List<Attribute> attribs) {
+ public CharSequence attributes(final List<Attribute> EnumTest) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- attributes ---------------------*/");
_builder.newLine();
{
- for(final Attribute attribute : attribs) {
+ for(final Attribute attribute : EnumTest) {
CharSequence _attributeDeclaration = this.attributeDeclaration(attribute);
_builder.append(_attributeDeclaration, "");
_builder.newLineIfNotEmpty();
@@ -351,16 +351,16 @@ public class ProcedureHelpers {
}
/**
- * @param attribs a list of {@link Attribute}s
+ * @param EnumTest a list of {@link Attribute}s
* @param classname the name of the defining class
* @return code declaring setters and getters for the attributes
*/
- public CharSequence attributeSettersGettersDeclaration(final List<Attribute> attribs, final String classname) {
+ public CharSequence attributeSettersGettersDeclaration(final List<Attribute> EnumTest, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* --------------------- attribute setters and getters */");
_builder.newLine();
{
- for(final Attribute attribute : attribs) {
+ for(final Attribute attribute : EnumTest) {
CharSequence _setterHeader = this.setterHeader(attribute, classname);
_builder.append(_setterHeader, "");
_builder.append(";");
@@ -375,16 +375,16 @@ public class ProcedureHelpers {
}
/**
- * @param attribs a list of {@link Attribute}s
+ * @param EnumTest a list of {@link Attribute}s
* @param classname the name of the defining class
* @return code defining setters and getters for the attributes
*/
- public CharSequence attributeSettersGettersImplementation(final List<Attribute> attribs, final String classname) {
+ public CharSequence attributeSettersGettersImplementation(final List<Attribute> EnumTest, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* --------------------- attribute setters and getters */");
_builder.newLine();
{
- for(final Attribute attribute : attribs) {
+ for(final Attribute attribute : EnumTest) {
CharSequence _setterHeader = this.setterHeader(attribute, classname);
_builder.append(_setterHeader, "");
_builder.append(" {");
@@ -486,7 +486,7 @@ public class ProcedureHelpers {
}
/**
- * @param attribs a list of {@link Attribute}s
+ * @param attributes a list of {@link Attribute}s
* @return an argument list for the attributes
*/
public CharSequence argList(final List<Attribute> attributes) {
@@ -519,7 +519,7 @@ public class ProcedureHelpers {
}
/**
- * @param attribs an iterable of {@link Attribute}s representing a path
+ * @param EnumTest an iterable of {@link Attribute}s representing a path
* @param classname the name of the defining class
* @return the invocation code for the call of a setter
*/
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
index 6b5dff287..412e89285 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
@@ -134,8 +134,8 @@ public class RoomExtensions {
/**
* a specialized version of {@link #union(Iterable, Iterable)}
- * @param l1 an iterable of type T
- * @param l2 a second iterable of type T
+ * @param in1 an iterable of type T
+ * @param in2 a second iterable of type T
* @return the union of the two iterables as new list
*/
public List<Port> punion(final Iterable<Port> in1, final Iterable<ExternalPort> in2) {
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/OptionalActorInterfaceBase.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/OptionalActorInterfaceBase.java
index 7ad1d4e6b..ac17cf1be 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/OptionalActorInterfaceBase.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/OptionalActorInterfaceBase.java
@@ -94,7 +94,7 @@ public abstract class OptionalActorInterfaceBase extends SystemPortOwner impleme
/**
* This is our regular instance path including our own name as last segment.
*
- * @return
+ * @return the regular instance path including our own name as last segment
*/
public String getInterfaceInstancePath() {
return super.getInstancePath(PATH_DELIM);

Back to the top