goUpIfNeeded=false.
+ *
+ * @param base the base path
+ * @param path the path for which the relative path is computed
+ * @return relative path (nullif there is none)
+ */
+ public static String getRelativePath(String base, String path) {
+ return getRelativePath(URI.createFileURI(base), URI.createFileURI(path), false);
+ }
+
+ /**
+ * the given paths are converted to file URIs (using {@link URI#createFileURI(String)}
+ * and then {@link #getRelativePath(URI, URI, boolean)} is called.
+ *
+ * @param base the base path
+ * @param path the path for which the relative path is computed
+ * @param goUpIfNeeded allow also ascending to parent directories
+ * @return relative path (nullif there is none)
+ */
+ public static String getRelativePath(String base, String path, boolean goUpIfNeeded) {
+ return getRelativePath(URI.createFileURI(base), URI.createFileURI(path), goUpIfNeeded);
+ }
+
+ /**
+ * {@link #getRelativePath(URI, URI, boolean)} is called with
+ * goUpIfNeeded=false
+ *
+ * @param base the base path
+ * @param path the path for which the relative path is computed
+ * @return relative path (nullif there is none)
+ */
+ public static String getRelativePath(URI base, URI path) {
+ return getRelativePath(base, path, false);
+ }
+
+ /**
+ * compute a relative path to a given base path.
+ * Both paths must be of the same scheme and absolute and the given
+ * path has to have the first segments identical with the base path.
+ * Returned is a relative path separated by / characters.
+ * If there is no such relative path null is returned.
+ *
+ * @param base the base path
+ * @param path the path for which the relative path is computed
+ * @param goUpIfNeeded allow also ascending to parent directories
+ * @return relative path (nullif there is none)
+ */
+ public static String getRelativePath(URI base, URI path, boolean goUpIfNeeded) {
+ if (base==null || path==null)
+ return null;
+
+ if (!bothNullOrEqual(base.scheme(),path.scheme()))
+ return null;
+
+ if (!base.hasAbsolutePath())
+ return null;
+
+ if (!path.hasAbsolutePath())
+ return null;
+
+ if (!bothNullOrEqual(path.device(), base.device()))
+ return null;
+
+ StringBuffer result = new StringBuffer();
+ if (goUpIfNeeded) {
+ int max = base.segmentCount()* The following features are supported: *
+ * If the meaning of the 'Used' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Used' attribute. + * @see #setUsed(boolean) + * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getDetailCode_Used() + * @model + * @generated + */ + boolean isUsed(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.core.fsm.fSM.DetailCode#isUsed Used}' attribute. + * + * + * @param value the new value of the 'Used' attribute. + * @see #isUsed() + * @generated + */ + void setUsed(boolean value); + /** * Returns the value of the 'Lines' attribute list. * The list contents are of type {@link java.lang.String}. diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java index 7afae9d4f..ba9e5efbe 100644 --- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java +++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMFactory.java @@ -59,22 +59,22 @@ public interface FSMFactory extends EFactory StateGraphItem createStateGraphItem(); /** - * Returns a new object of class 'State'. + * Returns a new object of class 'State Graph'. * * - * @return a new object of class 'State'. + * @return a new object of class 'State Graph'. * @generated */ - State createState(); + StateGraph createStateGraph(); /** - * Returns a new object of class 'State Graph'. + * Returns a new object of class 'State'. * * - * @return a new object of class 'State Graph'. + * @return a new object of class 'State'. * @generated */ - StateGraph createStateGraph(); + State createState(); /** * Returns a new object of class 'Simple State'. @@ -319,6 +319,42 @@ public interface FSMFactory extends EFactory */ Guard createGuard(); + /** + * Returns a new object of class 'Protocol Semantics'. + * + * + * @return a new object of class 'Protocol Semantics'. + * @generated + */ + ProtocolSemantics createProtocolSemantics(); + + /** + * Returns a new object of class 'Semantics Rule'. + * + * + * @return a new object of class 'Semantics Rule'. + * @generated + */ + SemanticsRule createSemanticsRule(); + + /** + * Returns a new object of class 'In Semantics Rule'. + * + * + * @return a new object of class 'In Semantics Rule'. + * @generated + */ + InSemanticsRule createInSemanticsRule(); + + /** + * Returns a new object of class 'Out Semantics Rule'. + * + * + * @return a new object of class 'Out Semantics Rule'. + * @generated + */ + OutSemanticsRule createOutSemanticsRule(); + /** * Returns the package supported by this factory. * diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java index 80a06eb9c..5e71a35f7 100644 --- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java +++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/FSMPackage.java @@ -85,6 +85,25 @@ public interface FSMPackage extends EPackage */ int FSM_MODEL_FEATURE_COUNT = 1; + /** + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner IInterface Item Owner}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getIInterfaceItemOwner() + * @generated + */ + int IINTERFACE_ITEM_OWNER = 37; + + /** + * The number of structural features of the 'IInterface Item Owner' class. + * + * + * @generated + * @ordered + */ + int IINTERFACE_ITEM_OWNER_FEATURE_COUNT = 0; + /** * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.ModelComponentImpl Model Component}' class. * @@ -102,7 +121,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int MODEL_COMPONENT__ABSTRACT = 0; + int MODEL_COMPONENT__ABSTRACT = IINTERFACE_ITEM_OWNER_FEATURE_COUNT + 0; /** * The feature id for the 'Comm Type' attribute. @@ -111,7 +130,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int MODEL_COMPONENT__COMM_TYPE = 1; + int MODEL_COMPONENT__COMM_TYPE = IINTERFACE_ITEM_OWNER_FEATURE_COUNT + 1; /** * The feature id for the 'Component Name' attribute. @@ -120,7 +139,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int MODEL_COMPONENT__COMPONENT_NAME = 2; + int MODEL_COMPONENT__COMPONENT_NAME = IINTERFACE_ITEM_OWNER_FEATURE_COUNT + 2; /** * The feature id for the 'Base' reference. @@ -129,7 +148,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int MODEL_COMPONENT__BASE = 3; + int MODEL_COMPONENT__BASE = IINTERFACE_ITEM_OWNER_FEATURE_COUNT + 3; /** * The feature id for the 'State Machine' containment reference. @@ -138,7 +157,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int MODEL_COMPONENT__STATE_MACHINE = 4; + int MODEL_COMPONENT__STATE_MACHINE = IINTERFACE_ITEM_OWNER_FEATURE_COUNT + 4; /** * The number of structural features of the 'Model Component' class. @@ -147,7 +166,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int MODEL_COMPONENT_FEATURE_COUNT = 5; + int MODEL_COMPONENT_FEATURE_COUNT = IINTERFACE_ITEM_OWNER_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphItemImpl State Graph Item}' class. @@ -188,132 +207,132 @@ public interface FSMPackage extends EPackage int STATE_GRAPH_NODE_FEATURE_COUNT = STATE_GRAPH_ITEM_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl State}' class. + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl State Graph}' class. * * - * @see org.eclipse.etrice.core.fsm.fSM.impl.StateImpl - * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getState() + * @see org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getStateGraph() * @generated */ - int STATE = 4; + int STATE_GRAPH = 4; /** - * The feature id for the 'Docu' containment reference. + * The feature id for the 'States' containment reference list. * * * @generated * @ordered */ - int STATE__DOCU = STATE_GRAPH_NODE_FEATURE_COUNT + 0; + int STATE_GRAPH__STATES = 0; /** - * The feature id for the 'Entry Code' containment reference. + * The feature id for the 'Tr Points' containment reference list. * * * @generated * @ordered */ - int STATE__ENTRY_CODE = STATE_GRAPH_NODE_FEATURE_COUNT + 1; + int STATE_GRAPH__TR_POINTS = 1; /** - * The feature id for the 'Exit Code' containment reference. + * The feature id for the 'Ch Points' containment reference list. * * * @generated * @ordered */ - int STATE__EXIT_CODE = STATE_GRAPH_NODE_FEATURE_COUNT + 2; + int STATE_GRAPH__CH_POINTS = 2; /** - * The feature id for the 'Do Code' containment reference. + * The feature id for the 'Transitions' containment reference list. * * * @generated * @ordered */ - int STATE__DO_CODE = STATE_GRAPH_NODE_FEATURE_COUNT + 3; + int STATE_GRAPH__TRANSITIONS = 3; /** - * The feature id for the 'Subgraph' containment reference. + * The feature id for the 'Refined Transitions' containment reference list. * * * @generated * @ordered */ - int STATE__SUBGRAPH = STATE_GRAPH_NODE_FEATURE_COUNT + 4; + int STATE_GRAPH__REFINED_TRANSITIONS = 4; /** - * The number of structural features of the 'State' class. + * The number of structural features of the 'State Graph' class. * * * @generated * @ordered */ - int STATE_FEATURE_COUNT = STATE_GRAPH_NODE_FEATURE_COUNT + 5; + int STATE_GRAPH_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl State Graph}' class. + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl State}' class. * * - * @see org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl - * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getStateGraph() + * @see org.eclipse.etrice.core.fsm.fSM.impl.StateImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getState() * @generated */ - int STATE_GRAPH = 5; + int STATE = 5; /** - * The feature id for the 'States' containment reference list. + * The feature id for the 'Docu' containment reference. * * * @generated * @ordered */ - int STATE_GRAPH__STATES = 0; + int STATE__DOCU = STATE_GRAPH_NODE_FEATURE_COUNT + 0; /** - * The feature id for the 'Tr Points' containment reference list. + * The feature id for the 'Entry Code' containment reference. * * * @generated * @ordered */ - int STATE_GRAPH__TR_POINTS = 1; + int STATE__ENTRY_CODE = STATE_GRAPH_NODE_FEATURE_COUNT + 1; /** - * The feature id for the 'Ch Points' containment reference list. + * The feature id for the 'Exit Code' containment reference. * * * @generated * @ordered */ - int STATE_GRAPH__CH_POINTS = 2; + int STATE__EXIT_CODE = STATE_GRAPH_NODE_FEATURE_COUNT + 2; /** - * The feature id for the 'Transitions' containment reference list. + * The feature id for the 'Do Code' containment reference. * * * @generated * @ordered */ - int STATE_GRAPH__TRANSITIONS = 3; + int STATE__DO_CODE = STATE_GRAPH_NODE_FEATURE_COUNT + 3; /** - * The feature id for the 'Refined Transitions' containment reference list. + * The feature id for the 'Subgraph' containment reference. * * * @generated * @ordered */ - int STATE_GRAPH__REFINED_TRANSITIONS = 4; + int STATE__SUBGRAPH = STATE_GRAPH_NODE_FEATURE_COUNT + 4; /** - * The number of structural features of the 'State Graph' class. + * The number of structural features of the 'State' class. * * * @generated * @ordered */ - int STATE_GRAPH_FEATURE_COUNT = 5; + int STATE_FEATURE_COUNT = STATE_GRAPH_NODE_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.SimpleStateImpl Simple State}' class. @@ -471,6 +490,15 @@ public interface FSMPackage extends EPackage */ int DETAIL_CODE = 8; + /** + * The feature id for the 'Used' attribute. + * + * + * @generated + * @ordered + */ + int DETAIL_CODE__USED = 0; + /** * The feature id for the 'Lines' attribute list. * @@ -478,7 +506,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int DETAIL_CODE__LINES = 0; + int DETAIL_CODE__LINES = 1; /** * The number of structural features of the 'Detail Code' class. @@ -487,7 +515,7 @@ public interface FSMPackage extends EPackage * @generated * @ordered */ - int DETAIL_CODE_FEATURE_COUNT = 1; + int DETAIL_CODE_FEATURE_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.TrPointImpl Tr Point}' class. @@ -1512,6 +1540,145 @@ public interface FSMPackage extends EPackage */ int GUARD_FEATURE_COUNT = 1; + /** + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.ProtocolSemanticsImpl Protocol Semantics}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.ProtocolSemanticsImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getProtocolSemantics() + * @generated + */ + int PROTOCOL_SEMANTICS = 33; + + /** + * The feature id for the 'Rules' containment reference list. + * + * + * @generated + * @ordered + */ + int PROTOCOL_SEMANTICS__RULES = 0; + + /** + * The number of structural features of the 'Protocol Semantics' class. + * + * + * @generated + * @ordered + */ + int PROTOCOL_SEMANTICS_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.SemanticsRuleImpl Semantics Rule}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.SemanticsRuleImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getSemanticsRule() + * @generated + */ + int SEMANTICS_RULE = 34; + + /** + * The feature id for the 'Msg' reference. + * + * + * @generated + * @ordered + */ + int SEMANTICS_RULE__MSG = 0; + + /** + * The feature id for the 'Follow Ups' containment reference list. + * + * + * @generated + * @ordered + */ + int SEMANTICS_RULE__FOLLOW_UPS = 1; + + /** + * The number of structural features of the 'Semantics Rule' class. + * + * + * @generated + * @ordered + */ + int SEMANTICS_RULE_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.InSemanticsRuleImpl In Semantics Rule}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.InSemanticsRuleImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getInSemanticsRule() + * @generated + */ + int IN_SEMANTICS_RULE = 35; + + /** + * The feature id for the 'Msg' reference. + * + * + * @generated + * @ordered + */ + int IN_SEMANTICS_RULE__MSG = SEMANTICS_RULE__MSG; + + /** + * The feature id for the 'Follow Ups' containment reference list. + * + * + * @generated + * @ordered + */ + int IN_SEMANTICS_RULE__FOLLOW_UPS = SEMANTICS_RULE__FOLLOW_UPS; + + /** + * The number of structural features of the 'In Semantics Rule' class. + * + * + * @generated + * @ordered + */ + int IN_SEMANTICS_RULE_FEATURE_COUNT = SEMANTICS_RULE_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.OutSemanticsRuleImpl Out Semantics Rule}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.OutSemanticsRuleImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getOutSemanticsRule() + * @generated + */ + int OUT_SEMANTICS_RULE = 36; + + /** + * The feature id for the 'Msg' reference. + * + * + * @generated + * @ordered + */ + int OUT_SEMANTICS_RULE__MSG = SEMANTICS_RULE__MSG; + + /** + * The feature id for the 'Follow Ups' containment reference list. + * + * + * @generated + * @ordered + */ + int OUT_SEMANTICS_RULE__FOLLOW_UPS = SEMANTICS_RULE__FOLLOW_UPS; + + /** + * The number of structural features of the 'Out Semantics Rule' class. + * + * + * @generated + * @ordered + */ + int OUT_SEMANTICS_RULE_FEATURE_COUNT = SEMANTICS_RULE_FEATURE_COUNT + 0; + /** * The meta object id for the '{@link org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType Component Communication Type}' enum. * @@ -1520,7 +1687,7 @@ public interface FSMPackage extends EPackage * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getComponentCommunicationType() * @generated */ - int COMPONENT_COMMUNICATION_TYPE = 33; + int COMPONENT_COMMUNICATION_TYPE = 38; /** @@ -1630,134 +1797,134 @@ public interface FSMPackage extends EPackage EClass getStateGraphItem(); /** - * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.State State}'. + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph State Graph}'. * * - * @return the meta object for class 'State'. - * @see org.eclipse.etrice.core.fsm.fSM.State + * @return the meta object for class 'State Graph'. + * @see org.eclipse.etrice.core.fsm.fSM.StateGraph * @generated */ - EClass getState(); + EClass getStateGraph(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getDocu Docu}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getStates States}'. * * - * @return the meta object for the containment reference 'Docu'. - * @see org.eclipse.etrice.core.fsm.fSM.State#getDocu() - * @see #getState() + * @return the meta object for the containment reference list 'States'. + * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getStates() + * @see #getStateGraph() * @generated */ - EReference getState_Docu(); + EReference getStateGraph_States(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getEntryCode Entry Code}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getTrPoints Tr Points}'. * * - * @return the meta object for the containment reference 'Entry Code'. - * @see org.eclipse.etrice.core.fsm.fSM.State#getEntryCode() - * @see #getState() + * @return the meta object for the containment reference list 'Tr Points'. + * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getTrPoints() + * @see #getStateGraph() * @generated */ - EReference getState_EntryCode(); + EReference getStateGraph_TrPoints(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getExitCode Exit Code}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getChPoints Ch Points}'. * * - * @return the meta object for the containment reference 'Exit Code'. - * @see org.eclipse.etrice.core.fsm.fSM.State#getExitCode() - * @see #getState() + * @return the meta object for the containment reference list 'Ch Points'. + * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getChPoints() + * @see #getStateGraph() * @generated */ - EReference getState_ExitCode(); + EReference getStateGraph_ChPoints(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getDoCode Do Code}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getTransitions Transitions}'. * * - * @return the meta object for the containment reference 'Do Code'. - * @see org.eclipse.etrice.core.fsm.fSM.State#getDoCode() - * @see #getState() + * @return the meta object for the containment reference list 'Transitions'. + * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getTransitions() + * @see #getStateGraph() * @generated */ - EReference getState_DoCode(); + EReference getStateGraph_Transitions(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getSubgraph Subgraph}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getRefinedTransitions Refined Transitions}'. * * - * @return the meta object for the containment reference 'Subgraph'. - * @see org.eclipse.etrice.core.fsm.fSM.State#getSubgraph() - * @see #getState() + * @return the meta object for the containment reference list 'Refined Transitions'. + * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getRefinedTransitions() + * @see #getStateGraph() * @generated */ - EReference getState_Subgraph(); + EReference getStateGraph_RefinedTransitions(); /** - * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph State Graph}'. + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.State State}'. * * - * @return the meta object for class 'State Graph'. - * @see org.eclipse.etrice.core.fsm.fSM.StateGraph + * @return the meta object for class 'State'. + * @see org.eclipse.etrice.core.fsm.fSM.State * @generated */ - EClass getStateGraph(); + EClass getState(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getStates States}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getDocu Docu}'. * * - * @return the meta object for the containment reference list 'States'. - * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getStates() - * @see #getStateGraph() + * @return the meta object for the containment reference 'Docu'. + * @see org.eclipse.etrice.core.fsm.fSM.State#getDocu() + * @see #getState() * @generated */ - EReference getStateGraph_States(); + EReference getState_Docu(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getTrPoints Tr Points}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getEntryCode Entry Code}'. * * - * @return the meta object for the containment reference list 'Tr Points'. - * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getTrPoints() - * @see #getStateGraph() + * @return the meta object for the containment reference 'Entry Code'. + * @see org.eclipse.etrice.core.fsm.fSM.State#getEntryCode() + * @see #getState() * @generated */ - EReference getStateGraph_TrPoints(); + EReference getState_EntryCode(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getChPoints Ch Points}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getExitCode Exit Code}'. * * - * @return the meta object for the containment reference list 'Ch Points'. - * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getChPoints() - * @see #getStateGraph() + * @return the meta object for the containment reference 'Exit Code'. + * @see org.eclipse.etrice.core.fsm.fSM.State#getExitCode() + * @see #getState() * @generated */ - EReference getStateGraph_ChPoints(); + EReference getState_ExitCode(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getTransitions Transitions}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getDoCode Do Code}'. * * - * @return the meta object for the containment reference list 'Transitions'. - * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getTransitions() - * @see #getStateGraph() + * @return the meta object for the containment reference 'Do Code'. + * @see org.eclipse.etrice.core.fsm.fSM.State#getDoCode() + * @see #getState() * @generated */ - EReference getStateGraph_Transitions(); + EReference getState_DoCode(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.StateGraph#getRefinedTransitions Refined Transitions}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.core.fsm.fSM.State#getSubgraph Subgraph}'. * * - * @return the meta object for the containment reference list 'Refined Transitions'. - * @see org.eclipse.etrice.core.fsm.fSM.StateGraph#getRefinedTransitions() - * @see #getStateGraph() + * @return the meta object for the containment reference 'Subgraph'. + * @see org.eclipse.etrice.core.fsm.fSM.State#getSubgraph() + * @see #getState() * @generated */ - EReference getStateGraph_RefinedTransitions(); + EReference getState_Subgraph(); /** * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.SimpleState Simple State}'. @@ -1811,6 +1978,17 @@ public interface FSMPackage extends EPackage */ EClass getDetailCode(); + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.core.fsm.fSM.DetailCode#isUsed Used}'. + * + * + * @return the meta object for the attribute 'Used'. + * @see org.eclipse.etrice.core.fsm.fSM.DetailCode#isUsed() + * @see #getDetailCode() + * @generated + */ + EAttribute getDetailCode_Used(); + /** * Returns the meta object for the attribute list '{@link org.eclipse.etrice.core.fsm.fSM.DetailCode#getLines Lines}'. * @@ -2359,6 +2537,89 @@ public interface FSMPackage extends EPackage */ EReference getGuard_Guard(); + /** + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics Protocol Semantics}'. + * + * + * @return the meta object for class 'Protocol Semantics'. + * @see org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics + * @generated + */ + EClass getProtocolSemantics(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics#getRules Rules}'. + * + * + * @return the meta object for the containment reference list 'Rules'. + * @see org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics#getRules() + * @see #getProtocolSemantics() + * @generated + */ + EReference getProtocolSemantics_Rules(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.SemanticsRule Semantics Rule}'. + * + * + * @return the meta object for class 'Semantics Rule'. + * @see org.eclipse.etrice.core.fsm.fSM.SemanticsRule + * @generated + */ + EClass getSemanticsRule(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.etrice.core.fsm.fSM.SemanticsRule#getMsg Msg}'. + * + * + * @return the meta object for the reference 'Msg'. + * @see org.eclipse.etrice.core.fsm.fSM.SemanticsRule#getMsg() + * @see #getSemanticsRule() + * @generated + */ + EReference getSemanticsRule_Msg(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.core.fsm.fSM.SemanticsRule#getFollowUps Follow Ups}'. + * + * + * @return the meta object for the containment reference list 'Follow Ups'. + * @see org.eclipse.etrice.core.fsm.fSM.SemanticsRule#getFollowUps() + * @see #getSemanticsRule() + * @generated + */ + EReference getSemanticsRule_FollowUps(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.InSemanticsRule In Semantics Rule}'. + * + * + * @return the meta object for class 'In Semantics Rule'. + * @see org.eclipse.etrice.core.fsm.fSM.InSemanticsRule + * @generated + */ + EClass getInSemanticsRule(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.OutSemanticsRule Out Semantics Rule}'. + * + * + * @return the meta object for class 'Out Semantics Rule'. + * @see org.eclipse.etrice.core.fsm.fSM.OutSemanticsRule + * @generated + */ + EClass getOutSemanticsRule(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner IInterface Item Owner}'. + * + * + * @return the meta object for class 'IInterface Item Owner'. + * @see org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner + * @generated + */ + EClass getIInterfaceItemOwner(); + /** * Returns the meta object for enum '{@link org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType Component Communication Type}'. * @@ -2481,104 +2742,104 @@ public interface FSMPackage extends EPackage EClass STATE_GRAPH_ITEM = eINSTANCE.getStateGraphItem(); /** - * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl State}' class. + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl State Graph}' class. * * - * @see org.eclipse.etrice.core.fsm.fSM.impl.StateImpl - * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getState() + * @see org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getStateGraph() * @generated */ - EClass STATE = eINSTANCE.getState(); + EClass STATE_GRAPH = eINSTANCE.getStateGraph(); /** - * The meta object literal for the 'Docu' containment reference feature. + * The meta object literal for the 'States' containment reference list feature. * * * @generated */ - EReference STATE__DOCU = eINSTANCE.getState_Docu(); + EReference STATE_GRAPH__STATES = eINSTANCE.getStateGraph_States(); /** - * The meta object literal for the 'Entry Code' containment reference feature. + * The meta object literal for the 'Tr Points' containment reference list feature. * * * @generated */ - EReference STATE__ENTRY_CODE = eINSTANCE.getState_EntryCode(); + EReference STATE_GRAPH__TR_POINTS = eINSTANCE.getStateGraph_TrPoints(); /** - * The meta object literal for the 'Exit Code' containment reference feature. + * The meta object literal for the 'Ch Points' containment reference list feature. * * * @generated */ - EReference STATE__EXIT_CODE = eINSTANCE.getState_ExitCode(); + EReference STATE_GRAPH__CH_POINTS = eINSTANCE.getStateGraph_ChPoints(); /** - * The meta object literal for the 'Do Code' containment reference feature. + * The meta object literal for the 'Transitions' containment reference list feature. * * * @generated */ - EReference STATE__DO_CODE = eINSTANCE.getState_DoCode(); + EReference STATE_GRAPH__TRANSITIONS = eINSTANCE.getStateGraph_Transitions(); /** - * The meta object literal for the 'Subgraph' containment reference feature. + * The meta object literal for the 'Refined Transitions' containment reference list feature. * * * @generated */ - EReference STATE__SUBGRAPH = eINSTANCE.getState_Subgraph(); + EReference STATE_GRAPH__REFINED_TRANSITIONS = eINSTANCE.getStateGraph_RefinedTransitions(); /** - * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl State Graph}' class. + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.StateImpl State}' class. * * - * @see org.eclipse.etrice.core.fsm.fSM.impl.StateGraphImpl - * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getStateGraph() + * @see org.eclipse.etrice.core.fsm.fSM.impl.StateImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getState() * @generated */ - EClass STATE_GRAPH = eINSTANCE.getStateGraph(); + EClass STATE = eINSTANCE.getState(); /** - * The meta object literal for the 'States' containment reference list feature. + * The meta object literal for the 'Docu' containment reference feature. * * * @generated */ - EReference STATE_GRAPH__STATES = eINSTANCE.getStateGraph_States(); + EReference STATE__DOCU = eINSTANCE.getState_Docu(); /** - * The meta object literal for the 'Tr Points' containment reference list feature. + * The meta object literal for the 'Entry Code' containment reference feature. * * * @generated */ - EReference STATE_GRAPH__TR_POINTS = eINSTANCE.getStateGraph_TrPoints(); + EReference STATE__ENTRY_CODE = eINSTANCE.getState_EntryCode(); /** - * The meta object literal for the 'Ch Points' containment reference list feature. + * The meta object literal for the 'Exit Code' containment reference feature. * * * @generated */ - EReference STATE_GRAPH__CH_POINTS = eINSTANCE.getStateGraph_ChPoints(); + EReference STATE__EXIT_CODE = eINSTANCE.getState_ExitCode(); /** - * The meta object literal for the 'Transitions' containment reference list feature. + * The meta object literal for the 'Do Code' containment reference feature. * * * @generated */ - EReference STATE_GRAPH__TRANSITIONS = eINSTANCE.getStateGraph_Transitions(); + EReference STATE__DO_CODE = eINSTANCE.getState_DoCode(); /** - * The meta object literal for the 'Refined Transitions' containment reference list feature. + * The meta object literal for the 'Subgraph' containment reference feature. * * * @generated */ - EReference STATE_GRAPH__REFINED_TRANSITIONS = eINSTANCE.getStateGraph_RefinedTransitions(); + EReference STATE__SUBGRAPH = eINSTANCE.getState_Subgraph(); /** * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.SimpleStateImpl Simple State}' class. @@ -2626,6 +2887,14 @@ public interface FSMPackage extends EPackage */ EClass DETAIL_CODE = eINSTANCE.getDetailCode(); + /** + * The meta object literal for the 'Used' attribute feature. + * + * + * @generated + */ + EAttribute DETAIL_CODE__USED = eINSTANCE.getDetailCode_Used(); + /** * The meta object literal for the 'Lines' attribute list feature. * @@ -3090,6 +3359,80 @@ public interface FSMPackage extends EPackage */ EReference GUARD__GUARD = eINSTANCE.getGuard_Guard(); + /** + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.ProtocolSemanticsImpl Protocol Semantics}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.ProtocolSemanticsImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getProtocolSemantics() + * @generated + */ + EClass PROTOCOL_SEMANTICS = eINSTANCE.getProtocolSemantics(); + + /** + * The meta object literal for the 'Rules' containment reference list feature. + * + * + * @generated + */ + EReference PROTOCOL_SEMANTICS__RULES = eINSTANCE.getProtocolSemantics_Rules(); + + /** + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.SemanticsRuleImpl Semantics Rule}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.SemanticsRuleImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getSemanticsRule() + * @generated + */ + EClass SEMANTICS_RULE = eINSTANCE.getSemanticsRule(); + + /** + * The meta object literal for the 'Msg' reference feature. + * + * + * @generated + */ + EReference SEMANTICS_RULE__MSG = eINSTANCE.getSemanticsRule_Msg(); + + /** + * The meta object literal for the 'Follow Ups' containment reference list feature. + * + * + * @generated + */ + EReference SEMANTICS_RULE__FOLLOW_UPS = eINSTANCE.getSemanticsRule_FollowUps(); + + /** + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.InSemanticsRuleImpl In Semantics Rule}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.InSemanticsRuleImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getInSemanticsRule() + * @generated + */ + EClass IN_SEMANTICS_RULE = eINSTANCE.getInSemanticsRule(); + + /** + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.impl.OutSemanticsRuleImpl Out Semantics Rule}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.impl.OutSemanticsRuleImpl + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getOutSemanticsRule() + * @generated + */ + EClass OUT_SEMANTICS_RULE = eINSTANCE.getOutSemanticsRule(); + + /** + * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner IInterface Item Owner}' class. + * + * + * @see org.eclipse.etrice.core.fsm.fSM.IInterfaceItemOwner + * @see org.eclipse.etrice.core.fsm.fSM.impl.FSMPackageImpl#getIInterfaceItemOwner() + * @generated + */ + EClass IINTERFACE_ITEM_OWNER = eINSTANCE.getIInterfaceItemOwner(); + /** * The meta object literal for the '{@link org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType Component Communication Type}' enum. * diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/IInterfaceItemOwner.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/IInterfaceItemOwner.java new file mode 100644 index 000000000..d29f19795 --- /dev/null +++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/IInterfaceItemOwner.java @@ -0,0 +1,37 @@ +/** + */ +package org.eclipse.etrice.core.fsm.fSM; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'IInterface Item Owner'. + * + * + * + * @see org.eclipse.etrice.core.fsm.fSM.FSMPackage#getIInterfaceItemOwner() + * @model interface="true" abstract="true" + * @generated + */ +public interface IInterfaceItemOwner extends EObject +{ + /** + * + * + * @model kind="operation" + * @generated + */ + EList+ * The semantics are composed using {@link SemanticsRule}s. + *
+ * + * + * + *+ * The following features are supported: + *
+ * The following features are supported: + *
* The following features are implemented: *
+ *
+ * + * @generated + */ +public class InSemanticsRuleImpl extends SemanticsRuleImpl implements InSemanticsRule +{ + /** + * + * + * @generated + */ + protected InSemanticsRuleImpl() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return FSMPackage.Literals.IN_SEMANTICS_RULE; + } + +} //InSemanticsRuleImpl diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java index 26b1ffa50..d49309442 100644 --- a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java +++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ModelComponentImpl.java @@ -5,12 +5,15 @@ package org.eclipse.etrice.core.fsm.fSM.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem; import org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType; import org.eclipse.etrice.core.fsm.fSM.FSMPackage; import org.eclipse.etrice.core.fsm.fSM.ModelComponent; @@ -296,6 +299,30 @@ public class ModelComponentImpl extends MinimalEObjectImpl.Container implements eNotify(new ENotificationImpl(this, Notification.SET, FSMPackage.MODEL_COMPONENT__STATE_MACHINE, newStateMachine, newStateMachine)); } + /** + * + * + * @generated + */ + public EList+ *
+ * + * @generated + */ +public class OutSemanticsRuleImpl extends SemanticsRuleImpl implements OutSemanticsRule +{ + /** + * + * + * @generated + */ + protected OutSemanticsRuleImpl() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return FSMPackage.Literals.OUT_SEMANTICS_RULE; + } + +} //OutSemanticsRuleImpl diff --git a/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java new file mode 100644 index 000000000..d5158e287 --- /dev/null +++ b/plugins/org.eclipse.etrice.core.fsm/src-gen/org/eclipse/etrice/core/fsm/fSM/impl/ProtocolSemanticsImpl.java @@ -0,0 +1,167 @@ +/** + */ +package org.eclipse.etrice.core.fsm.fSM.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.etrice.core.fsm.fSM.FSMPackage; +import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics; +import org.eclipse.etrice.core.fsm.fSM.SemanticsRule; + +/** + * + * An implementation of the model object 'Protocol Semantics'. + * + *+ * The following features are implemented: + *
+ * The following features are implemented: + *
+ The semantics are composed using {@link SemanticsRule}s. +
+ ''') + + cls.getReference("rules").setDocumentation( + ''' + This is a list of semantic rules. + ''') + + //------------------------------------------------------------------ + cls = pckg.getClass("SemanticsRule") + cls.setDocumentation(''' + The super class of +"); + _builder_71.newLine(); + _builder_71.append("The semantics are composed using {@link SemanticsRule}s."); + _builder_71.newLine(); + _builder_71.append("
"); + _builder_71.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_71.toString()); + EReference _reference_32 = PostprocessingHelpers.getReference(cls, "rules"); + StringConcatenation _builder_72 = new StringConcatenation(); + _builder_72.append("This is a list of semantic rules."); + _builder_72.newLine(); + PostprocessingHelpers.setDocumentation(_reference_32, _builder_72.toString()); + EClass _class_31 = PostprocessingHelpers.getClass(pckg, "SemanticsRule"); + cls = _class_31; + StringConcatenation _builder_73 = new StringConcatenation(); + _builder_73.append("The super class of"); + _builder_73.newLine(); + _builder_73.append("June 5, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.ecore b/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.ecore index 3745ffdb0..f0c886f34 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.ecore +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/model/fsmgen.ecore @@ -9,7 +9,7 @@- * The semantics are composed using {@link SemanticsRule}s. - *
- * - * - * - *- * The following features are supported: - *
- * The following features are supported: - *
- *
- * - * @generated - */ -public class InSemanticsRuleImpl extends SemanticsRuleImpl implements InSemanticsRule -{ - /** - * - * - * @generated - */ - protected InSemanticsRuleImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return RoomPackage.Literals.IN_SEMANTICS_RULE; - } - -} //InSemanticsRuleImpl diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java index afa35c1c2..f7d05f029 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java @@ -2,17 +2,26 @@ */ package org.eclipse.etrice.core.room.impl; +import org.eclipse.emf.common.util.BasicEList; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; +import org.eclipse.etrice.core.fsm.fSM.AbstractMessage; +import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics; + import org.eclipse.etrice.core.fsm.fSM.impl.AbstractInterfaceItemImpl; import org.eclipse.etrice.core.room.GeneralProtocolClass; import org.eclipse.etrice.core.room.InterfaceItem; import org.eclipse.etrice.core.room.Port; +import org.eclipse.etrice.core.room.ProtocolClass; import org.eclipse.etrice.core.room.RoomPackage; import org.eclipse.etrice.core.room.SAP; import org.eclipse.etrice.core.room.SPP; +import org.eclipse.etrice.core.room.util.RoomHelpers; + /** * * An implementation of the model object 'Interface Item'. @@ -62,4 +71,40 @@ public class InterfaceItemImpl extends AbstractInterfaceItemImpl implements Inte } + /** + * + * + * @generated + */ + public ProtocolSemantics getSemantics() + { + if (getGeneralProtocol() instanceof ProtocolClass) + return ((ProtocolClass)getGeneralProtocol()).getSemantics(); + else + return null; + + } + + /** + * + * + * @generated + */ + public EList- *
- * - * @generated - */ -public class OutSemanticsRuleImpl extends SemanticsRuleImpl implements OutSemanticsRule -{ - /** - * - * - * @generated - */ - protected OutSemanticsRuleImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return RoomPackage.Literals.OUT_SEMANTICS_RULE; - } - -} //OutSemanticsRuleImpl diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java index 9fed3ea2c..f3c8ed47f 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java @@ -18,12 +18,12 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.etrice.core.fsm.fSM.DetailCode; +import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics; import org.eclipse.etrice.core.room.CommunicationType; import org.eclipse.etrice.core.room.Message; import org.eclipse.etrice.core.room.PortClass; import org.eclipse.etrice.core.room.ProtocolClass; -import org.eclipse.etrice.core.room.ProtocolSemantics; import org.eclipse.etrice.core.room.RoomPackage; /** diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java deleted file mode 100644 index 27ceb46bc..000000000 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java +++ /dev/null @@ -1,167 +0,0 @@ -/** - */ -package org.eclipse.etrice.core.room.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.etrice.core.room.ProtocolSemantics; -import org.eclipse.etrice.core.room.RoomPackage; -import org.eclipse.etrice.core.room.SemanticsRule; - -/** - * - * An implementation of the model object 'Protocol Semantics'. - * - *- * The following features are implemented: - *
- * The following features are implemented: - *
- The semantics are composed using {@link SemanticsRule}s. -
- ''') - - cls.getReference("rules").setDocumentation( - ''' - This is a list of semantic rules. - ''') - - //------------------------------------------------------------------ - cls = pckg.getClass("SemanticsRule") - cls.setDocumentation(''' - The super class of -goUpIfNeeded=false.
- *
- * @param base the base path
- * @param path the path for which the relative path is computed
- * @return relative path (nullif there is none)
- */
- public static String getRelativePath(String base, String path) {
- return getRelativePath(URI.createFileURI(base), URI.createFileURI(path), false);
- }
-
- /**
- * the given paths are converted to file URIs (using {@link URI#createFileURI(String)}
- * and then {@link #getRelativePath(URI, URI, boolean)} is called.
- *
- * @param base the base path
- * @param path the path for which the relative path is computed
- * @param goUpIfNeeded allow also ascending to parent directories
- * @return relative path (nullif there is none)
- */
- public static String getRelativePath(String base, String path, boolean goUpIfNeeded) {
- return getRelativePath(URI.createFileURI(base), URI.createFileURI(path), goUpIfNeeded);
- }
-
- /**
- * {@link #getRelativePath(URI, URI, boolean)} is called with
- * goUpIfNeeded=false
- *
- * @param base the base path
- * @param path the path for which the relative path is computed
- * @return relative path (nullif there is none)
- */
- public static String getRelativePath(URI base, URI path) {
- return getRelativePath(base, path, false);
- }
-
- /**
- * compute a relative path to a given base path.
- * Both paths must be of the same scheme and absolute and the given
- * path has to have the first segments identical with the base path.
- * Returned is a relative path separated by / characters.
- * If there is no such relative path null is returned.
- *
- * @param base the base path
- * @param path the path for which the relative path is computed
- * @param goUpIfNeeded allow also ascending to parent directories
- * @return relative path (nullif there is none)
- */
- public static String getRelativePath(URI base, URI path, boolean goUpIfNeeded) {
- if (base==null || path==null)
- return null;
-
- if (!bothNullOrEqual(base.scheme(),path.scheme()))
- return null;
-
- if (!base.hasAbsolutePath())
- return null;
-
- if (!path.hasAbsolutePath())
- return null;
-
- if (!bothNullOrEqual(path.device(), base.device()))
- return null;
-
- StringBuffer result = new StringBuffer();
- if (goUpIfNeeded) {
- int max = base.segmentCount()"); _builder_103.newLine(); + _builder_103.append("The actor class in ROOM has three compartments which aren\'t represented as separate model objects."); _builder_103.newLine(); - _builder_103.append("
"); + _builder_103.append("To understand to which compartment an attribute or reference belongs to here is a list"); + _builder_103.newLine(); + _builder_103.append("
"); - _builder_110.newLine(); - _builder_110.append("The actor class in ROOM has three compartments which aren\'t represented as separate model objects."); - _builder_110.newLine(); - _builder_110.append("To understand to which compartment an attribute or reference belongs to here is a list"); - _builder_110.newLine(); - _builder_110.append("
"); + _builder_121.newLine(); + _builder_121.append("Ports can have a multiplicity. If it is greater one the port is called replicated."); + _builder_121.newLine(); + _builder_121.append("
"); + _builder_121.newLine(); + _builder_121.newLine(); + _builder_121.append(""); + _builder_121.newLine(); + _builder_121.append("Whether a port is a relay port or not is a property that is derived from how it is"); + _builder_121.newLine(); + _builder_121.append("referenced by its {@link ActorClass}:"); + _builder_121.newLine(); + _builder_121.append("
"); + _builder_128.append("A service access point is similar to a {@link Port} but is not explicitly bound to a peer."); _builder_128.newLine(); - _builder_128.append("Ports can have a multiplicity. If it is greater one the port is called replicated."); + _builder_128.append("Rather, it is bound to a {@link ServiceImplementation} which is connected to one of the"); _builder_128.newLine(); - _builder_128.append("
"); + _builder_128.append("containing actors."); _builder_128.newLine(); _builder_128.newLine(); _builder_128.append(""); _builder_128.newLine(); - _builder_128.append("Whether a port is a relay port or not is a property that is derived from how it is"); - _builder_128.newLine(); - _builder_128.append("referenced by its {@link ActorClass}:"); - _builder_128.newLine(); - _builder_128.append("
"); + _builder_130.newLine(); + _builder_130.append("An SPP is associated with a {@link ProtocolClass} and is regular to this protocol."); + _builder_130.newLine(); + _builder_130.append("
"); + _builder_130.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_130.toString()); + EReference _reference_72 = PostprocessingHelpers.getReference(cls, "protocol"); StringConcatenation _builder_131 = new StringConcatenation(); - _builder_131.append("This is the port\'s protocol class."); + _builder_131.append("This is the SAP\'s protocol class."); _builder_131.newLine(); - PostprocessingHelpers.setDocumentation(_reference_71, _builder_131.toString()); - EReference _reference_72 = PostprocessingHelpers.getReference(cls, "docu"); + PostprocessingHelpers.setDocumentation(_reference_72, _builder_131.toString()); + EClass _class_31 = PostprocessingHelpers.getClass(pckg, "ServiceImplementation"); + cls = _class_31; StringConcatenation _builder_132 = new StringConcatenation(); - _builder_132.append("This is an optional documentation."); + _builder_132.append("A service implementation can be reagrded as the replicated peer port of all {@link SAP}s"); _builder_132.newLine(); - PostprocessingHelpers.setDocumentation(_reference_72, _builder_132.toString()); - EClass _class_32 = PostprocessingHelpers.getClass(pckg, "ExternalPort"); - cls = _class_32; + _builder_132.append("that are bound to it following the service resolution logic."); + _builder_132.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_132.toString()); + EReference _reference_73 = PostprocessingHelpers.getReference(cls, "spp"); StringConcatenation _builder_133 = new StringConcatenation(); - _builder_133.append("An external port is part of the actor structure and references an interface port."); - _builder_133.newLine(); - _builder_133.append("An interface port which is referenced by an external port is an external end port."); - _builder_133.newLine(); - _builder_133.append("If it is not referenced it is a relay port."); + _builder_133.append("This is the SPP connected to the service."); _builder_133.newLine(); - _builder_133.newLine(); - _builder_133.append("@see Port"); - _builder_133.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_133.toString()); - EReference _reference_73 = PostprocessingHelpers.getReference(cls, "interfacePort"); + PostprocessingHelpers.setDocumentation(_reference_73, _builder_133.toString()); + EClass _class_32 = PostprocessingHelpers.getClass(pckg, "LogicalSystem"); + cls = _class_32; StringConcatenation _builder_134 = new StringConcatenation(); - _builder_134.append("This is the referenced interface port of the actor class which is now an external end port."); + _builder_134.append("The top level structural class. It can only contain sub systems using {@link SubSystemRef}s."); _builder_134.newLine(); - PostprocessingHelpers.setDocumentation(_reference_73, _builder_134.toString()); - EClass _class_33 = PostprocessingHelpers.getClass(pckg, "SAP"); - cls = _class_33; + _builder_134.append("This way the logical system is composed of sub system instances. It also defines"); + _builder_134.newLine(); + _builder_134.append("{@link Binding}s and {@link LayerConnection}s between those sub systems."); + _builder_134.newLine(); + _builder_134.newLine(); + _builder_134.append(""); + _builder_134.newLine(); + _builder_134.append("The logical system is the root of the instance tree of the generator model."); + _builder_134.newLine(); + _builder_134.append("Each {@link SubSystemRef} is turned into a {@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance} and each"); + _builder_134.newLine(); + _builder_134.append("{@link ActorRef} is turned into an {@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance}."); + _builder_134.newLine(); + _builder_134.append("
"); + _builder_134.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_134.toString()); + EReference _reference_74 = PostprocessingHelpers.getReference(cls, "subSystems"); StringConcatenation _builder_135 = new StringConcatenation(); - _builder_135.append("A service access point is similar to a {@link Port} but is not explicitly bound to a peer."); + _builder_135.append("The list of all sub systems contained in the logical system."); _builder_135.newLine(); - _builder_135.append("Rather, it is bound to a {@link ServiceImplementation} which is connected to one of the"); - _builder_135.newLine(); - _builder_135.append("containing actors."); - _builder_135.newLine(); - _builder_135.newLine(); - _builder_135.append(""); - _builder_135.newLine(); - _builder_135.append("An SAP is associated with a {@link ProtocolClass} and is conjugate to this protocol."); - _builder_135.newLine(); - _builder_135.append("
"); - _builder_135.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_135.toString()); - EReference _reference_74 = PostprocessingHelpers.getReference(cls, "protocol"); + PostprocessingHelpers.setDocumentation(_reference_74, _builder_135.toString()); + EClass _class_33 = PostprocessingHelpers.getClass(pckg, "ActorContainerRef"); + cls = _class_33; StringConcatenation _builder_136 = new StringConcatenation(); - _builder_136.append("This is the SAP\'s protocol class."); + _builder_136.append("The super class of"); _builder_136.newLine(); - PostprocessingHelpers.setDocumentation(_reference_74, _builder_136.toString()); - EClass _class_34 = PostprocessingHelpers.getClass(pckg, "SPP"); - cls = _class_34; + _builder_136.append(""); - _builder_137.newLine(); - _builder_137.append("An SPP is associated with a {@link ProtocolClass} and is regular to this protocol."); - _builder_137.newLine(); - _builder_137.append("
"); - _builder_137.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_137.toString()); - EReference _reference_75 = PostprocessingHelpers.getReference(cls, "protocol"); + PostprocessingHelpers.setDocumentation(_attribute_27, _builder_137.toString()); + EReference _reference_75 = PostprocessingHelpers.getReference(cls, "docu"); StringConcatenation _builder_138 = new StringConcatenation(); - _builder_138.append("This is the SAP\'s protocol class."); + _builder_138.append("This is an optional documentation."); _builder_138.newLine(); PostprocessingHelpers.setDocumentation(_reference_75, _builder_138.toString()); - EClass _class_35 = PostprocessingHelpers.getClass(pckg, "ServiceImplementation"); - cls = _class_35; + EClass _class_34 = PostprocessingHelpers.getClass(pckg, "SubSystemRef"); + cls = _class_34; StringConcatenation _builder_139 = new StringConcatenation(); - _builder_139.append("A service implementation can be reagrded as the replicated peer port of all {@link SAP}s"); + _builder_139.append("A means to compose {@link LogicalSystem}s of {@link SubSystemClass}es. Each ref will"); _builder_139.newLine(); - _builder_139.append("that are bound to it following the service resolution logic."); + _builder_139.append("be turned into a sub system instance of the referenced type."); _builder_139.newLine(); PostprocessingHelpers.setDocumentation(cls, _builder_139.toString()); - EReference _reference_76 = PostprocessingHelpers.getReference(cls, "spp"); + EReference _reference_76 = PostprocessingHelpers.getReference(cls, "type"); StringConcatenation _builder_140 = new StringConcatenation(); - _builder_140.append("This is the SPP connected to the service."); + _builder_140.append("The type of the reference."); _builder_140.newLine(); PostprocessingHelpers.setDocumentation(_reference_76, _builder_140.toString()); - EClass _class_36 = PostprocessingHelpers.getClass(pckg, "LogicalSystem"); - cls = _class_36; + EClass _class_35 = PostprocessingHelpers.getClass(pckg, "SubSystemClass"); + cls = _class_35; StringConcatenation _builder_141 = new StringConcatenation(); - _builder_141.append("The top level structural class. It can only contain sub systems using {@link SubSystemRef}s."); - _builder_141.newLine(); - _builder_141.append("This way the logical system is composed of sub system instances. It also defines"); + _builder_141.append("A sub system class corresponds to a process with a separate address space."); _builder_141.newLine(); - _builder_141.append("{@link Binding}s and {@link LayerConnection}s between those sub systems."); + _builder_141.append("It has no behavior of its own and is composed of {@link ActorClass}es."); _builder_141.newLine(); _builder_141.newLine(); _builder_141.append(""); _builder_141.newLine(); - _builder_141.append("The logical system is the root of the instance tree of the generator model."); + _builder_141.append("Sub systems can be connected using {@link Port}s and {@link Binding}s."); _builder_141.newLine(); - _builder_141.append("Each {@link SubSystemRef} is turned into a {@link org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance} and each"); + _builder_141.append("All ports of a sub system are relay ports."); _builder_141.newLine(); - _builder_141.append("{@link ActorRef} is turned into an {@link org.eclipse.etrice.core.genmodel.etricegen.ActorInstance}."); + _builder_141.append("
"); + _builder_141.newLine(); + _builder_141.newLine(); + _builder_141.append(""); + _builder_141.newLine(); + _builder_141.append("Sub systems can define an arbitrary number of logical threads onto which their actor"); + _builder_141.newLine(); + _builder_141.append("instances are mapped."); _builder_141.newLine(); _builder_141.append("
"); _builder_141.newLine(); PostprocessingHelpers.setDocumentation(cls, _builder_141.toString()); - EReference _reference_77 = PostprocessingHelpers.getReference(cls, "subSystems"); + EReference _reference_77 = PostprocessingHelpers.getReference(cls, "relayPorts"); StringConcatenation _builder_142 = new StringConcatenation(); - _builder_142.append("The list of all sub systems contained in the logical system."); + _builder_142.append("This is a list of all relay ports of the sub system."); _builder_142.newLine(); PostprocessingHelpers.setDocumentation(_reference_77, _builder_142.toString()); - EClass _class_37 = PostprocessingHelpers.getClass(pckg, "ActorContainerRef"); - cls = _class_37; + EReference _reference_78 = PostprocessingHelpers.getReference(cls, "threads"); StringConcatenation _builder_143 = new StringConcatenation(); - _builder_143.append("The super class of"); - _builder_143.newLine(); - _builder_143.append(""); - _builder_148.newLine(); - _builder_148.append("Sub systems can be connected using {@link Port}s and {@link Binding}s."); - _builder_148.newLine(); - _builder_148.append("All ports of a sub system are relay ports."); - _builder_148.newLine(); - _builder_148.append("
"); + _builder_148.append("An actor instance mapping maps an actor instances (described as a path of actor references)"); _builder_148.newLine(); - _builder_148.newLine(); - _builder_148.append(""); - _builder_148.newLine(); - _builder_148.append("Sub systems can define an arbitrary number of logical threads onto which their actor"); - _builder_148.newLine(); - _builder_148.append("instances are mapped."); - _builder_148.newLine(); - _builder_148.append("
"); + _builder_148.append("to a {@link LogicalThread}"); _builder_148.newLine(); PostprocessingHelpers.setDocumentation(cls, _builder_148.toString()); - EReference _reference_80 = PostprocessingHelpers.getReference(cls, "relayPorts"); + EReference _reference_81 = PostprocessingHelpers.getReference(cls, "path"); StringConcatenation _builder_149 = new StringConcatenation(); - _builder_149.append("This is a list of all relay ports of the sub system."); + _builder_149.append("This is the path of references starting at this sub system that uniquely references an actor instance."); _builder_149.newLine(); - PostprocessingHelpers.setDocumentation(_reference_80, _builder_149.toString()); - EReference _reference_81 = PostprocessingHelpers.getReference(cls, "threads"); + PostprocessingHelpers.setDocumentation(_reference_81, _builder_149.toString()); + EReference _reference_82 = PostprocessingHelpers.getReference(cls, "thread"); StringConcatenation _builder_150 = new StringConcatenation(); - _builder_150.append("This is a list of all threads of the sub system."); + _builder_150.append("This is the logical thread to which the referenced actor instance and all of its contained instances"); _builder_150.newLine(); - PostprocessingHelpers.setDocumentation(_reference_81, _builder_150.toString()); - EReference _reference_82 = PostprocessingHelpers.getReference(cls, "threads"); + _builder_150.append("are mapped."); + _builder_150.newLine(); + PostprocessingHelpers.setDocumentation(_reference_82, _builder_150.toString()); + EReference _reference_83 = PostprocessingHelpers.getReference(cls, "actorInstanceMappings"); StringConcatenation _builder_151 = new StringConcatenation(); - _builder_151.append("This is a list of all actor instance mappings of the sub system."); + _builder_151.append("This is a list of nested mappings which override parent mappings."); _builder_151.newLine(); - PostprocessingHelpers.setDocumentation(_reference_82, _builder_151.toString()); - EReference _reference_83 = PostprocessingHelpers.getReference(cls, "actorInstanceMappings"); + PostprocessingHelpers.setDocumentation(_reference_83, _builder_151.toString()); + EClass _class_38 = PostprocessingHelpers.getClass(pckg, "RefPath"); + cls = _class_38; StringConcatenation _builder_152 = new StringConcatenation(); - _builder_152.append("This is a list of actor instance mappings."); + _builder_152.append("A path of strings that are interpreted as {@link org.eclipse.etrice.core.room.ActorRef}s starting at a {@link org.eclipse.etrice.core.room.SubSystemClass}."); _builder_152.newLine(); - PostprocessingHelpers.setDocumentation(_reference_83, _builder_152.toString()); - EClass _class_40 = PostprocessingHelpers.getClass(pckg, "LogicalThread"); - cls = _class_40; + PostprocessingHelpers.setDocumentation(cls, _builder_152.toString()); + EReference _reference_84 = PostprocessingHelpers.getReference(cls, "refs"); StringConcatenation _builder_153 = new StringConcatenation(); - _builder_153.append("A logical thread is addressed by the {@link ActorInstanceMapping}s of a {@link SubSystemClass}."); + _builder_153.append("This is a path in the instance tree where each segment corresponds to the name of the"); _builder_153.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_153.toString()); - EAttribute _attribute_28 = PostprocessingHelpers.getAttribute(cls, "name"); + _builder_153.append("corresponding {@link ActorContainerRef}."); + _builder_153.newLine(); + PostprocessingHelpers.setDocumentation(_reference_84, _builder_153.toString()); + EClass _class_39 = PostprocessingHelpers.getClass(pckg, "RefSegment"); + cls = _class_39; StringConcatenation _builder_154 = new StringConcatenation(); - _builder_154.append("By this name the thread is referred to in the model."); + _builder_154.append("A segment of a {@link RefPath}. It consists of a name and an optional index."); _builder_154.newLine(); - PostprocessingHelpers.setDocumentation(_attribute_28, _builder_154.toString()); - EClass _class_41 = PostprocessingHelpers.getClass(pckg, "ActorInstanceMapping"); - cls = _class_41; + _builder_154.append("If the index is not set it will be {@code -1}."); + _builder_154.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_154.toString()); + EAttribute _attribute_29 = PostprocessingHelpers.getAttribute(cls, "ref"); StringConcatenation _builder_155 = new StringConcatenation(); - _builder_155.append("An actor instance mapping maps an actor instances (described as a path of actor references)"); - _builder_155.newLine(); - _builder_155.append("to a {@link LogicalThread}"); + _builder_155.append("The segment name corresponding to an actor reference."); _builder_155.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_155.toString()); - EReference _reference_84 = PostprocessingHelpers.getReference(cls, "path"); + PostprocessingHelpers.setDocumentation(_attribute_29, _builder_155.toString()); + EAttribute _attribute_30 = PostprocessingHelpers.getAttribute(cls, "idx"); StringConcatenation _builder_156 = new StringConcatenation(); - _builder_156.append("This is the path of references starting at this sub system that uniquely references an actor instance."); + _builder_156.append("The optional index of the reference (for replicated actors)."); + _builder_156.newLine(); + _builder_156.append("If not set the index is {@code -1}."); _builder_156.newLine(); - PostprocessingHelpers.setDocumentation(_reference_84, _builder_156.toString()); - EReference _reference_85 = PostprocessingHelpers.getReference(cls, "thread"); + PostprocessingHelpers.setDocumentation(_attribute_30, _builder_156.toString()); + EClass _class_40 = PostprocessingHelpers.getClass(pckg, "Binding"); + cls = _class_40; StringConcatenation _builder_157 = new StringConcatenation(); - _builder_157.append("This is the logical thread to which the referenced actor instance and all of its contained instances"); + _builder_157.append("A binding connects two {@link Port}s."); _builder_157.newLine(); - _builder_157.append("are mapped."); + _builder_157.append("To be able to distinguish the ports of two {@link ActorContainerRef}s of the same type"); _builder_157.newLine(); - PostprocessingHelpers.setDocumentation(_reference_85, _builder_157.toString()); - EReference _reference_86 = PostprocessingHelpers.getReference(cls, "actorInstanceMappings"); + _builder_157.append("a {@link BindingEndPoint} is needed for disambiguation."); + _builder_157.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_157.toString()); + EReference _reference_85 = PostprocessingHelpers.getReference(cls, "endpoint1"); StringConcatenation _builder_158 = new StringConcatenation(); - _builder_158.append("This is a list of nested mappings which override parent mappings."); + _builder_158.append("The first end point of a binding."); _builder_158.newLine(); - PostprocessingHelpers.setDocumentation(_reference_86, _builder_158.toString()); - EClass _class_42 = PostprocessingHelpers.getClass(pckg, "RefPath"); - cls = _class_42; + PostprocessingHelpers.setDocumentation(_reference_85, _builder_158.toString()); + EReference _reference_86 = PostprocessingHelpers.getReference(cls, "endpoint2"); StringConcatenation _builder_159 = new StringConcatenation(); - _builder_159.append("A path of strings that are interpreted as {@link org.eclipse.etrice.core.room.ActorRef}s starting at a {@link org.eclipse.etrice.core.room.SubSystemClass}."); + _builder_159.append("The second end point of a binding."); _builder_159.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_159.toString()); - EReference _reference_87 = PostprocessingHelpers.getReference(cls, "refs"); + PostprocessingHelpers.setDocumentation(_reference_86, _builder_159.toString()); + EClass _class_41 = PostprocessingHelpers.getClass(pckg, "BindingEndPoint"); + cls = _class_41; StringConcatenation _builder_160 = new StringConcatenation(); - _builder_160.append("This is a path in the instance tree where each segment corresponds to the name of the"); + _builder_160.append("A binding end point is a pair of an {@link ActorContainerRef} and a {@link Port} and is used"); _builder_160.newLine(); - _builder_160.append("corresponding {@link ActorContainerRef}."); + _builder_160.append("to uniquely describe a port of a sub actor. If the actor container ref is {@code null} then"); _builder_160.newLine(); - PostprocessingHelpers.setDocumentation(_reference_87, _builder_160.toString()); - EClass _class_43 = PostprocessingHelpers.getClass(pckg, "RefSegment"); - cls = _class_43; + _builder_160.append("a port of the actor class itself is addressed."); + _builder_160.newLine(); + PostprocessingHelpers.setDocumentation(cls, _builder_160.toString()); + EReference _reference_87 = PostprocessingHelpers.getReference(cls, "actorRef"); StringConcatenation _builder_161 = new StringConcatenation(); - _builder_161.append("A segment of a {@link RefPath}. It consists of a name and an optional index."); - _builder_161.newLine(); - _builder_161.append("If the index is not set it will be {@code -1}."); + _builder_161.append("The actor reference holding the bound port or {@code null} in case of a local port."); _builder_161.newLine(); - PostprocessingHelpers.setDocumentation(cls, _builder_161.toString()); - EAttribute _attribute_29 = PostprocessingHelpers.getAttribute(cls, "ref"); + PostprocessingHelpers.setDocumentation(_reference_87, _builder_161.toString()); + EReference _reference_88 = PostprocessingHelpers.getReference(cls, "port"); StringConcatenation _builder_162 = new StringConcatenation(); - _builder_162.append("The segment name corresponding to an actor reference."); + _builder_162.append("This is the bound port."); _builder_162.newLine(); - PostprocessingHelpers.setDocumentation(_attribute_29, _builder_162.toString()); - EAttribute _attribute_30 = PostprocessingHelpers.getAttribute(cls, "idx"); + PostprocessingHelpers.setDocumentation(_reference_88, _builder_162.toString()); + EReference _reference_89 = PostprocessingHelpers.getReference(cls, "sub"); StringConcatenation _builder_163 = new StringConcatenation(); - _builder_163.append("The optional index of the reference (for replicated actors)."); + _builder_163.append("This is the bound sub protocol or {@code null} if not applicable."); _builder_163.newLine(); - _builder_163.append("If not set the index is {@code -1}."); - _builder_163.newLine(); - PostprocessingHelpers.setDocumentation(_attribute_30, _builder_163.toString()); - EClass _class_44 = PostprocessingHelpers.getClass(pckg, "Binding"); - cls = _class_44; + PostprocessingHelpers.setDocumentation(_reference_89, _builder_163.toString()); + EClass _class_42 = PostprocessingHelpers.getClass(pckg, "LayerConnection"); + cls = _class_42; StringConcatenation _builder_164 = new StringConcatenation(); - _builder_164.append("A binding connects two {@link Port}s."); - _builder_164.newLine(); - _builder_164.append("To be able to distinguish the ports of two {@link ActorContainerRef}s of the same type"); + _builder_164.append("Layer connections are used to connect {@link SAP}s and {@link ServiceImplementation}s."); _builder_164.newLine(); - _builder_164.append("a {@link BindingEndPoint} is needed for disambiguation."); + _builder_164.append("The source is described by a {@link SAPoint} and the target by a {@link SPPoint}."); _builder_164.newLine(); PostprocessingHelpers.setDocumentation(cls, _builder_164.toString()); - EReference _reference_88 = PostprocessingHelpers.getReference(cls, "endpoint1"); + EReference _reference_90 = PostprocessingHelpers.getReference(cls, "from"); StringConcatenation _builder_165 = new StringConcatenation(); - _builder_165.append("The first end point of a binding."); + _builder_165.append("This is source point of the layer connection."); _builder_165.newLine(); - PostprocessingHelpers.setDocumentation(_reference_88, _builder_165.toString()); - EReference _reference_89 = PostprocessingHelpers.getReference(cls, "endpoint2"); + PostprocessingHelpers.setDocumentation(_reference_90, _builder_165.toString()); + EReference _reference_91 = PostprocessingHelpers.getReference(cls, "to"); StringConcatenation _builder_166 = new StringConcatenation(); - _builder_166.append("The second end point of a binding."); + _builder_166.append("This is target point of the layer connection."); _builder_166.newLine(); - PostprocessingHelpers.setDocumentation(_reference_89, _builder_166.toString()); - EClass _class_45 = PostprocessingHelpers.getClass(pckg, "BindingEndPoint"); - cls = _class_45; + PostprocessingHelpers.setDocumentation(_reference_91, _builder_166.toString()); + EClass _class_43 = PostprocessingHelpers.getClass(pckg, "SAPoint"); + cls = _class_43; StringConcatenation _builder_167 = new StringConcatenation(); - _builder_167.append("A binding end point is a pair of an {@link ActorContainerRef} and a {@link Port} and is used"); + _builder_167.append("The super class of"); _builder_167.newLine(); - _builder_167.append("to uniquely describe a port of a sub actor. If the actor container ref is {@code null} then"); + _builder_167.append("June 5, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/plugins/org.eclipse.etrice.generator.fsm/build.properties b/plugins/org.eclipse.etrice.generator.fsm/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.fsm/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/plugins/org.eclipse.etrice.generator.fsm/pom.xml b/plugins/org.eclipse.etrice.generator.fsm/pom.xml new file mode 100644 index 000000000..d1917a85a --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.fsm/pom.xml @@ -0,0 +1,15 @@ + +false
+ * @see org.eclipse.etrice.generator.base.ITranslationProvider#translateMembers()
+ */
+ @Override
+ public boolean translateMembers() {
+ return false;
+ }
+
+ /**
+ * @return the original String
+ * @see org.eclipse.etrice.generator.base.ITranslationProvider#getInterfaceItemMessageText(org.eclipse.etrice.core.room.InterfaceItem, org.eclipse.etrice.core.room.Message, java.util.ArrayList, java.lang.String, java.lang.String)
+ */
+ @Override
+ public String getInterfaceItemMessageText(AbstractInterfaceItem item, AbstractMessage msg,
+ ArrayListfalse
+ * @see org.eclipse.etrice.generator.base.ITranslationProvider#translateTags()
+ */
+ @Override
+ public boolean translateTags() {
+ return false;
+ }
+
+ /**
+ * translates only the tag MODEL_LOCATION and returns the location of the
+ * detail code code in the model.
+ *
+ *
+ * Issues an information and returns <|?tag?|>.
+ *
true if the generation path is valid
+ */
+ public boolean isValidGenerationLocation(EObject obj) {
+ return getProjectURI(obj)!=null;
+ }
+
+ /**
+ * determines the URI of the first directory in the path of an object's resource
+ * which contains a file with a given name
+ *
+ * @param obj an objected which should be located in a resource
+ * @param markerFileName name of marker file
+ * @return the URI of the first directory containing marker or null if not found
+ */
+ public static URI getMarkerFileURI(EObject obj, String markerFileName) {
+ URI mainPath = null;
+ if (obj!=null && obj.eResource()!=null) {
+ mainPath = obj.eResource().getURI().trimSegments(1);
+ File parent = null;
+ if (mainPath.isPlatform()) {
+ // HOWTO: get absolute OS path suitable for java.io.File from platform scheme EMF URI
+ IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+ IFolder file = workspaceRoot.getFolder(new Path(mainPath.toPlatformString(true)));
+ String osString = file.getLocation().toOSString();
+ parent = new File(osString);
+ }
+ else {
+ try {
+ parent = new File(mainPath.toFileString()).getAbsoluteFile();
+ mainPath = URI.createFileURI(parent.getAbsolutePath());
+ }
+ catch (Throwable e) {
+ return null;
+ }
+ }
+
+ boolean isProject = false;
+ int nUp = 0;
+ while (!isProject && parent!=null) {
+ String[] contents = parent.list();
+ for (int i = 0; i < contents.length; i++) {
+ if (contents[i].equals(markerFileName)) {
+ isProject = true;
+ break;
+ }
+ }
+ if (isProject)
+ break;
+
+ parent = parent.getParentFile();
+ ++nUp;
+ }
+ if (isProject && nUp>0)
+ mainPath = mainPath.trimSegments(nUp);
+ }
+ return mainPath;
+ }
+
+}
diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/FolderFilter.java b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/FolderFilter.java
new file mode 100644
index 000000000..9973bf48c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/FolderFilter.java
@@ -0,0 +1,36 @@
+package org.eclipse.etrice.generator.fsm.base;
+
+import java.util.Collection;
+
+/**
+ * A {@link IFileFilter} that lets files pass whose paths start
+ * with one of the given folder paths. In other words, files that
+ * reside in one of the specified folders.
+ *
+ * @author Henrik Rentz-Reichert
+ */
+public class FolderFilter implements IFileFilter {
+
+ private Collectiontrue if this directory contains files with the given extension
+ */
+ public boolean hasFilesWithExtension(String ext) {
+ ArrayListnull
+ */
+ public GenFileTreeBuilder(String uri, Collectionnull
+ */
+ public GenFileTreeBuilder(URI base, Collectiontrue if the fname is accepted
+ */
+ boolean accept(String fname);
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/IGeneratorFileIo.java b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/IGeneratorFileIo.java
new file mode 100644
index 000000000..48c8adc2c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/IGeneratorFileIo.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2013 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.generator.fsm.base;
+
+import com.google.inject.ImplementedBy;
+
+/**
+ * @author Henrik Rentz-Reichert
+ *
+ */
+@ImplementedBy(IncrementalGenerationFileIo.class)
+public interface IGeneratorFileIo {
+
+ /**
+ * This method saves the contents in a file in the given path.
+ * Implementations may use the infopath for extra information like a hash key
+ * for incremental generation.
+ *
+ * @param desc a description which is may be logged
+ * @param path the file system path for the generated file
+ * @param infopath the file system path for the generated info file (if used by the implementation)
+ * @param file the file name of the generated file
+ * @param contents the contents of the generated file
+ */
+ void generateFile(String desc, String path, String infopath, String file, CharSequence contents);
+}
diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/ILineOutput.java b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/ILineOutput.java
new file mode 100644
index 000000000..925ad84be
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/ILineOutput.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.generator.fsm.base;
+
+/**
+ * A simple interface for output with just a {@link #println(String)} method.
+ * @author Henrik Rentz-Reichert
+ */
+public interface ILineOutput {
+
+ /**
+ * @param txt the text to output
+ */
+ void println(String txt);
+}
diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/ILineOutputLogger.java b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/ILineOutputLogger.java
new file mode 100644
index 000000000..e3bddc633
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/ILineOutputLogger.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.generator.fsm.base;
+
+import org.eclipse.etrice.core.genmodel.fsm.base.ILogger;
+
+
+/**
+ * An ILineOutputLogger will send its output to the specified {@link ILogger} if one is set.
+ *
+ * @author Henrik Rentz-Reichert
+ *
+ */
+public interface ILineOutputLogger extends ILogger {
+
+ /**
+ * @param lo a line output to be used by the logger
+ */
+ void setOutput(ILineOutput lo);
+}
diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/IncrementalGenerationFileIo.java b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/IncrementalGenerationFileIo.java
new file mode 100644
index 000000000..8c227acdd
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/IncrementalGenerationFileIo.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2013 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.generator.fsm.base;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.zip.CRC32;
+
+import org.apache.commons.io.FileUtils;
+import org.eclipse.etrice.core.genmodel.fsm.base.ILogger;
+import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.eclipse.xtext.util.RuntimeIOException;
+
+import com.google.inject.Inject;
+
+
+/**
+ * @author Henrik Rentz-Reichert
+ *
+ */
+public class IncrementalGenerationFileIo implements IGeneratorFileIo {
+
+ @Inject JavaIoFileSystemAccess fileAccess;
+ @Inject ILogger logger;
+
+ private static boolean generateIncremental = false;
+
+ /**
+ * @return {@code true} if incremental generation is chosen
+ */
+ public static boolean isGenerateIncremental() {
+ return generateIncremental;
+ }
+
+ /**
+ * @param generateIncremental select {@code true} if incremental generation is desired
+ */
+ public static void setGenerateIncremental(boolean generateIncremental) {
+ IncrementalGenerationFileIo.generateIncremental = generateIncremental;
+ }
+
+ /**
+ * This method computes a hash key (a {@link java.util.zip.CRC32 CRC32} value) for the file contents
+ * and compares it to the
+ * one stored in the {@code infopath} directory with an added extension ".info". If the values are equal
+ * then the file stored in the {@code infopath} is copied to {@code path} while preserving the file data.
+ * In the other case the key is stored and the file is stored to {@code infopath} and {@code path}.
+ */
+ public void generateFile(String desc, String path, String infopath, String file, CharSequence contents) {
+
+ long oldCRC = 0;
+
+ // use local copy to avoid inconsistencies due to concurrent change
+ boolean genInc = generateIncremental;
+
+ if (genInc) {
+ // read old CRC value
+ fileAccess.setOutputPath(infopath);
+ try {
+ CharSequence val = fileAccess.readTextFile(file+".info", JavaIoFileSystemAccess.DEFAULT_OUTPUT);
+ oldCRC = Long.parseLong(val.toString());
+ }
+ catch (RuntimeIOException e) {
+ }
+ catch (NumberFormatException e) {
+ }
+ }
+
+ boolean write = true;
+ long newCRC = 0;
+
+ if (genInc) {
+ CRC32 crc32 = new CRC32();
+ crc32.update(contents.toString().getBytes());
+ newCRC = crc32.getValue();
+ if (oldCRC==newCRC) {
+ write = false;
+ }
+ else {
+ fileAccess.generateFile(file+".info", ""+newCRC);
+ }
+ }
+
+ if (write) {
+ logger.logInfo(desc+" '"+file+"' in '"+path+"'");
+ fileAccess.setOutputPath(path);
+ fileAccess.generateFile(file, contents);
+
+ if (genInc) {
+ // save a copy in the info directory which is not cleared (and not compiled)
+ fileAccess.setOutputPath(infopath);
+ fileAccess.generateFile(file, contents);
+ }
+ }
+ else {
+ logger.logInfo(desc+" (unchanged) '"+file+"' in '"+path+"'");
+ File src = new File(infopath+file);
+ File dst = new File(path+file);
+ try {
+ FileUtils.copyFile(src, dst, true);
+ }
+ catch (IOException e) {
+ fileAccess.setOutputPath(path);
+ fileAccess.generateFile(file, contents);
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/Indexed.java b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/Indexed.java
new file mode 100644
index 000000000..a95ce9512
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.fsm/src/org/eclipse/etrice/generator/fsm/base/Indexed.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.generator.fsm.base;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * helper class to associate indices with collection items
+ *
+ * @author Henrik Rentz-Reichert
+ *
+ */
+public class Indexed