diff options
| author | Henrik Rentz-Reichert | 2012-07-16 13:57:06 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-07-16 13:57:06 +0000 |
| commit | 82ce12062451bc2106172f4537e3ad3b1964ce7f (patch) | |
| tree | a909d9829ba4ef3e6e0a6c4f38f0d9143232d1b2 /plugins/org.eclipse.etrice.generator.java | |
| parent | 26da83a0bf17a9a95b945153fa8a30b9d97fbc64 (diff) | |
| download | org.eclipse.etrice-82ce12062451bc2106172f4537e3ad3b1964ce7f.tar.gz org.eclipse.etrice-82ce12062451bc2106172f4537e3ad3b1964ce7f.tar.xz org.eclipse.etrice-82ce12062451bc2106172f4537e3ad3b1964ce7f.zip | |
[*] migration to Juno part 1
- xtend2 imports
- IEncoderProvider
- many warnings removed
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java')
12 files changed, 371 insertions, 436 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF index 4d600d78a..4f2245ce8 100644 --- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0", org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
org.eclipse.etrice.generator.doc;bundle-version="0.1.0",
org.eclipse.xtext.generator;bundle-version="2.1.1",
org.eclipse.xtext.util;bundle-version="2.1.1",
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend index 775d75db9..42d27465b 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend @@ -23,7 +23,6 @@ import static extension org.eclipse.etrice.core.room.util.RoomHelpers.* import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
-import org.eclipse.etrice.generator.generic.TypeHelpers
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator
@Singleton
@@ -33,7 +32,6 @@ class ActorClassGen extends GenericActorClassGenerator { @Inject extension JavaExtensions stdExt
@Inject extension RoomExtensions roomExt
- @Inject extension TypeHelpers
@Inject extension ProcedureHelpers helpers
@Inject extension StateMachineGen stateMachineGen
@Inject ILogger logger
@@ -74,7 +72,7 @@ class ActorClassGen extends GenericActorClassGenerator { «helpers.userCode(ac.userCode1)»
- public «IF ac.abstract»abstract «ENDIF»class «ac.name» extends «IF ac.base!=null»«ac.base.name»«ELSE»ActorClassBase«ENDIF» {
+ public «IF ac.^abstract»abstract «ENDIF»class «ac.name» extends «IF ac.base!=null»«ac.base.name»«ELSE»ActorClassBase«ENDIF» {
«helpers.userCode(ac.userCode2)»
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend index adcb1c1bc..38d3dcc31 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend @@ -25,7 +25,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
-import org.eclipse.etrice.generator.generic.TypeHelpers
@Singleton
@@ -35,7 +34,6 @@ class DataClassGen { @Inject extension JavaExtensions stdExt
@Inject extension RoomExtensions roomExt
@Inject extension ProcedureHelpers helpers
- @Inject extension TypeHelpers typeHelpers
@Inject ILogger logger
def doGenerate(Root root) {
@@ -50,7 +48,6 @@ class DataClassGen { def generate(Root root, DataClass dc) {
val ctor = dc.operations.filter(op|op.constructor).head
- val dtor = dc.operations.filter(op|op.destructor).head
'''
package «dc.getPackage()»;
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend index f2ff2cddc..e73bec92a 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend @@ -193,7 +193,7 @@ class SubSystemClassGen { «ENDIF»
«ENDFOR»
«FOR portConfig : portConfigs»
- «var portName = "port"»«var item = portConfig.item»
+ «var item = portConfig.item»
«FOR attrConfig : portConfig.attributes»
«var a = attrConfig.attribute»
«var value = attrConfig.value.stringValue(a)»
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 fbf73c4b4..e40c66968 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 @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.java.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -21,19 +22,15 @@ import org.eclipse.etrice.core.room.util.RoomHelpers; import org.eclipse.etrice.generator.generic.GenericActorClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
import org.eclipse.etrice.generator.java.gen.StateMachineGen;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ActorClassGen extends GenericActorClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -45,9 +42,6 @@ public class ActorClassGen extends GenericActorClassGenerator { private RoomExtensions roomExt;
@Inject
- private TypeHelpers _typeHelpers;
-
- @Inject
private ProcedureHelpers helpers;
@Inject
@@ -64,47 +58,43 @@ public class ActorClassGen extends GenericActorClassGenerator { String _generationTargetPath = this.roomExt.getGenerationTargetPath(_actorClass);
ActorClass _actorClass_1 = xpac.getActorClass();
String _path = this.roomExt.getPath(_actorClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
ActorClass _actorClass_2 = xpac.getActorClass();
- String _javaFileName = this.stdExt.getJavaFileName(_actorClass_2);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating ActorClass implementation \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String file = this.stdExt.getJavaFileName(_actorClass_2);
+ String _plus = ("generating ActorClass implementation \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
ActorClass _actorClass_3 = xpac.getActorClass();
- StringConcatenation _generate = this.generate(root, xpac, _actorClass_3);
+ CharSequence _generate = this.generate(root, xpac, _actorClass_3);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generate(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isConstructor = RoomHelpers.isConstructor(op);
- return ((Boolean)_isConstructor);
+ return Boolean.valueOf(_isConstructor);
}
};
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
- StandardOperation _head = IterableExtensions.<StandardOperation>head(_filter);
- final StandardOperation ctor = _head;
+ final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
EList<StandardOperation> _operations_1 = ac.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isDestructor = op.isDestructor();
- return ((Boolean)_isDestructor);
+ return Boolean.valueOf(_isDestructor);
}
};
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
- StandardOperation _head_1 = IterableExtensions.<StandardOperation>head(_filter_1);
- final StandardOperation dtor = _head_1;
+ final StandardOperation dtor = IterableExtensions.<StandardOperation>head(_filter_1);
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this.roomExt.getPackage(ac);
@@ -153,7 +143,7 @@ public class ActorClassGen extends GenericActorClassGenerator { }
_builder.newLine();
DetailCode _userCode1 = ac.getUserCode1();
- StringConcatenation _userCode = this.helpers.userCode(_userCode1);
+ CharSequence _userCode = this.helpers.userCode(_userCode1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -171,8 +161,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(" extends ");
{
ActorClass _base = ac.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
ActorClass _base_1 = ac.getBase();
String _name_3 = _base_1.getName();
_builder.append(_name_3, "");
@@ -185,7 +175,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t");
DetailCode _userCode2 = ac.getUserCode2();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode2);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -258,11 +248,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t");
EList<Attribute> _attributes = ac.getAttributes();
- StringConcatenation _attributes_1 = this.helpers.attributes(_attributes);
+ CharSequence _attributes_1 = this.helpers.attributes(_attributes);
_builder.append(_attributes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(ac);
+ CharSequence _operationsImplementation = this.helpers.operationsImplementation(ac);
_builder.append(_operationsImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -277,8 +267,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLineIfNotEmpty();
{
ActorClass _base_2 = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base_2, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base_2, null);
+ if (_equals) {
_builder.append("\t\t");
_builder.append("super(parent, name, port_addr[0][0], peer_addr[0][0]);");
_builder.newLine();
@@ -298,7 +288,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t\t");
EList<Attribute> _attributes_2 = ac.getAttributes();
- StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes_2, false);
+ CharSequence _attributeInitialization = this.helpers.attributeInitialization(_attributes_2, false);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -323,8 +313,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(", ");
{
int _multiplicity = ep_1.getMultiplicity();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_multiplicity), ((Integer)1));
- if (_operator_equals_1) {
+ boolean _equals_1 = (_multiplicity == 1);
+ if (_equals_1) {
_builder.append("0, ");
}
}
@@ -334,8 +324,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("]");
{
int _multiplicity_1 = ep_1.getMultiplicity();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(((Integer)_multiplicity_1), ((Integer)1));
- if (_operator_equals_2) {
+ boolean _equals_2 = (_multiplicity_1 == 1);
+ if (_equals_2) {
_builder.append("[0]");
}
}
@@ -345,8 +335,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("]");
{
int _multiplicity_2 = ep_1.getMultiplicity();
- boolean _operator_equals_3 = ObjectExtensions.operator_equals(((Integer)_multiplicity_2), ((Integer)1));
- if (_operator_equals_3) {
+ boolean _equals_3 = (_multiplicity_2 == 1);
+ if (_equals_3) {
_builder.append("[0]");
}
}
@@ -420,8 +410,8 @@ public class ActorClassGen extends GenericActorClassGenerator { }
}
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(ctor, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(ctor, null));
+ if (_notEquals_1) {
_builder.append("\t\t");
_builder.newLine();
_builder.append("\t\t");
@@ -455,7 +445,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("\t");
EList<Attribute> _attributes_3 = ac.getAttributes();
String _name_24 = ac.getName();
- StringConcatenation _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_3, _name_24);
+ CharSequence _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_3, _name_24);
_builder.append(_attributeSettersGettersImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -468,7 +458,7 @@ public class ActorClassGen extends GenericActorClassGenerator { String _portClassName_6 = this.roomExt.getPortClassName(ep_2);
String _name_25 = ep_2.getName();
String _name_26 = ac.getName();
- StringConcatenation _terImplementation = this.helpers.getterImplementation(_portClassName_6, _name_25, _name_26);
+ CharSequence _terImplementation = this.helpers.getterImplementation(_portClassName_6, _name_25, _name_26);
_builder.append(_terImplementation, " ");
_builder.newLineIfNotEmpty();
}
@@ -480,7 +470,7 @@ public class ActorClassGen extends GenericActorClassGenerator { String _portClassName_7 = this.roomExt.getPortClassName(sap_2);
String _name_27 = sap_2.getName();
String _name_28 = ac.getName();
- StringConcatenation _terImplementation_1 = this.helpers.getterImplementation(_portClassName_7, _name_27, _name_28);
+ CharSequence _terImplementation_1 = this.helpers.getterImplementation(_portClassName_7, _name_27, _name_28);
_builder.append(_terImplementation_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -493,7 +483,7 @@ public class ActorClassGen extends GenericActorClassGenerator { SPPRef _spp_6 = svc_2.getSpp();
String _name_29 = _spp_6.getName();
String _name_30 = ac.getName();
- StringConcatenation _terImplementation_2 = this.helpers.getterImplementation(_portClassName_8, _name_29, _name_30);
+ CharSequence _terImplementation_2 = this.helpers.getterImplementation(_portClassName_8, _name_29, _name_30);
_builder.append(_terImplementation_2, " ");
_builder.newLineIfNotEmpty();
}
@@ -524,8 +514,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
{
boolean _overridesStop = this.roomExt.overridesStop(ac);
- boolean _operator_not = BooleanExtensions.operator_not(_overridesStop);
- if (_operator_not) {
+ boolean _not = (!_overridesStop);
+ if (_not) {
_builder.append("\t");
_builder.append("public void stop(){");
_builder.newLine();
@@ -544,8 +534,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("public void destroy(){");
_builder.newLine();
{
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(dtor, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(dtor, null));
+ if (_notEquals_2) {
_builder.append("\t\t");
_builder.newLine();
{
@@ -567,13 +557,13 @@ public class ActorClassGen extends GenericActorClassGenerator { boolean _hasNonEmptyStateMachine = RoomHelpers.hasNonEmptyStateMachine(ac);
if (_hasNonEmptyStateMachine) {
_builder.append("\t");
- StringConcatenation _genStateMachine = this.stateMachineGen.genStateMachine(xpac, ac);
+ CharSequence _genStateMachine = this.stateMachineGen.genStateMachine(xpac, ac);
_builder.append(_genStateMachine, " ");
_builder.newLineIfNotEmpty();
} else {
boolean _hasStateMachine = xpac.hasStateMachine();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_hasStateMachine);
- if (_operator_not_1) {
+ boolean _not_1 = (!_hasStateMachine);
+ if (_not_1) {
_builder.append("\t");
_builder.append("//--------------------- no state machine");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java index 459734e95..18bd28340 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.java.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -17,17 +18,14 @@ import org.eclipse.etrice.core.room.StandardOperation; import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class DataClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -42,9 +40,6 @@ public class DataClassGen { private ProcedureHelpers helpers;
@Inject
- private TypeHelpers typeHelpers;
-
- @Inject
private ILogger logger;
public void doGenerate(final Root root) {
@@ -53,45 +48,32 @@ public class DataClassGen { {
String _generationTargetPath = this.roomExt.getGenerationTargetPath(dc);
String _path = this.roomExt.getPath(dc);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
- String _javaFileName = this.stdExt.getJavaFileName(dc);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating DataClass implementation \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String path = (_generationTargetPath + _path);
+ String file = this.stdExt.getJavaFileName(dc);
+ String _plus = ("generating DataClass implementation \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
- StringConcatenation _generate = this.generate(root, dc);
+ CharSequence _generate = this.generate(root, dc);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final DataClass dc) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generate(final Root root, final DataClass dc) {
+ CharSequence _xblockexpression = null;
{
EList<StandardOperation> _operations = dc.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isConstructor = RoomHelpers.isConstructor(op);
- return ((Boolean)_isConstructor);
+ return Boolean.valueOf(_isConstructor);
}
};
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
- StandardOperation _head = IterableExtensions.<StandardOperation>head(_filter);
- final StandardOperation ctor = _head;
- EList<StandardOperation> _operations_1 = dc.getOperations();
- final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return ((Boolean)_isDestructor);
- }
- };
- Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
- StandardOperation _head_1 = IterableExtensions.<StandardOperation>head(_filter_1);
- final StandardOperation dtor = _head_1;
+ final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this.roomExt.getPackage(dc);
@@ -99,8 +81,7 @@ public class DataClassGen { _builder.append(";");
_builder.newLineIfNotEmpty();
_builder.newLine();
- EList<RoomModel> _referencedModels = root.getReferencedModels(dc);
- EList<RoomModel> models = _referencedModels;
+ EList<RoomModel> models = root.getReferencedModels(dc);
_builder.newLineIfNotEmpty();
{
for(final RoomModel model : models) {
@@ -113,7 +94,7 @@ public class DataClassGen { }
_builder.newLine();
DetailCode _userCode1 = dc.getUserCode1();
- StringConcatenation _userCode = this.helpers.userCode(_userCode1);
+ CharSequence _userCode = this.helpers.userCode(_userCode1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -123,8 +104,8 @@ public class DataClassGen { _builder.append(_name_1, "");
{
DataClass _base = dc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
_builder.append(" extends ");
DataClass _base_1 = dc.getBase();
String _name_2 = _base_1.getName();
@@ -137,14 +118,14 @@ public class DataClassGen { _builder.newLine();
_builder.append("\t");
DetailCode _userCode2 = dc.getUserCode2();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode2);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _attributes_1 = this.helpers.attributes(_attributes);
+ CharSequence _attributes_1 = this.helpers.attributes(_attributes);
_builder.append(_attributes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -152,15 +133,15 @@ public class DataClassGen { _builder.append("\t");
EList<Attribute> _attributes_2 = dc.getAttributes();
String _name_3 = dc.getName();
- StringConcatenation _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_2, _name_3);
+ CharSequence _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_2, _name_3);
_builder.append(_attributeSettersGettersImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
- EList<StandardOperation> _operations_2 = dc.getOperations();
+ EList<StandardOperation> _operations_1 = dc.getOperations();
String _name_4 = dc.getName();
- StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(_operations_2, _name_4);
+ CharSequence _operationsImplementation = this.helpers.operationsImplementation(_operations_1, _name_4);
_builder.append(_operationsImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -181,12 +162,12 @@ public class DataClassGen { _builder.newLine();
_builder.append("\t\t");
EList<Attribute> _attributes_3 = dc.getAttributes();
- StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes_3, true);
+ CharSequence _attributeInitialization = this.helpers.attributeInitialization(_attributes_3, true);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(ctor, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(ctor, null));
+ if (_notEquals_1) {
_builder.append("\t\t");
_builder.newLine();
_builder.append("\t\t");
@@ -230,8 +211,8 @@ public class DataClassGen { _builder.newLineIfNotEmpty();
{
DataClass _base_2 = dc.getBase();
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_base_2, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(_base_2, null));
+ if (_notEquals_2) {
_builder.append("\t\t");
_builder.append("super(");
DataClass _base_3 = dc.getBase();
@@ -301,38 +282,38 @@ public class DataClassGen { }
public String paramList(final DataClass _dc) {
- String result = "";
- DataClass dc = _dc;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- Boolean _xwhileexpression = _operator_notEquals;
- while (_xwhileexpression) {
- {
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _paramList = this.paramList(_attributes);
- String _string = _paramList.toString();
- String _operator_plus = StringExtensions.operator_plus(_string, result);
- result = _operator_plus;
- DataClass _base = dc.getBase();
- dc = _base;
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(dc, null);
- if (_operator_notEquals_1) {
- String _operator_plus_1 = StringExtensions.operator_plus(", ", result);
- result = _operator_plus_1;
- }
+ String result = "";
+ DataClass dc = _dc;
+ boolean _notEquals = (!Objects.equal(dc, null));
+ boolean _while = _notEquals;
+ while (_while) {
+ {
+ EList<Attribute> _attributes = dc.getAttributes();
+ CharSequence _paramList = this.paramList(_attributes);
+ String _string = _paramList.toString();
+ String _plus = (_string + result);
+ result = _plus;
+ DataClass _base = dc.getBase();
+ dc = _base;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ if (_notEquals_1) {
+ String _plus_1 = (", " + result);
+ result = _plus_1;
}
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(dc, null);
- _xwhileexpression = _operator_notEquals_2;
}
- return result;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ _while = _notEquals_1;
+ }
+ return result;
}
- public StringConcatenation paramList(final List<Attribute> attributes) {
+ public CharSequence paramList(final List<Attribute> attributes) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute a : attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
@@ -344,53 +325,53 @@ public class DataClassGen { }
public String argList(final DataClass _dc) {
- String result = "";
- DataClass dc = _dc;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- Boolean _xwhileexpression = _operator_notEquals;
- while (_xwhileexpression) {
- {
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _argList = this.helpers.argList(_attributes);
- String _string = _argList.toString();
- String _operator_plus = StringExtensions.operator_plus(_string, result);
- result = _operator_plus;
- DataClass _base = dc.getBase();
- dc = _base;
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(dc, null);
- if (_operator_notEquals_1) {
- String _operator_plus_1 = StringExtensions.operator_plus(", ", result);
- result = _operator_plus_1;
- }
+ String result = "";
+ DataClass dc = _dc;
+ boolean _notEquals = (!Objects.equal(dc, null));
+ boolean _while = _notEquals;
+ while (_while) {
+ {
+ EList<Attribute> _attributes = dc.getAttributes();
+ CharSequence _argList = this.helpers.argList(_attributes);
+ String _string = _argList.toString();
+ String _plus = (_string + result);
+ result = _plus;
+ DataClass _base = dc.getBase();
+ dc = _base;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ if (_notEquals_1) {
+ String _plus_1 = (", " + result);
+ result = _plus_1;
}
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(dc, null);
- _xwhileexpression = _operator_notEquals_2;
}
- return result;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ _while = _notEquals_1;
+ }
+ return result;
}
public String deepCopy(final DataClass _dc) {
- String result = "";
- DataClass dc = _dc;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- Boolean _xwhileexpression = _operator_notEquals;
- while (_xwhileexpression) {
- {
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _deepCopy = this.deepCopy(_attributes);
- String _string = _deepCopy.toString();
- String _operator_plus = StringExtensions.operator_plus(_string, result);
- result = _operator_plus;
- DataClass _base = dc.getBase();
- dc = _base;
- }
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(dc, null);
- _xwhileexpression = _operator_notEquals_1;
+ String result = "";
+ DataClass dc = _dc;
+ boolean _notEquals = (!Objects.equal(dc, null));
+ boolean _while = _notEquals;
+ while (_while) {
+ {
+ EList<Attribute> _attributes = dc.getAttributes();
+ CharSequence _deepCopy = this.deepCopy(_attributes);
+ String _string = _deepCopy.toString();
+ String _plus = (_string + result);
+ result = _plus;
+ DataClass _base = dc.getBase();
+ dc = _base;
}
- return result;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ _while = _notEquals_1;
+ }
+ return result;
}
- public StringConcatenation deepCopy(final List<Attribute> attributes) {
+ public CharSequence deepCopy(final List<Attribute> attributes) {
StringConcatenation _builder = new StringConcatenation();
{
for(final Attribute a : attributes) {
@@ -405,8 +386,8 @@ public class DataClassGen { _builder.newLineIfNotEmpty();
{
int _size = a.getSize();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_size), ((Integer)0));
- if (_operator_equals) {
+ boolean _equals = (_size == 0);
+ if (_equals) {
_builder.append("\t");
_builder.append("copy.");
String _name_1 = a.getName();
@@ -443,8 +424,8 @@ public class DataClassGen { } else {
{
int _size_1 = a.getSize();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_size_1), ((Integer)0));
- if (_operator_equals_1) {
+ boolean _equals_1 = (_size_1 == 0);
+ if (_equals_1) {
_builder.append("copy.");
String _name_6 = a.getName();
_builder.append(_name_6, "");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java index 18695aa27..a415ff462 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java @@ -7,25 +7,23 @@ import org.eclipse.etrice.core.room.Message; import org.eclipse.etrice.core.room.RoomClass;
import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class JavaExtensions implements ILanguageExtension {
@Inject
private AbstractTransitionChainGenerator chainGenerator;
public String getTypedDataDefinition(final Message m) {
- String _generateTypedData = this.chainGenerator.generateTypedData(m);
- return _generateTypedData;
+ return this.chainGenerator.generateTypedData(m);
}
public String getJavaFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".java");
- return _operator_plus;
+ String _plus = (_name + ".java");
+ return _plus;
}
public String accessLevelPrivate() {
@@ -61,9 +59,8 @@ public class JavaExtensions implements ILanguageExtension { }
public String memberInUse(final String namespace, final String member) {
- String _operator_plus = StringExtensions.operator_plus(namespace, ".");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, member);
- return _operator_plus_1;
+ String _plus = (namespace + ".");
+ return (_plus + member);
}
public boolean usesInheritance() {
@@ -89,7 +86,7 @@ public class JavaExtensions implements ILanguageExtension { }
public String booleanConstant(final boolean b) {
- String _string = ((Boolean)b).toString();
+ String _string = Boolean.valueOf(b).toString();
return _string;
}
@@ -106,10 +103,10 @@ public class JavaExtensions implements ILanguageExtension { }
public String arrayDeclaration(final String type, final int size, final String name, final boolean isRef) {
- String _operator_plus = StringExtensions.operator_plus(type, " ");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "[]");
- return _operator_plus_2;
+ String _plus = (type + " ");
+ String _plus_1 = (_plus + name);
+ String _plus_2 = (_plus_1 + "[]");
+ return _plus_2;
}
public String constructorName(final String cls) {
@@ -117,8 +114,8 @@ public class JavaExtensions implements ILanguageExtension { }
public String destructorName(final String cls) {
- String _operator_plus = StringExtensions.operator_plus(cls, "_dtor");
- return _operator_plus;
+ String _plus = (cls + "_dtor");
+ return _plus;
}
public String constructorReturnType() {
@@ -130,8 +127,8 @@ public class JavaExtensions implements ILanguageExtension { }
public String toCharArrayExpr(final String s) {
- String _operator_plus = StringExtensions.operator_plus("\"", s);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\".toCharArray()");
- return _operator_plus_1;
+ String _plus = ("\"" + s);
+ String _plus_1 = (_plus + "\".toCharArray()");
+ return _plus_1;
}
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java index e03ec7cd6..fba8b068e 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java @@ -14,10 +14,9 @@ import org.eclipse.etrice.generator.java.gen.SubSystemClassGen; import org.eclipse.etrice.generator.java.gen.SubSystemRunnerGen;
import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class MainGen implements IGenerator {
@Inject
private DataClassGen dataClassGen;
@@ -38,24 +37,24 @@ public class MainGen implements IGenerator { private PrepareFileSystem prepFS;
public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- this.prepFS.prepare(resource);
- EList<EObject> _contents = resource.getContents();
- for (final EObject e : _contents) {
- if ((e instanceof Root)) {
- this.doGenerate(((Root) e));
- }
+ this.prepFS.prepare(resource);
+ EList<EObject> _contents = resource.getContents();
+ for (final EObject e : _contents) {
+ if ((e instanceof Root)) {
+ this.doGenerate(((Root) e));
}
+ }
}
public void doGenerate(final Root e) {
- this.dataClassGen.doGenerate(e);
- this.protocolClassGen.doGenerate(e);
- this.actorClassGen.doGenerate(e);
- this.subsystemClassGen.doGenerate(e);
- boolean _isLibrary = e.isLibrary();
- boolean _operator_not = BooleanExtensions.operator_not(_isLibrary);
- if (_operator_not) {
- this.subsystemRunnerGen.doGenerate(e);
- }
+ this.dataClassGen.doGenerate(e);
+ this.protocolClassGen.doGenerate(e);
+ this.actorClassGen.doGenerate(e);
+ this.subsystemClassGen.doGenerate(e);
+ boolean _isLibrary = e.isLibrary();
+ boolean _not = (!_isLibrary);
+ if (_not) {
+ this.subsystemRunnerGen.doGenerate(e);
+ }
}
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java index 13c652843..de0efeaf5 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.java.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -24,15 +25,11 @@ import org.eclipse.etrice.generator.generic.ProcedureHelpers; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -58,23 +55,21 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { {
String _generationTargetPath = this.roomExt.getGenerationTargetPath(pc);
String _path = this.roomExt.getPath(pc);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
- String _javaFileName = this.stdExt.getJavaFileName(pc);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating ProtocolClass implementation \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String path = (_generationTargetPath + _path);
+ String file = this.stdExt.getJavaFileName(pc);
+ String _plus = ("generating ProtocolClass implementation \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
- StringConcatenation _generate = this.generate(root, pc);
+ CharSequence _generate = this.generate(root, pc);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final ProtocolClass pc) {
+ public CharSequence generate(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this.roomExt.getPackage(pc);
@@ -95,12 +90,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
DetailCode _userCode1 = pc.getUserCode1();
- StringConcatenation _userCode = this.helpers.userCode(_userCode1);
+ CharSequence _userCode = this.helpers.userCode(_userCode1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
- EList<RoomModel> _referencedModels = root.getReferencedModels(pc);
- EList<RoomModel> models = _referencedModels;
+ EList<RoomModel> models = root.getReferencedModels(pc);
_builder.newLineIfNotEmpty();
{
for(final RoomModel model : models) {
@@ -127,7 +121,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.append("\t");
DetailCode _userCode2 = pc.getUserCode2();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode2);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -184,11 +178,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
_builder.append("\t");
- StringConcatenation _portClass = this.portClass(pc, ((Boolean)false));
+ CharSequence _portClass = this.portClass(pc, Boolean.valueOf(false));
_builder.append(_portClass, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- StringConcatenation _portClass_1 = this.portClass(pc, ((Boolean)true));
+ CharSequence _portClass_1 = this.portClass(pc, Boolean.valueOf(true));
_builder.append(_portClass_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("}");
@@ -196,15 +190,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- public StringConcatenation portClass(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence portClass(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- PortClass _portClass = this.roomExt.getPortClass(pc, conj);
- PortClass pclass = _portClass;
- String _portClassName = this.roomExt.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this.roomExt.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ PortClass pclass = this.roomExt.getPortClass(pc, (conj).booleanValue());
+ String portClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue());
+ String replPortClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue(), true);
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
_builder.append("// port class");
@@ -214,11 +205,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(" extends PortBase {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(pclass, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(pclass, null));
+ if (_notEquals) {
_builder.append("\t");
DetailCode _userCode = pclass.getUserCode();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -249,11 +240,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("super(actor, name, localId, idx, addr, peerAddress);");
_builder.newLine();
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(pclass, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(pclass, null));
+ if (_notEquals_1) {
_builder.append("\t\t");
EList<Attribute> _attributes = pclass.getAttributes();
- StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes, true);
+ CharSequence _attributeInitialization = this.helpers.attributeInitialization(_attributes, true);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
}
@@ -299,13 +290,13 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("}");
_builder.newLine();
{
- boolean _handlesReceive = this.roomExt.handlesReceive(pc, conj);
+ boolean _handlesReceive = this.roomExt.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive) {
_builder.append("\t\t\t\t");
_builder.append("switch (msg.getEvtId()) {");
_builder.newLine();
{
- List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, conj);
+ List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, (conj).booleanValue());
for(final MessageHandler hdlr : _receiveHandlers) {
_builder.append("\t\t\t\t");
_builder.append("\t");
@@ -359,7 +350,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("getActor().receiveEvent(this, msg.getEvtId(), null);");
_builder.newLine();
{
- boolean _handlesReceive_1 = this.roomExt.handlesReceive(pc, conj);
+ boolean _handlesReceive_1 = this.roomExt.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive_1) {
_builder.append("\t\t\t\t");
_builder.append("}");
@@ -374,11 +365,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
{
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(pclass, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(pclass, null));
+ if (_notEquals_2) {
_builder.append("\t");
EList<Attribute> _attributes_1 = pclass.getAttributes();
- StringConcatenation _attributes_2 = this.helpers.attributes(_attributes_1);
+ CharSequence _attributes_2 = this.helpers.attributes(_attributes_1);
_builder.append(_attributes_2, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -386,12 +377,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.append("\t");
EList<Attribute> _attributes_3 = pclass.getAttributes();
- StringConcatenation _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_3, null);
+ CharSequence _attributeSettersGettersImplementation = this.helpers.attributeSettersGettersImplementation(_attributes_3, null);
_builder.append(_attributeSettersGettersImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
EList<PortOperation> _operations = pclass.getOperations();
- StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(_operations, portClassName);
+ CharSequence _operationsImplementation = this.helpers.operationsImplementation(_operations, portClassName);
_builder.append(_operationsImplementation, " ");
_builder.newLineIfNotEmpty();
}
@@ -402,10 +393,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("// sent messages");
_builder.newLine();
{
- List<Message> _outgoing = this.roomExt.getOutgoing(pc, conj);
+ List<Message> _outgoing = this.roomExt.getOutgoing(pc, (conj).booleanValue());
for(final Message m : _outgoing) {
_builder.append("\t");
- StringConcatenation _sendMessage = this.sendMessage(m, conj);
+ CharSequence _sendMessage = this.sendMessage(m, (conj).booleanValue());
_builder.append(_sendMessage, " ");
_builder.newLineIfNotEmpty();
}
@@ -502,7 +493,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
_builder.newLine();
{
- if (conj) {
+ if ((conj).booleanValue()) {
_builder.append("\t");
_builder.append("// incoming messages");
_builder.newLine();
@@ -510,7 +501,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
for(final Message m_1 : _allIncomingMessages) {
_builder.append("\t");
- StringConcatenation _messageSignature = this.messageSignature(m_1);
+ CharSequence _messageSignature = this.messageSignature(m_1);
_builder.append(_messageSignature, " ");
_builder.append("{");
_builder.newLineIfNotEmpty();
@@ -521,7 +512,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
_builder.append("\t\t");
_builder.append("ports.get(i).");
- StringConcatenation _messageCall = this.messageCall(m_1);
+ CharSequence _messageCall = this.messageCall(m_1);
_builder.append(_messageCall, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -542,7 +533,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);
for(final Message m_2 : _allOutgoingMessages) {
_builder.append("\t");
- StringConcatenation _messageSignature_1 = this.messageSignature(m_2);
+ CharSequence _messageSignature_1 = this.messageSignature(m_2);
_builder.append(_messageSignature_1, " ");
_builder.append("{");
_builder.newLineIfNotEmpty();
@@ -553,7 +544,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
_builder.append("\t\t");
_builder.append("ports.get(i).");
- StringConcatenation _messageCall_1 = this.messageCall(m_2);
+ CharSequence _messageCall_1 = this.messageCall(m_2);
_builder.append(_messageCall_1, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -576,7 +567,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- public StringConcatenation messageSignature(final Message m) {
+ public CharSequence messageSignature(final Message m) {
StringConcatenation _builder = new StringConcatenation();
{
boolean _isPriv = m.isPriv();
@@ -592,8 +583,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("(");
{
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_data, null));
+ if (_notEquals) {
VarDecl _data_1 = m.getData();
RefableType _refType = _data_1.getRefType();
DataType _type = _refType.getType();
@@ -609,8 +600,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- public StringConcatenation messageSignatureExplicit(final Message m) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence messageSignatureExplicit(final Message m) {
+ CharSequence _xblockexpression = null;
{
VarDecl _data = m.getData();
RefableType _refType = _data.getRefType();
@@ -623,8 +614,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("(");
{
DataClass _base = dc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
DataClass _base_1 = dc.getBase();
String _typeName = this._typeHelpers.typeName(_base_1);
_builder.append(_typeName, "");
@@ -633,10 +624,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { }
{
EList<Attribute> _attributes = dc.getAttributes();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute a : _attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
@@ -646,8 +637,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(_typeName_1, "");
{
int _size = a.getSize();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)1));
- if (_operator_greaterThan) {
+ boolean _greaterThan = (_size > 1);
+ if (_greaterThan) {
_builder.append("[]");
}
}
@@ -662,15 +653,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- public StringConcatenation messageCall(final Message m) {
+ public CharSequence messageCall(final Message m) {
StringConcatenation _builder = new StringConcatenation();
String _name = m.getName();
_builder.append(_name, "");
_builder.append("(");
{
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_data, null));
+ if (_notEquals) {
_builder.append(" ");
VarDecl _data_1 = m.getData();
String _name_1 = _data_1.getName();
@@ -681,8 +672,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- public StringConcatenation sendMessage(final Message m, final boolean conj) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence sendMessage(final Message m, final boolean conj) {
+ CharSequence _xblockexpression = null;
{
String _xifexpression = null;
if (conj) {
@@ -691,16 +682,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _xifexpression = "OUT";
}
String dir = _xifexpression;
- MessageHandler _sendHandler = this.roomExt.getSendHandler(m, conj);
- MessageHandler hdlr = _sendHandler;
+ MessageHandler hdlr = this.roomExt.getSendHandler(m, conj);
StringConcatenation _builder = new StringConcatenation();
- StringConcatenation _messageSignature = this.messageSignature(m);
+ CharSequence _messageSignature = this.messageSignature(m);
_builder.append(_messageSignature, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(hdlr, null));
+ if (_notEquals) {
_builder.append("\t");
{
DetailCode _detailCode = hdlr.getDetailCode();
@@ -738,8 +728,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
{
VarDecl _data = m.getData();
- boolean _operator_equals = ObjectExtensions.operator_equals(_data, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_data, null);
+ if (_equals) {
_builder.append("getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), ");
_builder.append(dir, " ");
_builder.append("_");
@@ -760,21 +750,21 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String _name_4 = _data_1.getName();
_builder.append(_name_4, " ");
{
- boolean _operator_and = false;
+ boolean _and = false;
VarDecl _data_2 = m.getData();
RefableType _refType = _data_2.getRefType();
boolean _isRef = _refType.isRef();
- boolean _operator_not = BooleanExtensions.operator_not(_isRef);
- if (!_operator_not) {
- _operator_and = false;
+ boolean _not = (!_isRef);
+ if (!_not) {
+ _and = false;
} else {
VarDecl _data_3 = m.getData();
RefableType _refType_1 = _data_3.getRefType();
DataType _type = _refType_1.getType();
- boolean _operator_not_1 = BooleanExtensions.operator_not((_type instanceof PrimitiveType));
- _operator_and = BooleanExtensions.operator_and(_operator_not, _operator_not_1);
+ boolean _not_1 = (!(_type instanceof PrimitiveType));
+ _and = (_not && _not_1);
}
- if (_operator_and) {
+ if (_and) {
_builder.append(".deepCopy()");
}
}
@@ -787,19 +777,19 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("}");
_builder.newLine();
{
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
VarDecl _data_4 = m.getData();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_data_4, null);
- if (!_operator_notEquals_1) {
- _operator_and_1 = false;
+ boolean _notEquals_1 = (!Objects.equal(_data_4, null));
+ if (!_notEquals_1) {
+ _and_1 = false;
} else {
VarDecl _data_5 = m.getData();
RefableType _refType_2 = _data_5.getRefType();
DataType _type_1 = _refType_2.getType();
- _operator_and_1 = BooleanExtensions.operator_and(_operator_notEquals_1, (_type_1 instanceof DataClass));
+ _and_1 = (_notEquals_1 && (_type_1 instanceof DataClass));
}
- if (_operator_and_1) {
- StringConcatenation _messageSignatureExplicit = this.messageSignatureExplicit(m);
+ if (_and_1) {
+ CharSequence _messageSignatureExplicit = this.messageSignatureExplicit(m);
_builder.append(_messageSignatureExplicit, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -818,8 +808,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { RefableType _refType_4 = _data_7.getRefType();
DataType _type_3 = _refType_4.getType();
DataClass _base = ((DataClass) _type_3).getBase();
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(_base, null));
+ if (_notEquals_2) {
_builder.append("_super, ");
}
}
@@ -828,10 +818,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { RefableType _refType_5 = _data_8.getRefType();
DataType _type_4 = _refType_5.getType();
EList<Attribute> _attributes = ((DataClass) _type_4).getAttributes();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute a : _attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", " ");
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java index 4854aa8dc..154d17e8f 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java @@ -8,25 +8,25 @@ import org.eclipse.etrice.core.room.ActorClass; import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
+import org.eclipse.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
private RoomExtensions _roomExtensions;
- public StringConcatenation genExtra(final ExpandedActorClass xpac, final ActorClass ac) {
+ public CharSequence genExtra(final ExpandedActorClass xpac, final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("// state names");
_builder.newLine();
_builder.append("protected static final String stateStrings[] = {\"<no state>\",\"<top>\",");
{
List<State> _allBaseStatesLeavesLast = this._roomExtensions.getAllBaseStatesLeavesLast(ac);
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final State state : _allBaseStatesLeavesLast) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", "");
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java index abcca8bb6..810d7ce0f 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java @@ -28,14 +28,11 @@ import org.eclipse.etrice.generator.generic.ProcedureHelpers; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class SubSystemClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -66,25 +63,23 @@ public class SubSystemClassGen { String _generationTargetPath = this.roomExt.getGenerationTargetPath(_subSystemClass);
SubSystemClass _subSystemClass_1 = ssi.getSubSystemClass();
String _path = this.roomExt.getPath(_subSystemClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
SubSystemClass _subSystemClass_2 = ssi.getSubSystemClass();
- String _javaFileName = this.stdExt.getJavaFileName(_subSystemClass_2);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating SubSystemClass implementation: \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String file = this.stdExt.getJavaFileName(_subSystemClass_2);
+ String _plus = ("generating SubSystemClass implementation: \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_3 = ssi.getSubSystemClass();
- StringConcatenation _generate = this.generate(root, ssi, _subSystemClass_3);
+ CharSequence _generate = this.generate(root, ssi, _subSystemClass_3);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final SubSystemInstance comp, final SubSystemClass cc) {
+ public CharSequence generate(final Root root, final SubSystemInstance comp, final SubSystemClass cc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this.roomExt.getPackage(cc);
@@ -109,8 +104,7 @@ public class SubSystemClassGen { _builder.append("import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;");
_builder.newLine();
_builder.newLine();
- EList<RoomModel> _referencedModels = root.getReferencedModels(cc);
- EList<RoomModel> models = _referencedModels;
+ EList<RoomModel> models = root.getReferencedModels(cc);
_builder.newLineIfNotEmpty();
{
for(final RoomModel model : models) {
@@ -124,7 +118,7 @@ public class SubSystemClassGen { _builder.newLine();
_builder.newLine();
DetailCode _userCode1 = cc.getUserCode1();
- StringConcatenation _userCode = this.helpers.userCode(_userCode1);
+ CharSequence _userCode = this.helpers.userCode(_userCode1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -136,7 +130,7 @@ public class SubSystemClassGen { _builder.newLine();
_builder.append("\t");
DetailCode _userCode2 = cc.getUserCode2();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode2);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -184,8 +178,8 @@ public class SubSystemClassGen { _builder.append("RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, ");
EList<LogicalThread> _threads_1 = cc.getThreads();
int _indexOf = _threads_1.indexOf(thread);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_indexOf), ((Integer)1));
- _builder.append(_operator_plus, " ");
+ int _plus = (_indexOf + 1);
+ _builder.append(_plus, " ");
_builder.append(", 0),\"MessageService_");
String _name_3 = thread.getName();
_builder.append(_name_3, " ");
@@ -273,8 +267,7 @@ public class SubSystemClassGen { for(final InterfaceItemInstance peer : _peers) {
_builder.append("\t\t");
EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- int _indexOf_2 = _peers_1.indexOf(peer);
- int i = _indexOf_2;
+ int i = _peers_1.indexOf(peer);
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("Address addr_item_");
@@ -288,8 +281,8 @@ public class SubSystemClassGen { _builder.append(_threadId_1, " ");
_builder.append(",");
int _objId_1 = pi.getObjId();
- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)_objId_1), ((Integer)i));
- _builder.append(_operator_plus_1, " ");
+ int _plus_1 = (_objId_1 + i);
+ _builder.append(_plus_1, " ");
_builder.append(");");
_builder.newLineIfNotEmpty();
}
@@ -331,8 +324,8 @@ public class SubSystemClassGen { _builder.append("\t\t");
_builder.append("instances[");
EList<ActorInstance> _allContainedInstances_5 = comp.getAllContainedInstances();
- int _indexOf_3 = _allContainedInstances_5.indexOf(ai_2);
- _builder.append(_indexOf_3, " ");
+ int _indexOf_2 = _allContainedInstances_5.indexOf(ai_2);
+ _builder.append(_indexOf_2, " ");
_builder.append("] = new ");
ActorClass _actorClass = ai_2.getActorClass();
String _name_4 = _actorClass.getName();
@@ -352,8 +345,8 @@ public class SubSystemClassGen { _builder.append("instances[");
EList<ActorInstance> _allContainedInstances_6 = comp.getAllContainedInstances();
EObject _eContainer_1 = ai_2.eContainer();
- int _indexOf_4 = _allContainedInstances_6.indexOf(_eContainer_1);
- _builder.append(_indexOf_4, " ");
+ int _indexOf_3 = _allContainedInstances_6.indexOf(_eContainer_1);
+ _builder.append(_indexOf_3, " ");
_builder.append("],");
_builder.newLineIfNotEmpty();
}
@@ -379,18 +372,18 @@ public class SubSystemClassGen { {
EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai_2.getOrderedIfItemInstances();
boolean _isEmpty = _orderedIfItemInstances_1.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append(",");
}
}
_builder.newLineIfNotEmpty();
{
EList<InterfaceItemInstance> _orderedIfItemInstances_2 = ai_2.getOrderedIfItemInstances();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final InterfaceItemInstance pi_1 : _orderedIfItemInstances_2) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -412,10 +405,10 @@ public class SubSystemClassGen { _builder.newLine();
{
EList<InterfaceItemInstance> _peers_3 = pi_1.getPeers();
- boolean hasAnyElements_1 = false;
+ boolean _hasElements_1 = false;
for(final InterfaceItemInstance peer_1 : _peers_3) {
- if (!hasAnyElements_1) {
- hasAnyElements_1 = true;
+ if (!_hasElements_1) {
+ _hasElements_1 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -428,8 +421,8 @@ public class SubSystemClassGen { _builder.append(_pathName_4, " ");
_builder.append("_");
EList<InterfaceItemInstance> _peers_4 = pi_1.getPeers();
- int _indexOf_5 = _peers_4.indexOf(peer_1);
- _builder.append(_indexOf_5, " ");
+ int _indexOf_4 = _peers_4.indexOf(peer_1);
+ _builder.append(_indexOf_4, " ");
_builder.newLineIfNotEmpty();
}
}
@@ -472,38 +465,38 @@ public class SubSystemClassGen { _builder.append("\t");
_builder.append("new Address[][] {{addr_item_SystemPort_");
EList<ActorInstance> _allContainedInstances_7 = comp.getAllContainedInstances();
- int _indexOf_6 = _allContainedInstances_7.indexOf(ai_2);
- _builder.append(_indexOf_6, " ");
+ int _indexOf_5 = _allContainedInstances_7.indexOf(ai_2);
+ _builder.append(_indexOf_5, " ");
_builder.append("}");
{
EList<InterfaceItemInstance> _orderedIfItemInstances_3 = ai_2.getOrderedIfItemInstances();
boolean _isEmpty_2 = _orderedIfItemInstances_3.isEmpty();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_2);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_2);
+ if (_not_1) {
_builder.append(",");
}
}
_builder.newLineIfNotEmpty();
{
EList<InterfaceItemInstance> _orderedIfItemInstances_4 = ai_2.getOrderedIfItemInstances();
- boolean hasAnyElements_2 = false;
+ boolean _hasElements_2 = false;
for(final InterfaceItemInstance pi_2 : _orderedIfItemInstances_4) {
- if (!hasAnyElements_2) {
- hasAnyElements_2 = true;
+ if (!_hasElements_2) {
+ _hasElements_2 = true;
} else {
_builder.appendImmediate(",", " ");
}
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _isReplicated_2 = pi_2.isReplicated();
if (!_isReplicated_2) {
- _operator_and = false;
+ _and = false;
} else {
EList<InterfaceItemInstance> _peers_5 = pi_2.getPeers();
boolean _isEmpty_3 = _peers_5.isEmpty();
- _operator_and = BooleanExtensions.operator_and(_isReplicated_2, _isEmpty_3);
+ _and = (_isReplicated_2 && _isEmpty_3);
}
- if (_operator_and) {
+ if (_and) {
_builder.append("\t\t");
_builder.append("\t\t");
_builder.append("null");
@@ -525,10 +518,10 @@ public class SubSystemClassGen { } else {
{
EList<InterfaceItemInstance> _peers_7 = pi_2.getPeers();
- boolean hasAnyElements_3 = false;
+ boolean _hasElements_3 = false;
for(final InterfaceItemInstance pp : _peers_7) {
- if (!hasAnyElements_3) {
- hasAnyElements_3 = true;
+ if (!_hasElements_3) {
+ _hasElements_3 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -544,8 +537,8 @@ public class SubSystemClassGen { _builder.append(_pathName_6, " ");
_builder.append("_");
EList<InterfaceItemInstance> _peers_8 = pp.getPeers();
- int _indexOf_7 = _peers_8.indexOf(pi_2);
- _builder.append(_indexOf_7, " ");
+ int _indexOf_6 = _peers_8.indexOf(pi_2);
+ _builder.append(_indexOf_6, " ");
_builder.newLineIfNotEmpty();
} else {
_builder.append("\t\t");
@@ -588,25 +581,23 @@ public class SubSystemClassGen { EList<ActorInstance> _allContainedInstances_8 = comp.getAllContainedInstances();
for(final ActorInstance ai_3 : _allContainedInstances_8) {
_builder.append("\t\t");
- List<AttrInstanceConfig> _configAttributes = this.configExt.getConfigAttributes(ai_3);
- List<AttrInstanceConfig> attrConfigs = _configAttributes;
+ List<AttrInstanceConfig> attrConfigs = this.configExt.getConfigAttributes(ai_3);
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
- List<PortInstanceConfig> _configPorts = this.configExt.getConfigPorts(ai_3);
- List<PortInstanceConfig> portConfigs = _configPorts;
+ List<PortInstanceConfig> portConfigs = this.configExt.getConfigPorts(ai_3);
_builder.newLineIfNotEmpty();
{
- boolean _operator_or = false;
+ boolean _or = false;
boolean _isEmpty_5 = attrConfigs.isEmpty();
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_5);
- if (_operator_not_2) {
- _operator_or = true;
+ boolean _not_2 = (!_isEmpty_5);
+ if (_not_2) {
+ _or = true;
} else {
boolean _isEmpty_6 = portConfigs.isEmpty();
- boolean _operator_not_3 = BooleanExtensions.operator_not(_isEmpty_6);
- _operator_or = BooleanExtensions.operator_or(_operator_not_2, _operator_not_3);
+ boolean _not_3 = (!_isEmpty_6);
+ _or = (_not_2 || _not_3);
}
- if (_operator_or) {
+ if (_or) {
_builder.append("\t\t");
_builder.append("{");
_builder.newLine();
@@ -627,27 +618,25 @@ public class SubSystemClassGen { _builder.append(_name_7, " ");
_builder.append(") instances[");
EList<ActorInstance> _allContainedInstances_9 = comp.getAllContainedInstances();
- int _indexOf_8 = _allContainedInstances_9.indexOf(ai_3);
- _builder.append(_indexOf_8, " ");
+ int _indexOf_7 = _allContainedInstances_9.indexOf(ai_3);
+ _builder.append(_indexOf_7, " ");
_builder.append("];");
_builder.newLineIfNotEmpty();
{
for(final AttrInstanceConfig attrConfig : attrConfigs) {
_builder.append("\t\t");
_builder.append("\t");
- Attribute _attribute = attrConfig.getAttribute();
- Attribute a = _attribute;
+ Attribute a = attrConfig.getAttribute();
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t");
LiteralArray _value_1 = attrConfig.getValue();
- String _stringValue = this.configExt.stringValue(_value_1, a);
- String value = _stringValue;
+ String value = this.configExt.stringValue(_value_1, a);
_builder.newLineIfNotEmpty();
{
boolean _isArray = this.configExt.isArray(a);
- boolean _operator_not_4 = BooleanExtensions.operator_not(_isArray);
- if (_operator_not_4) {
+ boolean _not_4 = (!_isArray);
+ if (_not_4) {
_builder.append("\t\t");
_builder.append("\t");
_builder.append(aiName, " ");
@@ -655,7 +644,7 @@ public class SubSystemClassGen { String _name_8 = a.getName();
ActorClass _actorClass_3 = ai_3.getActorClass();
String _name_9 = _actorClass_3.getName();
- StringConcatenation _invokeSetter = this.helpers.invokeSetter(_name_8, _name_9, value);
+ CharSequence _invokeSetter = this.helpers.invokeSetter(_name_8, _name_9, value);
_builder.append(_invokeSetter, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -672,10 +661,10 @@ public class SubSystemClassGen { RefableType _refType = a.getRefType();
DataType _type = _refType.getType();
String _typeName = this._typeHelpers.typeName(_type);
- String _operator_plus_2 = StringExtensions.operator_plus("new ", _typeName);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "[]");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, value);
- StringConcatenation _invokeSetter_1 = this.helpers.invokeSetter(_name_10, _name_11, _operator_plus_4);
+ String _plus_2 = ("new " + _typeName);
+ String _plus_3 = (_plus_2 + "[]");
+ String _plus_4 = (_plus_3 + value);
+ CharSequence _invokeSetter_1 = this.helpers.invokeSetter(_name_10, _name_11, _plus_4);
_builder.append(_invokeSetter_1, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -697,7 +686,7 @@ public class SubSystemClassGen { String _name_12 = a.getName();
ActorClass _actorClass_5 = ai_3.getActorClass();
String _name_13 = _actorClass_5.getName();
- StringConcatenation _invokeGetter = this.helpers.invokeGetter(_name_12, _name_13);
+ CharSequence _invokeGetter = this.helpers.invokeGetter(_name_12, _name_13);
_builder.append(_invokeGetter, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -734,44 +723,39 @@ public class SubSystemClassGen { for(final PortInstanceConfig portConfig : portConfigs) {
_builder.append("\t\t");
_builder.append("\t");
- String portName = "port";
- InterfaceItem _item = portConfig.getItem();
- InterfaceItem item = _item;
+ InterfaceItem item = portConfig.getItem();
_builder.newLineIfNotEmpty();
{
EList<AttrInstanceConfig> _attributes = portConfig.getAttributes();
for(final AttrInstanceConfig attrConfig_1 : _attributes) {
_builder.append("\t\t");
_builder.append("\t");
- Attribute _attribute_1 = attrConfig_1.getAttribute();
- Attribute a_1 = _attribute_1;
+ Attribute a_1 = attrConfig_1.getAttribute();
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t");
LiteralArray _value_2 = attrConfig_1.getValue();
- String _stringValue_1 = this.configExt.stringValue(_value_2, a_1);
- String value_1 = _stringValue_1;
+ String value_1 = this.configExt.stringValue(_value_2, a_1);
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t");
- String _operator_plus_5 = StringExtensions.operator_plus(aiName, ".");
+ String _plus_5 = (aiName + ".");
String _name_14 = item.getName();
String _portClassName = this.roomExt.getPortClassName(item);
- StringConcatenation _invokeGetter_1 = this.helpers.invokeGetter(_name_14, _portClassName);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, _invokeGetter_1);
- String refToItem = _operator_plus_6;
+ CharSequence _invokeGetter_1 = this.helpers.invokeGetter(_name_14, _portClassName);
+ String refToItem = (_plus_5 + _invokeGetter_1);
_builder.newLineIfNotEmpty();
{
boolean _isArray_1 = this.configExt.isArray(a_1);
- boolean _operator_not_5 = BooleanExtensions.operator_not(_isArray_1);
- if (_operator_not_5) {
+ boolean _not_5 = (!_isArray_1);
+ if (_not_5) {
_builder.append("\t\t");
_builder.append("\t");
_builder.append(refToItem, " ");
_builder.append(".");
String _name_15 = a_1.getName();
String _portClassName_1 = this.roomExt.getPortClassName(item);
- StringConcatenation _invokeSetter_2 = this.helpers.invokeSetter(_name_15, _portClassName_1, value_1);
+ CharSequence _invokeSetter_2 = this.helpers.invokeSetter(_name_15, _portClassName_1, value_1);
_builder.append(_invokeSetter_2, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -788,10 +772,10 @@ public class SubSystemClassGen { RefableType _refType_2 = a_1.getRefType();
DataType _type_2 = _refType_2.getType();
String _typeName_2 = this._typeHelpers.typeName(_type_2);
- String _operator_plus_7 = StringExtensions.operator_plus("new ", _typeName_2);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "[]");
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, value_1);
- StringConcatenation _invokeSetter_3 = this.helpers.invokeSetter(_name_16, _name_17, _operator_plus_9);
+ String _plus_6 = ("new " + _typeName_2);
+ String _plus_7 = (_plus_6 + "[]");
+ String _plus_8 = (_plus_7 + value_1);
+ CharSequence _invokeSetter_3 = this.helpers.invokeSetter(_name_16, _name_17, _plus_8);
_builder.append(_invokeSetter_3, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -813,7 +797,7 @@ public class SubSystemClassGen { String _name_18 = a_1.getName();
ActorClass _actorClass_7 = ai_3.getActorClass();
String _name_19 = _actorClass_7.getName();
- StringConcatenation _invokeGetter_2 = this.helpers.invokeGetter(_name_18, _name_19);
+ CharSequence _invokeGetter_2 = this.helpers.invokeGetter(_name_18, _name_19);
_builder.append(_invokeGetter_2, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -873,18 +857,18 @@ public class SubSystemClassGen { _builder.newLine();
{
EList<ActorInstance> _allContainedInstances_10 = comp.getAllContainedInstances();
- boolean hasAnyElements_4 = false;
+ boolean _hasElements_4 = false;
for(final ActorInstance ai_4 : _allContainedInstances_10) {
- if (!hasAnyElements_4) {
- hasAnyElements_4 = true;
+ if (!_hasElements_4) {
+ _hasElements_4 = true;
} else {
_builder.appendImmediate(",", " ");
}
_builder.append("\t\t\t\t\t");
_builder.append("addr_item_SystemPort_");
EList<ActorInstance> _allContainedInstances_11 = comp.getAllContainedInstances();
- int _indexOf_9 = _allContainedInstances_11.indexOf(ai_4);
- _builder.append(_indexOf_9, " ");
+ int _indexOf_8 = _allContainedInstances_11.indexOf(ai_4);
+ _builder.append(_indexOf_8, " ");
_builder.newLineIfNotEmpty();
}
}
@@ -899,10 +883,10 @@ public class SubSystemClassGen { _builder.newLine();
{
EList<ActorInstance> _allContainedInstances_12 = comp.getAllContainedInstances();
- boolean hasAnyElements_5 = false;
+ boolean _hasElements_5 = false;
for(final ActorInstance ai_5 : _allContainedInstances_12) {
- if (!hasAnyElements_5) {
- hasAnyElements_5 = true;
+ if (!_hasElements_5) {
+ _hasElements_5 = true;
} else {
_builder.appendImmediate(",", " ");
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java index e1916f03d..99ffe08aa 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java @@ -7,12 +7,11 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root; import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -28,18 +27,18 @@ public class SubSystemRunnerGen { String _generationTargetPath = this.roomExt.getGenerationTargetPath(_subSystemClass);
SubSystemClass _subSystemClass_1 = sc.getSubSystemClass();
String _path = this.roomExt.getPath(_subSystemClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- this.fileAccess.setOutputPath(_operator_plus);
+ String _plus = (_generationTargetPath + _path);
+ this.fileAccess.setOutputPath(_plus);
String _name = sc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_name, "Runner.java");
+ String _plus_1 = (_name + "Runner.java");
SubSystemClass _subSystemClass_2 = sc.getSubSystemClass();
- StringConcatenation _generate = this.generate(root, sc, _subSystemClass_2);
- this.fileAccess.generateFile(_operator_plus_1, _generate);
+ CharSequence _generate = this.generate(root, sc, _subSystemClass_2);
+ this.fileAccess.generateFile(_plus_1, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final SubSystemInstance ssc, final SubSystemClass cc) {
+ public CharSequence generate(final Root root, final SubSystemInstance ssc, final SubSystemClass cc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -75,8 +74,8 @@ public class SubSystemRunnerGen { _builder.newLine();
_builder.append("class ");
String _name_2 = ssc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name_2, "Runner");
- _builder.append(_operator_plus, "");
+ String _plus = (_name_2 + "Runner");
+ _builder.append(_plus, "");
_builder.append(" extends SubSystemRunnerBase {");
_builder.newLineIfNotEmpty();
_builder.newLine();
|