diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java')
-rw-r--r-- | plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java | 166 |
1 files changed, 64 insertions, 102 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java index b2259755b..c8c1c9f59 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java @@ -17,13 +17,15 @@ import java.util.HashMap; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType; -import org.eclipse.etrice.core.fsm.fSM.StateGraph; import org.eclipse.etrice.core.genmodel.builder.GenmodelConstants; import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass; import org.eclipse.etrice.core.genmodel.etricegen.Root; import org.eclipse.etrice.core.genmodel.etricegen.Wire; import org.eclipse.etrice.core.genmodel.etricegen.WiredActorClass; import org.eclipse.etrice.core.genmodel.etricegen.WiredStructureClass; +import org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions; +import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Graph; +import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer; import org.eclipse.etrice.core.room.ActorClass; import org.eclipse.etrice.core.room.ActorRef; import org.eclipse.etrice.core.room.Attribute; @@ -999,7 +1001,8 @@ public class ActorClassGen extends GenericActorClassGenerator { boolean _hasNonEmptyStateMachine = this._roomHelpers.hasNonEmptyStateMachine(ac); if (_hasNonEmptyStateMachine) { _builder.append("\t"); - CharSequence _genStateMachine = this._stateMachineGen.genStateMachine(xpac); + GraphContainer _graphContainer = xpac.getGraphContainer(); + CharSequence _genStateMachine = this._stateMachineGen.genStateMachine(_graphContainer); _builder.append(_genStateMachine, "\t"); _builder.newLineIfNotEmpty(); { @@ -1047,8 +1050,9 @@ public class ActorClassGen extends GenericActorClassGenerator { } } } else { - StateGraph _stateMachine = xpac.getStateMachine(); - boolean _isEmpty_2 = this._roomHelpers.isEmpty(_stateMachine); + GraphContainer _graphContainer_1 = xpac.getGraphContainer(); + Graph _graph = _graphContainer_1.getGraph(); + boolean _isEmpty_2 = FsmGenExtensions.isEmpty(_graph); if (_isEmpty_2) { _builder.append("\t"); _builder.append("//--------------------- no state machine"); @@ -1085,8 +1089,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("public void saveObject(ObjectOutput output) throws IOException {"); _builder.newLine(); { - boolean _hasStateMachine = xpac.hasStateMachine(); - if (_hasStateMachine) { + GraphContainer _graphContainer_2 = xpac.getGraphContainer(); + Graph _graph_1 = _graphContainer_2.getGraph(); + boolean _isEmpty_3 = FsmGenExtensions.isEmpty(_graph_1); + boolean _not_3 = (!_isEmpty_3); + if (_not_3) { _builder.append("\t"); _builder.append("\t"); _builder.append("// state and history"); @@ -1129,8 +1136,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("public void loadObject(ObjectInput input) throws IOException, ClassNotFoundException {"); _builder.newLine(); { - boolean _hasStateMachine_1 = xpac.hasStateMachine(); - if (_hasStateMachine_1) { + GraphContainer _graphContainer_3 = xpac.getGraphContainer(); + Graph _graph_2 = _graphContainer_3.getGraph(); + boolean _isEmpty_4 = FsmGenExtensions.isEmpty(_graph_2); + boolean _not_4 = (!_isEmpty_4); + if (_not_4) { _builder.append("\t"); _builder.append("\t"); _builder.append("// state and history"); @@ -1220,9 +1230,9 @@ public class ActorClassGen extends GenericActorClassGenerator { } { EList<Attribute> _attributes_4 = ac.getAttributes(); - boolean _isEmpty_3 = _attributes_4.isEmpty(); - boolean _not_3 = (!_isEmpty_3); - if (_not_3) { + boolean _isEmpty_5 = _attributes_4.isEmpty(); + boolean _not_5 = (!_isEmpty_5); + if (_not_5) { _builder.newLine(); { EList<Attribute> _attributes_5 = ac.getAttributes(); @@ -1378,9 +1388,9 @@ public class ActorClassGen extends GenericActorClassGenerator { } { EList<Attribute> _attributes_6 = ac.getAttributes(); - boolean _isEmpty_4 = _attributes_6.isEmpty(); - boolean _not_4 = (!_isEmpty_4); - if (_not_4) { + boolean _isEmpty_6 = _attributes_6.isEmpty(); + boolean _not_6 = (!_isEmpty_6); + if (_not_6) { _builder.newLine(); { EList<Attribute> _attributes_7 = ac.getAttributes(); @@ -1684,58 +1694,34 @@ public class ActorClassGen extends GenericActorClassGenerator { private String getSaveMethod(final String type) { String _switchResult = null; - boolean _matched = false; - if (Objects.equal(type, "boolean")) { - _matched=true; - _switchResult = "writeBoolean"; - } - if (!_matched) { - if (Objects.equal(type, "char")) { - _matched=true; + switch (type) { + case "boolean": + _switchResult = "writeBoolean"; + break; + case "char": _switchResult = "writeChar"; - } - } - if (!_matched) { - if (Objects.equal(type, "byte")) { - _matched=true; + break; + case "byte": _switchResult = "writeByte"; - } - } - if (!_matched) { - if (Objects.equal(type, "short")) { - _matched=true; + break; + case "short": _switchResult = "writeShort"; - } - } - if (!_matched) { - if (Objects.equal(type, "int")) { - _matched=true; + break; + case "int": _switchResult = "write"; - } - } - if (!_matched) { - if (Objects.equal(type, "long")) { - _matched=true; + break; + case "long": _switchResult = "writeLong"; - } - } - if (!_matched) { - if (Objects.equal(type, "float")) { - _matched=true; + break; + case "float": _switchResult = "writeFloat"; - } - } - if (!_matched) { - if (Objects.equal(type, "double")) { - _matched=true; + break; + case "double": _switchResult = "writeDouble"; - } - } - if (!_matched) { - if (Objects.equal(type, "String")) { - _matched=true; + break; + case "String": _switchResult = "writeUTF"; - } + break; } return _switchResult; } @@ -1778,58 +1764,34 @@ public class ActorClassGen extends GenericActorClassGenerator { private String getLoadMethod(final String type) { String _switchResult = null; - boolean _matched = false; - if (Objects.equal(type, "boolean")) { - _matched=true; - _switchResult = "readBoolean"; - } - if (!_matched) { - if (Objects.equal(type, "char")) { - _matched=true; + switch (type) { + case "boolean": + _switchResult = "readBoolean"; + break; + case "char": _switchResult = "readChar"; - } - } - if (!_matched) { - if (Objects.equal(type, "byte")) { - _matched=true; + break; + case "byte": _switchResult = "readByte"; - } - } - if (!_matched) { - if (Objects.equal(type, "short")) { - _matched=true; + break; + case "short": _switchResult = "readShort"; - } - } - if (!_matched) { - if (Objects.equal(type, "int")) { - _matched=true; + break; + case "int": _switchResult = "read"; - } - } - if (!_matched) { - if (Objects.equal(type, "long")) { - _matched=true; + break; + case "long": _switchResult = "readLong"; - } - } - if (!_matched) { - if (Objects.equal(type, "float")) { - _matched=true; + break; + case "float": _switchResult = "readFloat"; - } - } - if (!_matched) { - if (Objects.equal(type, "double")) { - _matched=true; + break; + case "double": _switchResult = "readDouble"; - } - } - if (!_matched) { - if (Objects.equal(type, "String")) { - _matched=true; + break; + case "String": _switchResult = "readUTF"; - } + break; } return _switchResult; } |