Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-11-20 08:44:20 +0000
committerHenrik Rentz-Reichert2013-11-20 08:44:20 +0000
commit77f180f3c9d37df9ed7fc345783ceb14404e4c76 (patch)
treed8e734a2b57ffd3d913622532c876ec29098df59 /plugins/org.eclipse.etrice.core.genmodel
parent066548765fb227062011747531ed292115a22c1b (diff)
downloadorg.eclipse.etrice-77f180f3c9d37df9ed7fc345783ceb14404e4c76.tar.gz
org.eclipse.etrice-77f180f3c9d37df9ed7fc345783ceb14404e4c76.tar.xz
org.eclipse.etrice-77f180f3c9d37df9ed7fc345783ceb14404e4c76.zip
[*] fixed JavaDocs
Diffstat (limited to 'plugins/org.eclipse.etrice.core.genmodel')
-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
9 files changed, 25 insertions, 16 deletions
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);

Back to the top