diff options
| author | Henrik Rentz-Reichert | 2013-02-14 10:08:05 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-02-14 10:08:05 +0000 |
| commit | e839eb114bd145294128ed2fdc448fde029d0d7b (patch) | |
| tree | 9a9f97535d04879cf00e3320d5393a660f65e821 | |
| parent | d91ba834ec13f130e94dd1082100f8ab585d4103 (diff) | |
| download | org.eclipse.etrice-e839eb114bd145294128ed2fdc448fde029d0d7b.tar.gz org.eclipse.etrice-e839eb114bd145294128ed2fdc448fde029d0d7b.tar.xz org.eclipse.etrice-e839eb114bd145294128ed2fdc448fde029d0d7b.zip | |
[...] reduced number of warnings, re-generated modellib.java
22 files changed, 337 insertions, 225 deletions
diff --git a/examples/my.etrice.generator.launch/build.properties b/examples/my.etrice.generator.launch/build.properties index 41eb6ade2..6f20375d6 100644 --- a/examples/my.etrice.generator.launch/build.properties +++ b/examples/my.etrice.generator.launch/build.properties @@ -1,4 +1,5 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.xml
diff --git a/plugins/org.eclipse.etrice.core.config.ui/.classpath b/plugins/org.eclipse.etrice.core.config.ui/.classpath index 814539a72..c59891c4d 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.config.ui/.classpath @@ -2,7 +2,11 @@ <classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/.classpath b/plugins/org.eclipse.etrice.core.etmap.ui/.classpath index 9a39368d9..1fdcd4adc 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.etmap.ui/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/.classpath b/plugins/org.eclipse.etrice.core.etphys.ui/.classpath index 9a39368d9..1fdcd4adc 100644 --- a/plugins/org.eclipse.etrice.core.etphys.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.etphys.ui/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.etrice.generator.cpp/build.properties b/plugins/org.eclipse.etrice.generator.cpp/build.properties index 41eb6ade2..d6c49e5cf 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/build.properties +++ b/plugins/org.eclipse.etrice.generator.cpp/build.properties @@ -1,4 +1,5 @@ -source.. = src/
+source.. = src/,\
+ xtend-gen/
output.. = bin/
bin.includes = META-INF/,\
.
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath b/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath index 814539a72..c59891c4d 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath @@ -2,7 +2,11 @@ <classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml b/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml index 4d7e4ddc1..1d70ce052 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/plugin.xml @@ -243,7 +243,7 @@ point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
class="org.eclipse.etrice.generator.ui.FSMtestExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
- markerType="org.eclipse.etrice.generator.ui.fsmtest.check.fast">
+ markerType="org.eclipse.etrice.generator.fsmtest.ui.fsmtest.check.fast">
<attribute
name="FIXABLE_KEY"
value="true">
@@ -251,7 +251,7 @@ </markerResolutionGenerator>
<markerResolutionGenerator
class="org.eclipse.etrice.generator.ui.FSMtestExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
- markerType="org.eclipse.etrice.generator.ui.fsmtest.check.normal">
+ markerType="org.eclipse.etrice.generator.fsmtest.ui.fsmtest.check.normal">
<attribute
name="FIXABLE_KEY"
value="true">
@@ -259,7 +259,7 @@ </markerResolutionGenerator>
<markerResolutionGenerator
class="org.eclipse.etrice.generator.ui.FSMtestExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
- markerType="org.eclipse.etrice.generator.ui.fsmtest.check.expensive">
+ markerType="org.eclipse.etrice.generator.fsmtest.ui.fsmtest.check.expensive">
<attribute
name="FIXABLE_KEY"
value="true">
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/.cproject b/runtime/org.eclipse.etrice.modellib.cpp/.cproject index 2b49e6a0f..731f6d04c 100644 --- a/runtime/org.eclipse.etrice.modellib.cpp/.cproject +++ b/runtime/org.eclipse.etrice.modellib.cpp/.cproject @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.lib.debug.44153035">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.lib.debug.44153035" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -28,7 +26,7 @@ <option id="gnu.both.asm.option.include.paths.1757143474" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.runtime.cpp/src}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.modellib.cpp/src-gen}""/>
- <listOptionValue builtIn="false" value="/org.eclipse.etrice.runtime.cpp/src/platform/generic"/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.runtime.cpp/src/platforms/generic}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1284881452" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
@@ -87,6 +85,7 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.runtime.cpp/src}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.modellib.cpp/src-gen}""/>
<listOptionValue builtIn="false" value="/org.eclipse.etrice.runtime.cpp/src/platform/generic"/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.runtime.cpp/src/platforms/generic}""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1692202427" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
diff --git a/runtime/org.eclipse.etrice.modellib.java/models/ALogService.room b/runtime/org.eclipse.etrice.modellib.java/models/ALogService.room index 82d1b84f8..d54f3d049 100644 --- a/runtime/org.eclipse.etrice.modellib.java/models/ALogService.room +++ b/runtime/org.eclipse.etrice.modellib.java/models/ALogService.room @@ -94,8 +94,7 @@ RoomModel room.basic.service.logging { "if (logLevel > LOG_LEVEL_HIGH) logLevel=LOG_LEVEL_HIGH;"
}
Operation log(logLevel: int32, userString: string) sends internalLog {
- "long s;"
- "if (logLevel>this.logLevel){"
+ "if (logLevel>LogConjPort.logLevel){"
"d.userString=userString;"
"d.timeStamp=System.currentTimeMillis();"
"d.sender=getInstancePath();"
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java index 7c17ea7fc..ccb69ad9c 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java @@ -15,35 +15,45 @@ public class DSocketConfiguration { boolean checkCookie;
int mode;
- //--------------------- attribute setters and getters
- public void setServerName (String serverName) {
+ /* --------------------- attribute setters and getters */
+ public void setServerName (String serverName)
+ {
this.serverName = serverName;
}
- public String getServerName () {
+ public String getServerName ()
+ {
return this.serverName;
}
- public void setPortNumber (int portNumber) {
+ public void setPortNumber (int portNumber)
+ {
this.portNumber = portNumber;
}
- public int getPortNumber () {
+ public int getPortNumber ()
+ {
return this.portNumber;
}
- public void setProtocol (int protocol) {
+ public void setProtocol (int protocol)
+ {
this.protocol = protocol;
}
- public int getProtocol () {
+ public int getProtocol ()
+ {
return this.protocol;
}
- public void setCheckCookie (boolean checkCookie) {
+ public void setCheckCookie (boolean checkCookie)
+ {
this.checkCookie = checkCookie;
}
- public boolean getCheckCookie () {
+ public boolean getCheckCookie ()
+ {
return this.checkCookie;
}
- public void setMode (int mode) {
+ public void setMode (int mode)
+ {
this.mode = mode;
}
- public int getMode () {
+ public int getMode ()
+ {
return this.mode;
}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java index 78aee43c4..dc69e7e4e 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java @@ -12,17 +12,21 @@ public class DSocketData { int size;
String data;
- //--------------------- attribute setters and getters
- public void setSize (int size) {
+ /* --------------------- attribute setters and getters */
+ public void setSize (int size)
+ {
this.size = size;
}
- public int getSize () {
+ public int getSize ()
+ {
return this.size;
}
- public void setData (String data) {
+ public void setData (String data)
+ {
this.data = data;
}
- public String getData () {
+ public String getData ()
+ {
return this.data;
}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java index b13f8e4b6..a77b3edbc 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java @@ -48,7 +48,7 @@ public class SocketClient extends ActorClassBase { }
- //--------------------- attribute setters and getters
+ /* --------------------- attribute setters and getters */
//--------------------- port getters
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java index 5b59c16bc..262d6fe2e 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java @@ -64,7 +64,7 @@ public class ALogService extends ActorClassBase { }
- //--------------------- attribute setters and getters
+ /* --------------------- attribute setters and getters */
//--------------------- port getters
@@ -141,9 +141,8 @@ public class ALogService extends ActorClassBase { * parent states while remembering the history
* @param current - the current state
* @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
*/
- private void exitTo(int current, int to, boolean handler) {
+ private void exitTo(int current, int to) {
while (current!=to) {
switch (current) {
case STATE_closed:
@@ -154,6 +153,9 @@ public class ALogService extends ActorClassBase { this.history[STATE_TOP] = STATE_opened;
current = STATE_TOP;
break;
+ default:
+ /* should not occur */
+ break;
}
}
}
@@ -163,7 +165,7 @@ public class ALogService extends ActorClassBase { * matching the trigger of this chain. The ID of the final state is returned
* @param chain - the chain ID
* @param generic_data - the generic data pointer
- * @return the ID of the final state
+ * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
*/
private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
switch (chain) {
@@ -188,6 +190,9 @@ public class ALogService extends ActorClassBase { action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(ifitem, data);
return STATE_opened;
}
+ default:
+ /* should not occur */
+ break;
}
return NO_STATE;
}
@@ -195,31 +200,33 @@ public class ALogService extends ActorClassBase { /**
* calls entry codes while entering a state's history. The ID of the final leaf state is returned
* @param state - the state which is entered
- * @param handler - entry code is executed if not handler
* @return - the ID of the final leaf state
*/
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
+ private int enterHistory(int state, boolean skip_entry) {
while (true) {
switch (state) {
case STATE_closed:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_closed;
case STATE_opened:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_opened;
case STATE_TOP:
state = this.history[STATE_TOP];
break;
+ default:
+ /* should not occur */
+ break;
}
skip_entry = false;
}
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
+ /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
}
public void executeInitTransition() {
int chain = CHAIN_TRANS_INITIAL_TO__closed;
int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
+ next = enterHistory(next, false);
setState(next);
}
@@ -228,48 +235,56 @@ public class ALogService extends ActorClassBase { int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
int chain = NOT_CAUGHT;
int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
if (!handleSystemEvent(ifitem, evt, generic_data)) {
switch (getState()) {
case STATE_closed:
switch(trigger) {
- case TRIG_log__open:
- {
- chain = CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_log__open:
+ {
+ chain = CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
case STATE_opened:
switch(trigger) {
- case TRIG_log__close:
- {
- chain = CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_log__internalLog:
- {
- chain = CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_log__close:
+ {
+ chain = CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog;
+ catching_state = STATE_TOP;
+ }
+ break;
+ case TRIG_log__internalLog:
+ {
+ chain = CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
+ default:
+ /* should not occur */
+ break;
}
}
if (chain != NOT_CAUGHT) {
- exitTo(getState(), catching_state, is_handler);
+ exitTo(getState(), catching_state);
int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
+ boolean skip_entry = false;
+ if(next < 0){
+ next = -next;
+ skip_entry = true;
+ }
+ next = enterHistory(next, skip_entry);
setState(next);
}
}
-
- //******************************************
- // END of generated code for FSM
- //******************************************
};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java index 94b8418c6..541cffdc9 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java @@ -13,23 +13,29 @@ public class InternalLogData { String sender;
long timeStamp;
- //--------------------- attribute setters and getters
- public void setUserString (String userString) {
+ /* --------------------- attribute setters and getters */
+ public void setUserString (String userString)
+ {
this.userString = userString;
}
- public String getUserString () {
+ public String getUserString ()
+ {
return this.userString;
}
- public void setSender (String sender) {
+ public void setSender (String sender)
+ {
this.sender = sender;
}
- public String getSender () {
+ public String getSender ()
+ {
return this.sender;
}
- public void setTimeStamp (long timeStamp) {
+ public void setTimeStamp (long timeStamp)
+ {
this.timeStamp = timeStamp;
}
- public long getTimeStamp () {
+ public long getTimeStamp ()
+ {
return this.timeStamp;
}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java index 7354d8bed..1be5c8a95 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java @@ -121,15 +121,14 @@ public class Log { }
/*--------------------- attributes ---------------------*/
- //--------------------- attribute setters and getters
+ /* --------------------- attribute setters and getters */
/*--------------------- operations ---------------------*/
public void setLogLevel(int l) {
logLevel=l;
if (logLevel > LOG_LEVEL_HIGH) logLevel=LOG_LEVEL_HIGH;
}
public void log(int logLevel, String userString) {
- long s;
- if (logLevel>this.logLevel){
+ if (logLevel>LogConjPort.logLevel){
d.userString=userString;
d.timeStamp=System.currentTimeMillis();
d.sender=getInstancePath();
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java index 7ea07d4b8..c9cb4ab09 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java @@ -52,16 +52,16 @@ public class ATcpClient extends ActorClassBase { /*--------------------- end user code ---------------------*/
//--------------------- ports
- protected PTcpControlPort ControlPort = null;
protected PTcpPayloadPort PayloadPort = null;
+ protected PTcpControlPort ControlPort = null;
//--------------------- saps
//--------------------- services
//--------------------- interface item IDs
- public static final int IFITEM_ControlPort = 1;
public static final int IFITEM_PayloadPort = 2;
+ public static final int IFITEM_ControlPort = 1;
/*--------------------- attributes ---------------------*/
int lastError;
@@ -84,8 +84,8 @@ public class ATcpClient extends ActorClassBase { this.setLastError(0);
// own ports
- ControlPort = new PTcpControlPort(this, "ControlPort", IFITEM_ControlPort);
PayloadPort = new PTcpPayloadPort(this, "PayloadPort", IFITEM_PayloadPort);
+ ControlPort = new PTcpControlPort(this, "ControlPort", IFITEM_ControlPort);
// own saps
@@ -95,22 +95,24 @@ public class ATcpClient extends ActorClassBase { }
- //--------------------- attribute setters and getters
- public void setLastError (int lastError) {
+ /* --------------------- attribute setters and getters */
+ public void setLastError (int lastError)
+ {
this.lastError = lastError;
}
- public int getLastError () {
+ public int getLastError ()
+ {
return this.lastError;
}
//--------------------- port getters
- public PTcpControlPort getControlPort (){
- return this.ControlPort;
- }
public PTcpPayloadPort getPayloadPort (){
return this.PayloadPort;
}
+ public PTcpControlPort getControlPort (){
+ return this.ControlPort;
+ }
//--------------------- lifecycle functions
public void stop(){
@@ -201,9 +203,8 @@ public class ATcpClient extends ActorClassBase { * parent states while remembering the history
* @param current - the current state
* @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
*/
- private void exitTo(int current, int to, boolean handler) {
+ private void exitTo(int current, int to) {
while (current!=to) {
switch (current) {
case STATE_closed:
@@ -218,6 +219,9 @@ public class ATcpClient extends ActorClassBase { this.history[STATE_TOP] = STATE_error;
current = STATE_TOP;
break;
+ default:
+ /* should not occur */
+ break;
}
}
}
@@ -227,7 +231,7 @@ public class ATcpClient extends ActorClassBase { * matching the trigger of this chain. The ID of the final state is returned
* @param chain - the chain ID
* @param generic_data - the generic data pointer
- * @return the ID of the final state
+ * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
*/
private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
switch (chain) {
@@ -258,6 +262,9 @@ public class ATcpClient extends ActorClassBase { action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, data);
return STATE_opened;
}
+ default:
+ /* should not occur */
+ break;
}
return NO_STATE;
}
@@ -265,34 +272,36 @@ public class ATcpClient extends ActorClassBase { /**
* calls entry codes while entering a state's history. The ID of the final leaf state is returned
* @param state - the state which is entered
- * @param handler - entry code is executed if not handler
* @return - the ID of the final leaf state
*/
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
+ private int enterHistory(int state, boolean skip_entry) {
while (true) {
switch (state) {
case STATE_closed:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_closed;
case STATE_opened:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_opened;
case STATE_error:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_error;
case STATE_TOP:
state = this.history[STATE_TOP];
break;
+ default:
+ /* should not occur */
+ break;
}
skip_entry = false;
}
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
+ /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
}
public void executeInitTransition() {
int chain = CHAIN_TRANS_INITIAL_TO__closed;
int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
+ next = enterHistory(next, false);
setState(next);
}
@@ -301,50 +310,58 @@ public class ATcpClient extends ActorClassBase { int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
int chain = NOT_CAUGHT;
int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
if (!handleSystemEvent(ifitem, evt, generic_data)) {
switch (getState()) {
case STATE_closed:
switch(trigger) {
- case TRIG_ControlPort__open:
- {
- chain = CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_ControlPort__open:
+ {
+ chain = CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
case STATE_opened:
switch(trigger) {
- case TRIG_ControlPort__close:
- {
- chain = CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PayloadPort__send:
- {
- chain = CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_ControlPort__close:
+ {
+ chain = CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
+ catching_state = STATE_TOP;
+ }
+ break;
+ case TRIG_PayloadPort__send:
+ {
+ chain = CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
case STATE_error:
break;
+ default:
+ /* should not occur */
+ break;
}
}
if (chain != NOT_CAUGHT) {
- exitTo(getState(), catching_state, is_handler);
+ exitTo(getState(), catching_state);
int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
+ boolean skip_entry = false;
+ if(next < 0){
+ next = -next;
+ skip_entry = true;
+ }
+ next = enterHistory(next, skip_entry);
setState(next);
}
}
-
- //******************************************
- // END of generated code for FSM
- //******************************************
};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java index dd57fc3f1..f6622531e 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java @@ -88,16 +88,16 @@ public class ATcpServer extends ActorClassBase { /*--------------------- end user code ---------------------*/
//--------------------- ports
- protected PTcpControlPort ControlPort = null;
protected PTcpPayloadPort PayloadPort = null;
+ protected PTcpControlPort ControlPort = null;
//--------------------- saps
//--------------------- services
//--------------------- interface item IDs
- public static final int IFITEM_ControlPort = 1;
public static final int IFITEM_PayloadPort = 2;
+ public static final int IFITEM_ControlPort = 1;
/*--------------------- attributes ---------------------*/
int lastError;
@@ -122,8 +122,8 @@ public class ATcpServer extends ActorClassBase { this.setPayloadPortReplocation(0);
// own ports
- ControlPort = new PTcpControlPort(this, "ControlPort", IFITEM_ControlPort);
PayloadPort = new PTcpPayloadPort(this, "PayloadPort", IFITEM_PayloadPort);
+ ControlPort = new PTcpControlPort(this, "ControlPort", IFITEM_ControlPort);
// own saps
@@ -133,28 +133,32 @@ public class ATcpServer extends ActorClassBase { }
- //--------------------- attribute setters and getters
- public void setLastError (int lastError) {
+ /* --------------------- attribute setters and getters */
+ public void setLastError (int lastError)
+ {
this.lastError = lastError;
}
- public int getLastError () {
+ public int getLastError ()
+ {
return this.lastError;
}
- public void setPayloadPortReplocation (int payloadPortReplocation) {
+ public void setPayloadPortReplocation (int payloadPortReplocation)
+ {
this.payloadPortReplocation = payloadPortReplocation;
}
- public int getPayloadPortReplocation () {
+ public int getPayloadPortReplocation ()
+ {
return this.payloadPortReplocation;
}
//--------------------- port getters
- public PTcpControlPort getControlPort (){
- return this.ControlPort;
- }
public PTcpPayloadPort getPayloadPort (){
return this.PayloadPort;
}
+ public PTcpControlPort getControlPort (){
+ return this.ControlPort;
+ }
//--------------------- lifecycle functions
public void stop(){
@@ -241,9 +245,8 @@ public class ATcpServer extends ActorClassBase { * parent states while remembering the history
* @param current - the current state
* @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
*/
- private void exitTo(int current, int to, boolean handler) {
+ private void exitTo(int current, int to) {
while (current!=to) {
switch (current) {
case STATE_closed:
@@ -258,6 +261,9 @@ public class ATcpServer extends ActorClassBase { this.history[STATE_TOP] = STATE_error;
current = STATE_TOP;
break;
+ default:
+ /* should not occur */
+ break;
}
}
}
@@ -267,7 +273,7 @@ public class ATcpServer extends ActorClassBase { * matching the trigger of this chain. The ID of the final state is returned
* @param chain - the chain ID
* @param generic_data - the generic data pointer
- * @return the ID of the final state
+ * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
*/
private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
switch (chain) {
@@ -297,6 +303,9 @@ public class ATcpServer extends ActorClassBase { action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, data);
return STATE_opened;
}
+ default:
+ /* should not occur */
+ break;
}
return NO_STATE;
}
@@ -304,34 +313,36 @@ public class ATcpServer extends ActorClassBase { /**
* calls entry codes while entering a state's history. The ID of the final leaf state is returned
* @param state - the state which is entered
- * @param handler - entry code is executed if not handler
* @return - the ID of the final leaf state
*/
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
+ private int enterHistory(int state, boolean skip_entry) {
while (true) {
switch (state) {
case STATE_closed:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_closed;
case STATE_opened:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_opened;
case STATE_error:
- // in leaf state: return state id
+ /* in leaf state: return state id */
return STATE_error;
case STATE_TOP:
state = this.history[STATE_TOP];
break;
+ default:
+ /* should not occur */
+ break;
}
skip_entry = false;
}
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
+ /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
}
public void executeInitTransition() {
int chain = CHAIN_TRANS_INITIAL_TO__closed;
int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
+ next = enterHistory(next, false);
setState(next);
}
@@ -340,50 +351,58 @@ public class ATcpServer extends ActorClassBase { int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
int chain = NOT_CAUGHT;
int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
if (!handleSystemEvent(ifitem, evt, generic_data)) {
switch (getState()) {
case STATE_closed:
switch(trigger) {
- case TRIG_ControlPort__open:
- {
- chain = CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_ControlPort__open:
+ {
+ chain = CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
case STATE_opened:
switch(trigger) {
- case TRIG_ControlPort__close:
- {
- chain = CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PayloadPort__send:
- {
- chain = CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_ControlPort__close:
+ {
+ chain = CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
+ catching_state = STATE_TOP;
+ }
+ break;
+ case TRIG_PayloadPort__send:
+ {
+ chain = CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
case STATE_error:
break;
+ default:
+ /* should not occur */
+ break;
}
}
if (chain != NOT_CAUGHT) {
- exitTo(getState(), catching_state, is_handler);
+ exitTo(getState(), catching_state);
int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
+ boolean skip_entry = false;
+ if(next < 0){
+ next = -next;
+ skip_entry = true;
+ }
+ next = enterHistory(next, skip_entry);
setState(next);
}
}
-
- //******************************************
- // END of generated code for FSM
- //******************************************
};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java index 3848b7a3b..efd0917f9 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java @@ -12,17 +12,21 @@ public class DTcpControl { String IPAddr;
int TcpPort;
- //--------------------- attribute setters and getters
- public void setIPAddr (String IPAddr) {
+ /* --------------------- attribute setters and getters */
+ public void setIPAddr (String IPAddr)
+ {
this.IPAddr = IPAddr;
}
- public String getIPAddr () {
+ public String getIPAddr ()
+ {
return this.IPAddr;
}
- public void setTcpPort (int TcpPort) {
+ public void setTcpPort (int TcpPort)
+ {
this.TcpPort = TcpPort;
}
- public int getTcpPort () {
+ public int getTcpPort ()
+ {
return this.TcpPort;
}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java index 4e75a1ed8..3e9071cb3 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java @@ -13,23 +13,29 @@ public class DTcpPayload { int length;
byte data[];
- //--------------------- attribute setters and getters
- public void setConnectionId (int connectionId) {
+ /* --------------------- attribute setters and getters */
+ public void setConnectionId (int connectionId)
+ {
this.connectionId = connectionId;
}
- public int getConnectionId () {
+ public int getConnectionId ()
+ {
return this.connectionId;
}
- public void setLength (int length) {
+ public void setLength (int length)
+ {
this.length = length;
}
- public int getLength () {
+ public int getLength ()
+ {
return this.length;
}
- public void setData (byte[] data) {
+ public void setData (byte[] data)
+ {
this.data = data;
}
- public byte[] getData () {
+ public byte[] getData ()
+ {
return this.data;
}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java index 13f7ea67f..3a42d30d4 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java @@ -61,7 +61,7 @@ public class ATimingService extends ActorClassBase { }
- //--------------------- attribute setters and getters
+ /* --------------------- attribute setters and getters */
//--------------------- port getters
@@ -131,15 +131,17 @@ public class ATimingService extends ActorClassBase { * parent states while remembering the history
* @param current - the current state
* @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
*/
- private void exitTo(int current, int to, boolean handler) {
+ private void exitTo(int current, int to) {
while (current!=to) {
switch (current) {
case STATE_Operational:
this.history[STATE_TOP] = STATE_Operational;
current = STATE_TOP;
break;
+ default:
+ /* should not occur */
+ break;
}
}
}
@@ -149,7 +151,7 @@ public class ATimingService extends ActorClassBase { * matching the trigger of this chain. The ID of the final state is returned
* @param chain - the chain ID
* @param generic_data - the generic data pointer
- * @return the ID of the final state
+ * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
*/
private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
switch (chain) {
@@ -175,6 +177,9 @@ public class ATimingService extends ActorClassBase { action_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4(ifitem);
return STATE_Operational;
}
+ default:
+ /* should not occur */
+ break;
}
return NO_STATE;
}
@@ -182,29 +187,31 @@ public class ATimingService extends ActorClassBase { /**
* calls entry codes while entering a state's history. The ID of the final leaf state is returned
* @param state - the state which is entered
- * @param handler - entry code is executed if not handler
* @return - the ID of the final leaf state
*/
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
+ private int enterHistory(int state, boolean skip_entry) {
while (true) {
switch (state) {
case STATE_Operational:
- if (!(skip_entry || handler)) entry_Operational();
- // in leaf state: return state id
+ if (!(skip_entry)) entry_Operational();
+ /* in leaf state: return state id */
return STATE_Operational;
case STATE_TOP:
state = this.history[STATE_TOP];
break;
+ default:
+ /* should not occur */
+ break;
}
skip_entry = false;
}
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
+ /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
}
public void executeInitTransition() {
int chain = CHAIN_TRANS_INITIAL_TO__Operational;
int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
+ next = enterHistory(next, false);
setState(next);
}
@@ -213,44 +220,49 @@ public class ATimingService extends ActorClassBase { int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
int chain = NOT_CAUGHT;
int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
if (!handleSystemEvent(ifitem, evt, generic_data)) {
switch (getState()) {
case STATE_Operational:
switch(trigger) {
- case TRIG_timer__internalStartTimer:
- {
- chain = CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_timer__internalStartTimeout:
- {
- chain = CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_timer__kill:
- {
- chain = CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
- catching_state = STATE_TOP;
- }
- break;
+ case TRIG_timer__internalStartTimer:
+ {
+ chain = CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1;
+ catching_state = STATE_TOP;
+ }
+ break;
+ case TRIG_timer__internalStartTimeout:
+ {
+ chain = CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3;
+ catching_state = STATE_TOP;
+ }
+ break;
+ case TRIG_timer__kill:
+ {
+ chain = CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
+ catching_state = STATE_TOP;
+ }
+ break;
+ default:
+ /* should not occur */
+ break;
}
break;
+ default:
+ /* should not occur */
+ break;
}
}
if (chain != NOT_CAUGHT) {
- exitTo(getState(), catching_state, is_handler);
+ exitTo(getState(), catching_state);
int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
+ boolean skip_entry = false;
+ if(next < 0){
+ next = -next;
+ skip_entry = true;
+ }
+ next = enterHistory(next, skip_entry);
setState(next);
}
}
-
- //******************************************
- // END of generated code for FSM
- //******************************************
};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java index 3c5eef138..96dafea22 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java @@ -128,7 +128,7 @@ public class PTimer { }
/*--------------------- attributes ---------------------*/
- //--------------------- attribute setters and getters
+ /* --------------------- attribute setters and getters */
/*--------------------- operations ---------------------*/
// sent messages
@@ -225,7 +225,7 @@ public class PTimer { }
/*--------------------- attributes ---------------------*/
- //--------------------- attribute setters and getters
+ /* --------------------- attribute setters and getters */
/*--------------------- operations ---------------------*/
public void startTimer(int time_ms) {
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java index eea006dc7..de3c3539b 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java @@ -12,17 +12,21 @@ public class TimerData { int time;
int id;
- //--------------------- attribute setters and getters
- public void setTime (int time) {
+ /* --------------------- attribute setters and getters */
+ public void setTime (int time)
+ {
this.time = time;
}
- public int getTime () {
+ public int getTime ()
+ {
return this.time;
}
- public void setId (int id) {
+ public void setId (int id)
+ {
this.id = id;
}
- public int getId () {
+ public int getId ()
+ {
return this.id;
}
|