Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml2
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml1
-rw-r--r--plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java1
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java1
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/quickfix/IRoomQuickfixProvider.java3
-rw-r--r--plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java6
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend7
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java311
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java86
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java66
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java33
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java510
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java20
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java562
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java17
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java322
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java45
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java18
-rw-r--r--plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend3
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java100
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java213
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java37
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java33
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java180
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java12
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java200
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java21
-rw-r--r--plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java3
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java302
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java127
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java167
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java389
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java62
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java291
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java837
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java31
-rw-r--r--plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/plugin.xml2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java9
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java5
-rw-r--r--plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java5
-rw-r--r--plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java1
-rw-r--r--plugins/org.eclipse.etrice.ui.structure/plugin.xml2
-rw-r--r--plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java3
-rw-r--r--tests/org.eclipse.etrice.core.config.tests/.classpath1
56 files changed, 2351 insertions, 2727 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index ab0e0fed9..30e4445af 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -82,7 +82,7 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.xtext.generator" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtext.xtend2.lib" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.xtend.lib" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend" version="1.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.ui"/>
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index ce2f711e1..1f6d2763e 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -31,7 +31,6 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.generator" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.generator.java" version="0.1.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.mwe.utils" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.apache.commons.logging" version="1.0.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.text" version="3.6.0" match="greaterOrEqual"/>
diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
index a4d365d01..821357c70 100644
--- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
Import-Package: org.apache.log4j,
org.apache.commons.logging,
org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xtend2.lib
+ org.eclipse.xtend.lib
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.etrice.core,
org.eclipse.etrice.core.services,
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
index 01811d86c..8265704bc 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenAdapterFactory.java
@@ -10,7 +10,6 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.genmodel.etricegen.*;
import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
index 82bc99dc7..b3064cf44 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/util/ETriceGenSwitch.java
@@ -9,7 +9,6 @@ package org.eclipse.etrice.core.genmodel.etricegen.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.etrice.core.genmodel.etricegen.*;
import org.eclipse.etrice.core.genmodel.etricegen.ActiveTrigger;
import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
import org.eclipse.etrice.core.genmodel.etricegen.BindingInstance;
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/quickfix/IRoomQuickfixProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/quickfix/IRoomQuickfixProvider.java
index decbbb840..077a7bfaa 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/quickfix/IRoomQuickfixProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/quickfix/IRoomQuickfixProvider.java
@@ -1,8 +1,5 @@
package org.eclipse.etrice.core.ui.quickfix;
-import java.util.List;
-
-import org.eclipse.xtext.ui.editor.quickfix.IssueResolution;
import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;
import org.eclipse.xtext.validation.Issue;
diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java
index 24306601d..6c487e63e 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java
+++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java
@@ -168,6 +168,8 @@ public class EtUnitReportConverter {
++count;
if (!line.equals("etUnit report")) {
System.err.println("Error: file "+report+", line "+line+" is missing header line - no etunit file");
+ bufRead.close();
+ input.close();
return null;
}
@@ -197,6 +199,8 @@ public class EtUnitReportConverter {
TestcaseType tc = id2case.get(id);
if (tc==null) {
System.err.println("Error: in file "+report+", line "+count+" - unknown test case id");
+ bufRead.close();
+ input.close();
return null;
}
FailureType fail = EtunitFactory.eINSTANCE.createFailureType();
@@ -225,6 +229,8 @@ public class EtUnitReportConverter {
TestcaseType tc = id2case.get(id);
if (tc==null) {
System.err.println("Error: in file "+report+", line "+count+" - unknown test case id");
+ bufRead.close();
+ input.close();
return null;
}
tc.setTime(BigDecimal.valueOf(time));
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index 4fc3bfe41..e9a528d86 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.2.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.xtext.generator;bundle-version="2.1.1",
org.eclipse.xtext.util;bundle-version="2.1.1"
Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
index 1b856f888..440c12c7d 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
@@ -27,7 +27,6 @@ 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
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator
@@ -39,7 +38,6 @@ class ActorClassGen extends GenericActorClassGenerator {
@Inject extension RoomExtensions roomExt
@Inject extension ProcedureHelpers helpers
- @Inject extension TypeHelpers
@Inject extension StateMachineGen stateMachineGen
@Inject ILogger logger
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
index 9e89a0dde..263f80776 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
@@ -15,7 +15,6 @@ package org.eclipse.etrice.generator.c.gen
import com.google.inject.Inject
import com.google.inject.Singleton
-import org.eclipse.etrice.core.room.Message
import org.eclipse.etrice.core.room.ProtocolClass
import org.eclipse.etrice.core.room.CommunicationType
import org.eclipse.etrice.core.room.PrimitiveType
@@ -217,7 +216,6 @@ etInt32 «replPortClassName»_getReplication(const «replPortClassName»* self);
«FOR message : messages»
«var typeName =message.data.refType.type.typeName»
«var refp = if (!(message.data.refType.type instanceof PrimitiveType)) "*" else ""»
- «var refa = if ((message.data.refType.type instanceof PrimitiveType)) "&" else ""»
«var data = ", "+typeName+refp+" data"»
«messageSetterSignature(pc.getPortClassName(true), message.name, data)» {
self->«message.name» = data;
@@ -322,10 +320,6 @@ etInt32 «replPortClassName»_getReplication(const «replPortClassName»* self);
def private messageGetterSignature(String className, String messageName, String type) {
type+" "+className+"_"+messageName+"_get(const "+className+"* const self)"
}
-
- def private messageCall(Message m) {'''
- «m.name»(«IF m.data!=null» «m.data.name»«ENDIF»)
- '''}
// def sendMessage(Message m, boolean conj) {'''
// «var dir = if (conj) "IN" else "OUT"»
@@ -341,7 +335,6 @@ etInt32 «replPortClassName»_getReplication(const «replPortClassName»* self);
def private genReceiveHandlers(ProtocolClass pc, Boolean conj){
var portClassName = pc.getPortClassName(conj)
- var replPortClassName = pc.getPortClassName(conj, true)
'''
/* receiver handlers */
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
index cb15fe9a1..e0ae917de 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
@@ -337,7 +337,6 @@ class SubSystemClassGen {
var dataPorts = simplePorts.filter(p|p.protocol.commType==CommunicationType::DATA_DRIVEN)
var recvPorts = dataPorts.filter(p|p instanceof PortInstance && !(p as PortInstance).port.conjugated)
- var sendPorts = dataPorts.filter(p|p instanceof PortInstance && (p as PortInstance).port.conjugated)
// compute replicated port offsets
var offsets = new HashMap<InterfaceItemInstance, Integer>()
@@ -380,7 +379,6 @@ class SubSystemClassGen {
'''}
def private String genPortInitializer(Root root, ActorInstance ai, InterfaceItemInstance pi) {
- var recvMsg = if (pi.peers.empty) "NULL" else ai.actorClass.name+"_receiveMessage"
var objId = if (pi.peers.empty) 0 else pi.peers.get(0).objId
var idx = if (pi.peers.empty) 0 else pi.peers.get(0).peers.indexOf(pi)
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
index dbcb83321..3f26b246b 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
@@ -1,5 +1,6 @@
package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashSet;
@@ -29,17 +30,13 @@ import org.eclipse.etrice.generator.c.gen.StateMachineGen;
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.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;
@@ -54,9 +51,6 @@ public class ActorClassGen extends GenericActorClassGenerator {
private ProcedureHelpers helpers;
@Inject
- private TypeHelpers _typeHelpers;
-
- @Inject
private StateMachineGen stateMachineGen;
@Inject
@@ -70,129 +64,121 @@ 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 _cHeaderFileName = this.stdExt.getCHeaderFileName(_actorClass_2);
- String _operator_plus_1 = StringExtensions.operator_plus("generating ActorClass header \'", _cHeaderFileName);
- 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 _plus = ("generating ActorClass header \'" + _cHeaderFileName);
+ 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();
String _cHeaderFileName_1 = this.stdExt.getCHeaderFileName(_actorClass_3);
ActorClass _actorClass_4 = xpac.getActorClass();
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, xpac, _actorClass_4);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, xpac, _actorClass_4);
this.fileAccess.generateFile(_cHeaderFileName_1, _generateHeaderFile);
boolean _hasBehaviorAnnotation = this.hasBehaviorAnnotation(xpac, "BehaviorManual");
if (_hasBehaviorAnnotation) {
ActorClass _actorClass_5 = xpac.getActorClass();
String _name = _actorClass_5.getName();
- String _operator_plus_5 = StringExtensions.operator_plus("omitting ActorClass source for \'", _name);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' since @BehaviorManual is specified");
- this.logger.logInfo(_operator_plus_6);
+ String _plus_4 = ("omitting ActorClass source for \'" + _name);
+ String _plus_5 = (_plus_4 + "\' since @BehaviorManual is specified");
+ this.logger.logInfo(_plus_5);
} else {
- {
- ActorClass _actorClass_6 = xpac.getActorClass();
- String _cSourceFileName = this.stdExt.getCSourceFileName(_actorClass_6);
- String _operator_plus_7 = StringExtensions.operator_plus("generating ActorClass source \'", _cSourceFileName);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\' in \'");
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, path);
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, "\'");
- this.logger.logInfo(_operator_plus_10);
- this.fileAccess.setOutputPath(path);
- ActorClass _actorClass_7 = xpac.getActorClass();
- String _cSourceFileName_1 = this.stdExt.getCSourceFileName(_actorClass_7);
- ActorClass _actorClass_8 = xpac.getActorClass();
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, xpac, _actorClass_8);
- this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
- }
+ ActorClass _actorClass_6 = xpac.getActorClass();
+ String _cSourceFileName = this.stdExt.getCSourceFileName(_actorClass_6);
+ String _plus_6 = ("generating ActorClass source \'" + _cSourceFileName);
+ String _plus_7 = (_plus_6 + "\' in \'");
+ String _plus_8 = (_plus_7 + path);
+ String _plus_9 = (_plus_8 + "\'");
+ this.logger.logInfo(_plus_9);
+ this.fileAccess.setOutputPath(path);
+ ActorClass _actorClass_7 = xpac.getActorClass();
+ String _cSourceFileName_1 = this.stdExt.getCSourceFileName(_actorClass_7);
+ ActorClass _actorClass_8 = xpac.getActorClass();
+ CharSequence _generateSourceFile = this.generateSourceFile(root, xpac, _actorClass_8);
+ this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
}
}
}
}
private boolean hasBehaviorAnnotation(final ExpandedActorClass xpac, final String annotation) {
- ActorClass _actorClass = xpac.getActorClass();
- EList<Annotation> _behaviorAnnotations = _actorClass.getBehaviorAnnotations();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_behaviorAnnotations, null);
- if (_operator_notEquals) {
- ActorClass _actorClass_1 = xpac.getActorClass();
- EList<Annotation> _behaviorAnnotations_1 = _actorClass_1.getBehaviorAnnotations();
- final Function1<Annotation,Boolean> _function = new Function1<Annotation,Boolean>() {
- public Boolean apply(final Annotation e) {
- String _name = e.getName();
- boolean _operator_equals = ObjectExtensions.operator_equals(_name, annotation);
- return ((Boolean)_operator_equals);
- }
- };
- Annotation _findFirst = IterableExtensions.<Annotation>findFirst(_behaviorAnnotations_1, _function);
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_findFirst, null);
- if (_operator_notEquals_1) {
- return true;
- }
+ ActorClass _actorClass = xpac.getActorClass();
+ EList<Annotation> _behaviorAnnotations = _actorClass.getBehaviorAnnotations();
+ boolean _notEquals = (!Objects.equal(_behaviorAnnotations, null));
+ if (_notEquals) {
+ ActorClass _actorClass_1 = xpac.getActorClass();
+ EList<Annotation> _behaviorAnnotations_1 = _actorClass_1.getBehaviorAnnotations();
+ final Function1<Annotation,Boolean> _function = new Function1<Annotation,Boolean>() {
+ public Boolean apply(final Annotation e) {
+ String _name = e.getName();
+ boolean _equals = Objects.equal(_name, annotation);
+ return Boolean.valueOf(_equals);
+ }
+ };
+ Annotation _findFirst = IterableExtensions.<Annotation>findFirst(_behaviorAnnotations_1, _function);
+ boolean _notEquals_1 = (!Objects.equal(_findFirst, null));
+ if (_notEquals_1) {
+ return true;
}
- return false;
+ }
+ return false;
}
- private StringConcatenation generateHeaderFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence generateHeaderFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
List<Port> _allEndPorts = this.roomExt.getAllEndPorts(ac);
final Function1<Port,Boolean> _function = new Function1<Port,Boolean>() {
public Boolean apply(final Port p) {
GeneralProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
- Iterable<Port> _filter = IterableExtensions.<Port>filter(_allEndPorts, _function);
- Iterable<Port> eventPorts = _filter;
+ Iterable<Port> eventPorts = IterableExtensions.<Port>filter(_allEndPorts, _function);
List<Port> _allEndPorts_1 = this.roomExt.getAllEndPorts(ac);
final Function1<Port,Boolean> _function_1 = new Function1<Port,Boolean>() {
public Boolean apply(final Port p) {
- boolean _operator_and = false;
+ boolean _and = false;
GeneralProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.DATA_DRIVEN);
- if (!_operator_equals) {
- _operator_and = false;
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ if (!_equals) {
+ _and = false;
} else {
boolean _isConjugated = p.isConjugated();
- _operator_and = BooleanExtensions.operator_and(_operator_equals, _isConjugated);
+ _and = (_equals && _isConjugated);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
- Iterable<Port> _filter_1 = IterableExtensions.<Port>filter(_allEndPorts_1, _function_1);
- Iterable<Port> sendPorts = _filter_1;
+ Iterable<Port> sendPorts = IterableExtensions.<Port>filter(_allEndPorts_1, _function_1);
List<Port> _allEndPorts_2 = this.roomExt.getAllEndPorts(ac);
final Function1<Port,Boolean> _function_2 = new Function1<Port,Boolean>() {
public Boolean apply(final Port p) {
- boolean _operator_and = false;
+ boolean _and = false;
GeneralProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.DATA_DRIVEN);
- if (!_operator_equals) {
- _operator_and = false;
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ if (!_equals) {
+ _and = false;
} else {
boolean _isConjugated = p.isConjugated();
- boolean _operator_not = BooleanExtensions.operator_not(_isConjugated);
- _operator_and = BooleanExtensions.operator_and(_operator_equals, _operator_not);
+ boolean _not = (!_isConjugated);
+ _and = (_equals && _not);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
- Iterable<Port> _filter_2 = IterableExtensions.<Port>filter(_allEndPorts_2, _function_2);
- Iterable<Port> recvPorts = _filter_2;
+ Iterable<Port> recvPorts = IterableExtensions.<Port>filter(_allEndPorts_2, _function_2);
ActorCommunicationType _commType = ac.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals;
+ boolean dataDriven = Objects.equal(_commType, ActorCommunicationType.DATA_DRIVEN);
ActorCommunicationType _commType_1 = ac.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals_1;
+ boolean async = Objects.equal(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -215,7 +201,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.newLine();
String _name_1 = ac.getName();
- StringConcatenation _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -246,7 +232,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();
@@ -262,31 +248,31 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.append("/* const part of ActorClass (ROM) */");
_builder.newLine();
{
- boolean _operator_and = false;
- boolean _operator_and_1 = false;
- boolean _operator_and_2 = false;
+ boolean _and = false;
+ boolean _and_1 = false;
+ boolean _and_2 = false;
boolean _isEmpty = IterableExtensions.isEmpty(eventPorts);
if (!_isEmpty) {
- _operator_and_2 = false;
+ _and_2 = false;
} else {
boolean _isEmpty_1 = IterableExtensions.isEmpty(recvPorts);
- _operator_and_2 = BooleanExtensions.operator_and(_isEmpty, _isEmpty_1);
+ _and_2 = (_isEmpty && _isEmpty_1);
}
- if (!_operator_and_2) {
- _operator_and_1 = false;
+ if (!_and_2) {
+ _and_1 = false;
} else {
List<SAPRef> _allSAPs = this.roomExt.getAllSAPs(ac);
boolean _isEmpty_2 = _allSAPs.isEmpty();
- _operator_and_1 = BooleanExtensions.operator_and(_operator_and_2, _isEmpty_2);
+ _and_1 = (_and_2 && _isEmpty_2);
}
- if (!_operator_and_1) {
- _operator_and = false;
+ if (!_and_1) {
+ _and = false;
} else {
List<ServiceImplementation> _allServiceImplementations = this.roomExt.getAllServiceImplementations(ac);
boolean _isEmpty_3 = _allServiceImplementations.isEmpty();
- _operator_and = BooleanExtensions.operator_and(_operator_and_1, _isEmpty_3);
+ _and = (_and_1 && _isEmpty_3);
}
- if (_operator_and) {
+ if (_and) {
_builder.append("/* this actor class has no ports and thus no constant data */");
_builder.newLine();
} else {
@@ -302,8 +288,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
for(final Port ep : eventPorts) {
{
int _multiplicity = ep.getMultiplicity();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(((Integer)_multiplicity), ((Integer)1));
- if (_operator_equals_2) {
+ boolean _equals = (_multiplicity == 1);
+ if (_equals) {
_builder.append("\t");
_builder.append("const ");
String _portClassName = this.roomExt.getPortClassName(ep);
@@ -326,8 +312,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
for(final Port ep_1 : recvPorts) {
{
int _multiplicity_1 = ep_1.getMultiplicity();
- boolean _operator_equals_3 = ObjectExtensions.operator_equals(((Integer)_multiplicity_1), ((Integer)1));
- if (_operator_equals_3) {
+ boolean _equals_1 = (_multiplicity_1 == 1);
+ if (_equals_1) {
_builder.append("\t");
_builder.append("const ");
String _portClassName_1 = this.roomExt.getPortClassName(ep_1);
@@ -369,8 +355,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
for(final Port ep_2 : _allEndPorts_3) {
{
int _multiplicity_2 = ep_2.getMultiplicity();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(((Integer)_multiplicity_2), ((Integer)1));
- if (_operator_notEquals) {
+ boolean _notEquals = (_multiplicity_2 != 1);
+ if (_notEquals) {
_builder.append("\t");
_builder.append("const etReplPort ");
String _name_10 = ep_2.getName();
@@ -409,10 +395,10 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
StateGraph _stateMachine = xpac.getStateMachine();
boolean _isEmpty_4 = RoomHelpers.isEmpty(_stateMachine);
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty_4);
- if (_operator_not) {
+ boolean _not = (!_isEmpty_4);
+ if (_not) {
_builder.newLine();
- StringConcatenation _genHeaderConstants = this.stateMachineGen.genHeaderConstants(xpac, ac);
+ CharSequence _genHeaderConstants = this.stateMachineGen.genHeaderConstants(xpac, ac);
_builder.append(_genHeaderConstants, "");
_builder.newLineIfNotEmpty();
}
@@ -426,32 +412,32 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_and_3 = false;
- boolean _operator_and_4 = false;
- boolean _operator_and_5 = false;
+ boolean _and_3 = false;
+ boolean _and_4 = false;
+ boolean _and_5 = false;
boolean _isEmpty_5 = IterableExtensions.isEmpty(eventPorts);
if (!_isEmpty_5) {
- _operator_and_5 = false;
+ _and_5 = false;
} else {
boolean _isEmpty_6 = IterableExtensions.isEmpty(recvPorts);
- _operator_and_5 = BooleanExtensions.operator_and(_isEmpty_5, _isEmpty_6);
+ _and_5 = (_isEmpty_5 && _isEmpty_6);
}
- if (!_operator_and_5) {
- _operator_and_4 = false;
+ if (!_and_5) {
+ _and_4 = false;
} else {
List<SAPRef> _allSAPs_2 = this.roomExt.getAllSAPs(ac);
boolean _isEmpty_7 = _allSAPs_2.isEmpty();
- _operator_and_4 = BooleanExtensions.operator_and(_operator_and_5, _isEmpty_7);
+ _and_4 = (_and_5 && _isEmpty_7);
}
- if (!_operator_and_4) {
- _operator_and_3 = false;
+ if (!_and_4) {
+ _and_3 = false;
} else {
List<ServiceImplementation> _allServiceImplementations_2 = this.roomExt.getAllServiceImplementations(ac);
boolean _isEmpty_8 = _allServiceImplementations_2.isEmpty();
- _operator_and_3 = BooleanExtensions.operator_and(_operator_and_4, _isEmpty_8);
+ _and_3 = (_and_4 && _isEmpty_8);
}
- boolean _operator_not_1 = BooleanExtensions.operator_not(_operator_and_3);
- if (_operator_not_1) {
+ boolean _not_1 = (!_and_3);
+ if (_not_1) {
_builder.append("\t");
_builder.append("const ");
String _name_14 = ac.getName();
@@ -469,8 +455,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
for(final Port ep_3 : sendPorts) {
{
int _multiplicity_3 = ep_3.getMultiplicity();
- boolean _operator_equals_4 = ObjectExtensions.operator_equals(((Integer)_multiplicity_3), ((Integer)1));
- if (_operator_equals_4) {
+ boolean _equals_2 = (_multiplicity_3 == 1);
+ if (_equals_2) {
_builder.append("\t");
String _portClassName_3 = this.roomExt.getPortClassName(ep_3);
_builder.append(_portClassName_3, " ");
@@ -486,7 +472,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t");
List<Attribute> _allAttributes = this.roomExt.getAllAttributes(ac);
- StringConcatenation _attributes = this.helpers.attributes(_allAttributes);
+ CharSequence _attributes = this.helpers.attributes(_allAttributes);
_builder.append(_attributes, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -495,14 +481,14 @@ public class ActorClassGen extends GenericActorClassGenerator {
for(final Attribute a : _allAttributes_1) {
{
String _defaultValueLiteral = a.getDefaultValueLiteral();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals_1) {
String _name_16 = ac.getName();
- String _operator_plus = StringExtensions.operator_plus(_name_16, " ");
+ String _plus = (_name_16 + " ");
String _name_17 = a.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name_17);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ": Attribute initialization not supported in C");
- this.logger.logInfo(_operator_plus_2);
+ String _plus_1 = (_plus + _name_17);
+ String _plus_2 = (_plus_1 + ": Attribute initialization not supported in C");
+ this.logger.logInfo(_plus_2);
_builder.newLineIfNotEmpty();
}
}
@@ -513,13 +499,13 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
StateGraph _stateMachine_1 = xpac.getStateMachine();
boolean _isEmpty_9 = RoomHelpers.isEmpty(_stateMachine_1);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_9);
- if (_operator_not_2) {
+ boolean _not_2 = (!_isEmpty_9);
+ if (_not_2) {
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataMembers = this.stateMachineGen.genDataMembers(xpac, ac);
+ CharSequence _genDataMembers = this.stateMachineGen.genDataMembers(xpac, ac);
_builder.append(_genDataMembers, " ");
_builder.newLineIfNotEmpty();
}
@@ -543,13 +529,13 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLineIfNotEmpty();
_builder.newLine();
{
- boolean _operator_or = false;
+ boolean _or = false;
if (dataDriven) {
- _operator_or = true;
+ _or = true;
} else {
- _operator_or = BooleanExtensions.operator_or(dataDriven, async);
+ _or = (dataDriven || async);
}
- if (_operator_or) {
+ if (_or) {
_builder.append("void ");
String _name_21 = ac.getName();
_builder.append(_name_21, "");
@@ -563,17 +549,17 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
EList<StandardOperation> _operations = ac.getOperations();
String _name_23 = ac.getName();
- StringConcatenation _operationsDeclaration = this.helpers.operationsDeclaration(_operations, _name_23);
+ CharSequence _operationsDeclaration = this.helpers.operationsDeclaration(_operations, _name_23);
_builder.append(_operationsDeclaration, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
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.newLine();
String _name_24 = ac.getName();
- StringConcatenation _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_24);
+ CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_24);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -582,25 +568,22 @@ public class ActorClassGen extends GenericActorClassGenerator {
return _xblockexpression;
}
- private StringConcatenation generateSourceFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence generateSourceFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
ActorCommunicationType _commType = ac.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals;
+ boolean async = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
ActorCommunicationType _commType_1 = ac.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
- boolean eventDriven = _operator_equals_1;
+ boolean eventDriven = Objects.equal(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
ActorCommunicationType _commType_2 = ac.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals_2;
- boolean _operator_or = false;
+ boolean dataDriven = Objects.equal(_commType_2, ActorCommunicationType.DATA_DRIVEN);
+ boolean _or = false;
if (async) {
- _operator_or = true;
+ _or = true;
} else {
- _operator_or = BooleanExtensions.operator_or(async, eventDriven);
+ _or = (async || eventDriven);
}
- boolean handleEvents = _operator_or;
+ boolean handleEvents = _or;
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -649,7 +632,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
}
_builder.newLine();
DetailCode _userCode3 = ac.getUserCode3();
- StringConcatenation _userCode = this.helpers.userCode(_userCode3);
+ CharSequence _userCode = this.helpers.userCode(_userCode3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -662,9 +645,9 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
StateGraph _stateMachine = xpac.getStateMachine();
boolean _isEmpty = RoomHelpers.isEmpty(_stateMachine);
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
- StringConcatenation _genStateMachine = this.stateMachineGen.genStateMachine(xpac, ac);
+ boolean _not = (!_isEmpty);
+ if (_not) {
+ CharSequence _genStateMachine = this.stateMachineGen.genStateMachine(xpac, ac);
_builder.append(_genStateMachine, "");
_builder.newLineIfNotEmpty();
}
@@ -687,10 +670,10 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
StateGraph _stateMachine_1 = xpac.getStateMachine();
boolean _isEmpty_1 = RoomHelpers.isEmpty(_stateMachine_1);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_1);
+ if (_not_1) {
_builder.append("\t");
- StringConcatenation _genInitialization = this.stateMachineGen.genInitialization(xpac, ac);
+ CharSequence _genInitialization = this.stateMachineGen.genInitialization(xpac, ac);
_builder.append(_genInitialization, " ");
_builder.newLineIfNotEmpty();
}
@@ -716,8 +699,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
StateGraph _stateMachine_2 = xpac.getStateMachine();
boolean _isEmpty_2 = RoomHelpers.isEmpty(_stateMachine_2);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_2);
- if (_operator_not_2) {
+ boolean _not_2 = (!_isEmpty_2);
+ if (_not_2) {
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
@@ -740,13 +723,13 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.newLine();
{
- boolean _operator_or_1 = false;
+ boolean _or_1 = false;
if (dataDriven) {
- _operator_or_1 = true;
+ _or_1 = true;
} else {
- _operator_or_1 = BooleanExtensions.operator_or(dataDriven, async);
+ _or_1 = (dataDriven || async);
}
- if (_operator_or_1) {
+ if (_or_1) {
_builder.append("void ");
String _name_6 = ac.getName();
_builder.append(_name_6, "");
@@ -764,8 +747,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
{
StateGraph _stateMachine_3 = xpac.getStateMachine();
boolean _isEmpty_3 = RoomHelpers.isEmpty(_stateMachine_3);
- boolean _operator_not_3 = BooleanExtensions.operator_not(_isEmpty_3);
- if (_operator_not_3) {
+ boolean _not_3 = (!_isEmpty_3);
+ if (_not_3) {
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
@@ -789,7 +772,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
}
}
_builder.newLine();
- StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(ac);
+ CharSequence _operationsImplementation = this.helpers.operationsImplementation(ac);
_builder.append(_operationsImplementation, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
index 2e246cb36..54414d85c 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
@@ -7,19 +7,17 @@ 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 CExtensions 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 accessLevelPrivate() {
@@ -45,8 +43,8 @@ public class CExtensions implements ILanguageExtension {
} else {
_xifexpression = "* self";
}
- String _operator_plus = StringExtensions.operator_plus(classname, _xifexpression);
- return _operator_plus;
+ String _plus = (classname + _xifexpression);
+ return _plus;
}
public String selfPointer(final boolean hasArgs) {
@@ -60,20 +58,18 @@ public class CExtensions implements ILanguageExtension {
}
public String operationScope(final String classname, final boolean isDeclaration) {
- String _operator_plus = StringExtensions.operator_plus(classname, "_");
- return _operator_plus;
+ String _plus = (classname + "_");
+ return _plus;
}
public String memberInDeclaration(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 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);
}
/**
@@ -81,29 +77,25 @@ public class CExtensions implements ILanguageExtension {
*/
public String getCHeaderFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".h");
- return _operator_plus;
+ return (_name + ".h");
}
public String getCSourceFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".c");
- return _operator_plus;
+ return (_name + ".c");
}
public String getInstSourceFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, "_Inst.h");
- return _operator_plus;
+ return (_name + "_Inst.h");
}
public String getDispSourceFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, "_Disp.h");
- return _operator_plus;
+ return (_name + "_Disp.h");
}
- public StringConcatenation getIncludeGuardString(final String filename) {
+ public CharSequence getIncludeGuardString(final String filename) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("_");
String _upperCase = filename.toUpperCase();
@@ -112,23 +104,23 @@ public class CExtensions implements ILanguageExtension {
return _builder;
}
- public StringConcatenation generateIncludeGuardBegin(final String filename) {
+ public CharSequence generateIncludeGuardBegin(final String filename) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("#ifndef ");
- StringConcatenation _includeGuardString = this.getIncludeGuardString(filename);
+ CharSequence _includeGuardString = this.getIncludeGuardString(filename);
_builder.append(_includeGuardString, "");
_builder.newLineIfNotEmpty();
_builder.append("#define ");
- StringConcatenation _includeGuardString_1 = this.getIncludeGuardString(filename);
+ CharSequence _includeGuardString_1 = this.getIncludeGuardString(filename);
_builder.append(_includeGuardString_1, "");
_builder.newLineIfNotEmpty();
return _builder;
}
- public StringConcatenation generateIncludeGuardEnd(final String filename) {
+ public CharSequence generateIncludeGuardEnd(final String filename) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("#endif /* ");
- StringConcatenation _includeGuardString = this.getIncludeGuardString(filename);
+ CharSequence _includeGuardString = this.getIncludeGuardString(filename);
_builder.append(_includeGuardString, "");
_builder.append(" */");
_builder.newLineIfNotEmpty();
@@ -152,10 +144,10 @@ public class CExtensions implements ILanguageExtension {
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Pair<String,String> entry : entries) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -201,19 +193,19 @@ public class CExtensions implements ILanguageExtension {
public String arrayDeclaration(final String type, final int size, final String name, final boolean isRef) {
String _xifexpression = null;
if (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, "[");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, ((Integer)size));
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "]");
- _xifexpression = _operator_plus_4;
+ String _plus = (type + "* ");
+ String _plus_1 = (_plus + name);
+ String _plus_2 = (_plus_1 + "[");
+ String _plus_3 = (_plus_2 + Integer.valueOf(size));
+ String _plus_4 = (_plus_3 + "]");
+ _xifexpression = _plus_4;
} else {
- String _operator_plus_5 = StringExtensions.operator_plus(type, " ");
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, name);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, "[");
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, ((Integer)size));
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, "]");
- _xifexpression = _operator_plus_9;
+ String _plus_5 = (type + " ");
+ String _plus_6 = (_plus_5 + name);
+ String _plus_7 = (_plus_6 + "[");
+ String _plus_8 = (_plus_7 + Integer.valueOf(size));
+ String _plus_9 = (_plus_8 + "]");
+ _xifexpression = _plus_9;
}
return _xifexpression;
}
@@ -235,8 +227,8 @@ public class CExtensions implements ILanguageExtension {
}
public String toCharArrayExpr(final String s) {
- String _operator_plus = StringExtensions.operator_plus("\"", s);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\"");
- return _operator_plus_1;
+ String _plus = ("\"" + s);
+ String _plus_1 = (_plus + "\"");
+ return _plus_1;
}
}
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
index d1a850a2c..0973c7492 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
@@ -1,5 +1,6 @@
package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashSet;
@@ -14,13 +15,11 @@ import org.eclipse.etrice.core.room.StandardOperation;
import org.eclipse.etrice.generator.c.gen.CExtensions;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
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.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;
@@ -43,33 +42,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 path = (_generationTargetPath + _path);
String _cHeaderFileName = this.stdExt.getCHeaderFileName(dc);
- String _operator_plus_1 = StringExtensions.operator_plus("generating DataClass header \'", _cHeaderFileName);
- 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 _plus = ("generating DataClass header \'" + _cHeaderFileName);
+ 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);
String _cHeaderFileName_1 = this.stdExt.getCHeaderFileName(dc);
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, dc);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, dc);
this.fileAccess.generateFile(_cHeaderFileName_1, _generateHeaderFile);
String _cSourceFileName = this.stdExt.getCSourceFileName(dc);
- String _operator_plus_5 = StringExtensions.operator_plus("generating DataClass source \'", _cSourceFileName);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' in \'");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, path);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\'");
- this.logger.logInfo(_operator_plus_8);
+ String _plus_4 = ("generating DataClass source \'" + _cSourceFileName);
+ String _plus_5 = (_plus_4 + "\' in \'");
+ String _plus_6 = (_plus_5 + path);
+ String _plus_7 = (_plus_6 + "\'");
+ this.logger.logInfo(_plus_7);
this.fileAccess.setOutputPath(path);
String _cSourceFileName_1 = this.stdExt.getCSourceFileName(dc);
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, dc);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, dc);
this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
}
}
}
- public StringConcatenation generateHeaderFile(final Root root, final DataClass dc) {
+ public CharSequence generateHeaderFile(final Root root, final DataClass dc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -92,7 +90,7 @@ public class DataClassGen {
_builder.newLine();
_builder.newLine();
String _name_1 = dc.getName();
- StringConcatenation _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -111,7 +109,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.append("\t\t");
@@ -120,7 +118,7 @@ public class DataClassGen {
_builder.newLine();
_builder.append("\t");
List<Attribute> _allAttributes = this.roomExt.getAllAttributes(dc);
- StringConcatenation _attributes = this.helpers.attributes(_allAttributes);
+ CharSequence _attributes = this.helpers.attributes(_allAttributes);
_builder.append(_attributes, " ");
_builder.newLineIfNotEmpty();
_builder.append("} ");
@@ -134,14 +132,14 @@ public class DataClassGen {
for(final Attribute a : _allAttributes_1) {
{
String _defaultValueLiteral = a.getDefaultValueLiteral();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals) {
String _name_4 = dc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name_4, " ");
+ String _plus = (_name_4 + " ");
String _name_5 = a.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name_5);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ": Attribute initialization not supported in C");
- this.logger.logInfo(_operator_plus_2);
+ String _plus_1 = (_plus + _name_5);
+ String _plus_2 = (_plus_1 + ": Attribute initialization not supported in C");
+ this.logger.logInfo(_plus_2);
_builder.newLineIfNotEmpty();
}
}
@@ -151,7 +149,7 @@ public class DataClassGen {
_builder.newLine();
EList<StandardOperation> _operations = dc.getOperations();
String _name_6 = dc.getName();
- StringConcatenation _operationsDeclaration = this.helpers.operationsDeclaration(_operations, _name_6);
+ CharSequence _operationsDeclaration = this.helpers.operationsDeclaration(_operations, _name_6);
_builder.append(_operationsDeclaration, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -170,19 +168,19 @@ public class DataClassGen {
_builder.newLineIfNotEmpty();
_builder.newLine();
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.newLine();
String _name_10 = dc.getName();
- StringConcatenation _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_10);
+ CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_10);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
return _builder;
}
- public StringConcatenation generateSourceFile(final Root root, final DataClass dc) {
+ public CharSequence generateSourceFile(final Root root, final DataClass dc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -214,14 +212,14 @@ public class DataClassGen {
_builder.newLine();
_builder.newLine();
DetailCode _userCode3 = dc.getUserCode3();
- StringConcatenation _userCode = this.helpers.userCode(_userCode3);
+ CharSequence _userCode = this.helpers.userCode(_userCode3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.newLine();
EList<StandardOperation> _operations = dc.getOperations();
String _name_1 = dc.getName();
- StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(_operations, _name_1);
+ CharSequence _operationsImplementation = this.helpers.operationsImplementation(_operations, _name_1);
_builder.append(_operationsImplementation, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
index b1947492b..26daa4b46 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
@@ -14,10 +14,9 @@ import org.eclipse.etrice.generator.c.gen.SubSystemRunnerGen;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
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.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
index ac6dbaaad..999ef7e28 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
@@ -1,5 +1,6 @@
package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashSet;
@@ -25,16 +26,13 @@ import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
+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 ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -60,33 +58,32 @@ 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 path = (_generationTargetPath + _path);
String _cHeaderFileName = this.stdExt.getCHeaderFileName(pc);
- String _operator_plus_1 = StringExtensions.operator_plus("generating ProtocolClass header \'", _cHeaderFileName);
- 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 _plus = ("generating ProtocolClass header \'" + _cHeaderFileName);
+ 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);
String _cHeaderFileName_1 = this.stdExt.getCHeaderFileName(pc);
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, pc);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, pc);
this.fileAccess.generateFile(_cHeaderFileName_1, _generateHeaderFile);
String _cSourceFileName = this.stdExt.getCSourceFileName(pc);
- String _operator_plus_5 = StringExtensions.operator_plus("generating ProtocolClass source \'", _cSourceFileName);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' in \'");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, path);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\'");
- this.logger.logInfo(_operator_plus_8);
+ String _plus_4 = ("generating ProtocolClass source \'" + _cSourceFileName);
+ String _plus_5 = (_plus_4 + "\' in \'");
+ String _plus_6 = (_plus_5 + path);
+ String _plus_7 = (_plus_6 + "\'");
+ this.logger.logInfo(_plus_7);
this.fileAccess.setOutputPath(path);
String _cSourceFileName_1 = this.stdExt.getCSourceFileName(pc);
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, pc);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, pc);
this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
}
}
}
- private StringConcatenation generateHeaderFile(final Root root, final ProtocolClass pc) {
+ private CharSequence generateHeaderFile(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -109,7 +106,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
_builder.newLine();
String _name_1 = pc.getName();
- StringConcatenation _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -119,7 +116,7 @@ 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();
@@ -136,8 +133,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
{
CommunicationType _commType = pc.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ if (_equals) {
_builder.newLine();
_builder.append("/* message IDs */");
_builder.newLine();
@@ -147,25 +144,25 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
_builder.append("/*--------------------- port structs and methods */");
_builder.newLine();
- StringConcatenation _portClassHeader = this.portClassHeader(pc, ((Boolean)false));
+ CharSequence _portClassHeader = this.portClassHeader(pc, Boolean.valueOf(false));
_builder.append(_portClassHeader, "");
_builder.newLineIfNotEmpty();
- StringConcatenation _portClassHeader_1 = this.portClassHeader(pc, ((Boolean)true));
+ CharSequence _portClassHeader_1 = this.portClassHeader(pc, Boolean.valueOf(true));
_builder.append(_portClassHeader_1, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_1 = pc.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, CommunicationType.DATA_DRIVEN);
- if (_operator_equals_1) {
+ boolean _equals_1 = Objects.equal(_commType_1, CommunicationType.DATA_DRIVEN);
+ if (_equals_1) {
_builder.append("/*--------------------- port structs and methods */");
_builder.newLine();
- StringConcatenation _genDataDrivenPortHeaders = this.genDataDrivenPortHeaders(pc);
+ CharSequence _genDataDrivenPortHeaders = this.genDataDrivenPortHeaders(pc);
_builder.append(_genDataDrivenPortHeaders, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_2 = pc.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, CommunicationType.SYNCHRONOUS);
- if (_operator_equals_2) {
+ boolean _equals_2 = Objects.equal(_commType_2, CommunicationType.SYNCHRONOUS);
+ if (_equals_2) {
_builder.append("#error \"synchronoue protocols not implemented yet\"");
_builder.newLine();
}
@@ -185,19 +182,19 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
_builder.newLine();
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();
String _name_4 = pc.getName();
- StringConcatenation _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_4);
+ CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_4);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
return _builder;
}
- private StringConcatenation generateSourceFile(final Root root, final ProtocolClass pc) {
+ private CharSequence generateSourceFile(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -228,7 +225,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
_builder.newLine();
DetailCode _userCode3 = pc.getUserCode3();
- StringConcatenation _userCode = this.helpers.userCode(_userCode3);
+ CharSequence _userCode = this.helpers.userCode(_userCode3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -236,31 +233,31 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
{
CommunicationType _commType = pc.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- if (_operator_equals) {
- StringConcatenation _portClassSource = this.portClassSource(pc, ((Boolean)false));
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ if (_equals) {
+ CharSequence _portClassSource = this.portClassSource(pc, Boolean.valueOf(false));
_builder.append(_portClassSource, "");
_builder.newLineIfNotEmpty();
- StringConcatenation _portClassSource_1 = this.portClassSource(pc, ((Boolean)true));
+ CharSequence _portClassSource_1 = this.portClassSource(pc, Boolean.valueOf(true));
_builder.append(_portClassSource_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("/*--------------------- debug helpers */");
_builder.newLine();
- StringConcatenation _generateDebugHelpersImplementation = this.generateDebugHelpersImplementation(root, pc);
+ CharSequence _generateDebugHelpersImplementation = this.generateDebugHelpersImplementation(root, pc);
_builder.append(_generateDebugHelpersImplementation, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_1 = pc.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, CommunicationType.DATA_DRIVEN);
- if (_operator_equals_1) {
- StringConcatenation _genDataDrivenPortSources = this.genDataDrivenPortSources(pc);
+ boolean _equals_1 = Objects.equal(_commType_1, CommunicationType.DATA_DRIVEN);
+ if (_equals_1) {
+ CharSequence _genDataDrivenPortSources = this.genDataDrivenPortSources(pc);
_builder.append(_genDataDrivenPortSources, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_2 = pc.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, CommunicationType.SYNCHRONOUS);
- if (_operator_equals_2) {
+ boolean _equals_2 = Objects.equal(_commType_2, CommunicationType.SYNCHRONOUS);
+ if (_equals_2) {
_builder.append("#error \"synchronoue protocols not implemented yet\"");
_builder.newLine();
}
@@ -270,15 +267,13 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
return _builder;
}
- private StringConcatenation portClassHeader(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence portClassHeader(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- String _portClassName = this.roomExt.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this.roomExt.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ String portClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue());
+ String replPortClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue(), true);
List<Message> _xifexpression = null;
- if (conj) {
+ if ((conj).booleanValue()) {
List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
_xifexpression = _allIncomingMessages;
} else {
@@ -300,15 +295,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t\t");
_builder.newLine();
{
- PortClass _portClass = this.roomExt.getPortClass(pc, conj);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_portClass, null);
- if (_operator_notEquals) {
+ PortClass _portClass = this.roomExt.getPortClass(pc, (conj).booleanValue());
+ boolean _notEquals = (!Objects.equal(_portClass, null));
+ if (_notEquals) {
{
- PortClass _portClass_1 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass_1 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<Attribute> _attributes = _portClass_1.getAttributes();
boolean _isEmpty = _attributes.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("/* variable part of PortClass (RAM) */");
_builder.newLine();
_builder.append("typedef struct ");
@@ -322,28 +317,28 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("_var {");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- PortClass _portClass_2 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass_2 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<Attribute> _attributes_1 = _portClass_2.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");
_builder.append("};");
_builder.newLine();
{
- PortClass _portClass_3 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass_3 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<Attribute> _attributes_3 = _portClass_3.getAttributes();
for(final Attribute a : _attributes_3) {
{
String _defaultValueLiteral = a.getDefaultValueLiteral();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals_1) {
_builder.append("\t\t\t\t");
- String _operator_plus = StringExtensions.operator_plus(portClassName, " ");
+ String _plus = (portClassName + " ");
String _name = a.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ": Attribute initialization not supported in C");
- this.logger.logInfo(_operator_plus_2);
+ String _plus_1 = (_plus + _name);
+ String _plus_2 = (_plus_1 + ": Attribute initialization not supported in C");
+ this.logger.logInfo(_plus_2);
_builder.newLineIfNotEmpty();
}
}
@@ -359,8 +354,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
for(final Message message : messages) {
_builder.append("\t\t");
VarDecl _data = message.getData();
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_data, null);
- boolean hasData = _operator_notEquals_2;
+ boolean hasData = (!Objects.equal(_data, null));
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
String _xifexpression_1 = null;
@@ -377,26 +371,26 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
String _xifexpression_2 = null;
- boolean _operator_and = false;
+ boolean _and = false;
if (!hasData) {
- _operator_and = false;
+ _and = false;
} else {
- boolean _operator_or = false;
+ boolean _or = false;
VarDecl _data_2 = message.getData();
RefableType _refType_1 = _data_2.getRefType();
DataType _type_1 = _refType_1.getType();
- boolean _operator_not_1 = BooleanExtensions.operator_not((_type_1 instanceof PrimitiveType));
- if (_operator_not_1) {
- _operator_or = true;
+ boolean _not_1 = (!(_type_1 instanceof PrimitiveType));
+ if (_not_1) {
+ _or = true;
} else {
VarDecl _data_3 = message.getData();
RefableType _refType_2 = _data_3.getRefType();
boolean _isRef = _refType_2.isRef();
- _operator_or = BooleanExtensions.operator_or(_operator_not_1, _isRef);
+ _or = (_not_1 || _isRef);
}
- _operator_and = BooleanExtensions.operator_and(hasData, _operator_or);
+ _and = (hasData && _or);
}
- if (_operator_and) {
+ if (_and) {
_xifexpression_2 = "*";
} else {
_xifexpression_2 = "";
@@ -406,10 +400,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t\t");
String _xifexpression_3 = null;
if (hasData) {
- String _operator_plus_3 = StringExtensions.operator_plus(", ", typeName);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, refp);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, " data");
- _xifexpression_3 = _operator_plus_5;
+ String _plus_3 = (", " + typeName);
+ String _plus_4 = (_plus_3 + refp);
+ String _plus_5 = (_plus_4 + " data");
+ _xifexpression_3 = _plus_5;
} else {
_xifexpression_3 = "";
}
@@ -429,8 +423,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
String _name_3 = message.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(", int idx", data);
- String _messageSignature_2 = this.messageSignature(replPortClassName, _name_3, "", _operator_plus_6);
+ String _plus_6 = (", int idx" + data);
+ String _messageSignature_2 = this.messageSignature(replPortClassName, _name_3, "", _plus_6);
_builder.append(_messageSignature_2, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -439,19 +433,19 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t\t\t");
_builder.newLine();
{
- PortClass _portClass_4 = this.roomExt.getPortClass(pc, conj);
- boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(_portClass_4, null);
- if (_operator_notEquals_3) {
+ PortClass _portClass_4 = this.roomExt.getPortClass(pc, (conj).booleanValue());
+ boolean _notEquals_2 = (!Objects.equal(_portClass_4, null));
+ if (_notEquals_2) {
_builder.append("\t\t");
- PortClass _portClass_5 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass_5 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations = _portClass_5.getOperations();
- StringConcatenation _operationsDeclaration = this.helpers.operationsDeclaration(_operations, portClassName);
+ CharSequence _operationsDeclaration = this.helpers.operationsDeclaration(_operations, portClassName);
_builder.append(_operationsDeclaration, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
- PortClass _portClass_6 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass_6 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations_1 = _portClass_6.getOperations();
- StringConcatenation _operationsDeclaration_1 = this.helpers.operationsDeclaration(_operations_1, replPortClassName);
+ CharSequence _operationsDeclaration_1 = this.helpers.operationsDeclaration(_operations_1, replPortClassName);
_builder.append(_operationsDeclaration_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -459,10 +453,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t\t");
_builder.newLine();
{
- boolean _handlesReceive = this.roomExt.handlesReceive(pc, conj);
+ boolean _handlesReceive = this.roomExt.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive) {
{
- List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, conj);
+ List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, (conj).booleanValue());
for(final MessageHandler h : _receiveHandlers) {
_builder.append("void ");
_builder.append(portClassName, "");
@@ -489,19 +483,18 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
return _xblockexpression;
}
- private StringConcatenation genDataDrivenPortHeaders(final ProtocolClass pc) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genDataDrivenPortHeaders(final ProtocolClass pc) {
+ CharSequence _xblockexpression = null;
{
List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
public Boolean apply(final Message m) {
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- return ((Boolean)_operator_notEquals);
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
}
};
- Iterable<Message> _filter = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
- Iterable<Message> sentMsgs = _filter;
+ Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* data driven send port (conjugated) */");
_builder.newLine();
@@ -513,8 +506,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
VarDecl _data = msg.getData();
RefableType _refType = _data.getRefType();
DataType _type = _refType.getType();
- String _typeName = this._typeHelpers.typeName(_type);
- String typeName = _typeName;
+ String typeName = this._typeHelpers.typeName(_type);
_builder.newLineIfNotEmpty();
_builder.append("\t");
String _xifexpression = null;
@@ -565,33 +557,32 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
{
for(final Message message : sentMsgs) {
VarDecl _data_2 = message.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data_2, null);
- boolean hasData = _operator_notEquals;
+ boolean hasData = (!Objects.equal(_data_2, null));
_builder.newLineIfNotEmpty();
String _xifexpression_1 = null;
if (hasData) {
VarDecl _data_3 = message.getData();
RefableType _refType_2 = _data_3.getRefType();
DataType _type_1 = _refType_2.getType();
- String _typeName_1 = this._typeHelpers.typeName(_type_1);
- _xifexpression_1 = _typeName_1;
+ String _typeName = this._typeHelpers.typeName(_type_1);
+ _xifexpression_1 = _typeName;
} else {
_xifexpression_1 = "";
}
String typeName_1 = _xifexpression_1;
_builder.newLineIfNotEmpty();
String _xifexpression_2 = null;
- boolean _operator_and = false;
+ boolean _and = false;
if (!hasData) {
- _operator_and = false;
+ _and = false;
} else {
VarDecl _data_4 = message.getData();
RefableType _refType_3 = _data_4.getRefType();
DataType _type_2 = _refType_3.getType();
- boolean _operator_not = BooleanExtensions.operator_not((_type_2 instanceof PrimitiveType));
- _operator_and = BooleanExtensions.operator_and(hasData, _operator_not);
+ boolean _not = (!(_type_2 instanceof PrimitiveType));
+ _and = (hasData && _not);
}
- if (_operator_and) {
+ if (_and) {
_xifexpression_2 = "*";
} else {
_xifexpression_2 = "";
@@ -600,10 +591,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
String _xifexpression_3 = null;
if (hasData) {
- String _operator_plus = StringExtensions.operator_plus(", ", typeName_1);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, refp_1);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, " data");
- _xifexpression_3 = _operator_plus_2;
+ String _plus = (", " + typeName_1);
+ String _plus_1 = (_plus + refp_1);
+ String _plus_2 = (_plus_1 + " data");
+ _xifexpression_3 = _plus_2;
} else {
_xifexpression_3 = "";
}
@@ -629,55 +620,41 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
return _xblockexpression;
}
- private StringConcatenation genDataDrivenPortSources(final ProtocolClass pc) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genDataDrivenPortSources(final ProtocolClass pc) {
+ CharSequence _xblockexpression = null;
{
List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
public Boolean apply(final Message m) {
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- return ((Boolean)_operator_notEquals);
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
}
};
- Iterable<Message> _filter = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
- Iterable<Message> messages = _filter;
+ Iterable<Message> messages = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
StringConcatenation _builder = new StringConcatenation();
{
for(final Message message : messages) {
VarDecl _data = message.getData();
RefableType _refType = _data.getRefType();
DataType _type = _refType.getType();
- String _typeName = this._typeHelpers.typeName(_type);
- String typeName = _typeName;
+ String typeName = this._typeHelpers.typeName(_type);
_builder.newLineIfNotEmpty();
String _xifexpression = null;
VarDecl _data_1 = message.getData();
RefableType _refType_1 = _data_1.getRefType();
DataType _type_1 = _refType_1.getType();
- boolean _operator_not = BooleanExtensions.operator_not((_type_1 instanceof PrimitiveType));
- if (_operator_not) {
+ boolean _not = (!(_type_1 instanceof PrimitiveType));
+ if (_not) {
_xifexpression = "*";
} else {
_xifexpression = "";
}
String refp = _xifexpression;
_builder.newLineIfNotEmpty();
- String _xifexpression_1 = null;
- VarDecl _data_2 = message.getData();
- RefableType _refType_2 = _data_2.getRefType();
- DataType _type_2 = _refType_2.getType();
- if ((_type_2 instanceof PrimitiveType)) {
- _xifexpression_1 = "&";
- } else {
- _xifexpression_1 = "";
- }
- String refa = _xifexpression_1;
- _builder.newLineIfNotEmpty();
- String _operator_plus = StringExtensions.operator_plus(", ", typeName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, refp);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, " data");
- String data = _operator_plus_2;
+ String _plus = (", " + typeName);
+ String _plus_1 = (_plus + refp);
+ String data = (_plus_1 + " data");
_builder.newLineIfNotEmpty();
String _portClassName = this.roomExt.getPortClassName(pc, true);
String _name = message.getName();
@@ -715,15 +692,13 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
return _xblockexpression;
}
- private StringConcatenation portClassSource(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence portClassSource(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- String _portClassName = this.roomExt.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this.roomExt.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ String portClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue());
+ String replPortClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue(), true);
List<Message> _xifexpression = null;
- if (conj) {
+ if ((conj).booleanValue()) {
List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
_xifexpression = _allIncomingMessages;
} else {
@@ -732,7 +707,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
}
List<Message> messages = _xifexpression;
String _xifexpression_1 = null;
- if (conj) {
+ if ((conj).booleanValue()) {
_xifexpression_1 = "IN_";
} else {
_xifexpression_1 = "OUT_";
@@ -742,8 +717,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
{
for(final Message message : messages) {
VarDecl _data = message.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- boolean hasData = _operator_notEquals;
+ boolean hasData = (!Objects.equal(_data, null));
_builder.newLineIfNotEmpty();
String _xifexpression_2 = null;
if (hasData) {
@@ -758,16 +732,16 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
String typeName = _xifexpression_2;
_builder.newLineIfNotEmpty();
String _xifexpression_3 = null;
- boolean _operator_and = false;
+ boolean _and = false;
if (!hasData) {
- _operator_and = false;
+ _and = false;
} else {
VarDecl _data_2 = message.getData();
RefableType _refType_1 = _data_2.getRefType();
boolean _isRef = _refType_1.isRef();
- _operator_and = BooleanExtensions.operator_and(hasData, _isRef);
+ _and = (hasData && _isRef);
}
- if (_operator_and) {
+ if (_and) {
_xifexpression_3 = "*";
} else {
_xifexpression_3 = "";
@@ -775,26 +749,26 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
String refp = _xifexpression_3;
_builder.newLineIfNotEmpty();
String _xifexpression_4 = null;
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
if (!hasData) {
- _operator_and_1 = false;
+ _and_1 = false;
} else {
- boolean _operator_or = false;
+ boolean _or = false;
VarDecl _data_3 = message.getData();
RefableType _refType_2 = _data_3.getRefType();
DataType _type_1 = _refType_2.getType();
- boolean _operator_not = BooleanExtensions.operator_not((_type_1 instanceof PrimitiveType));
- if (_operator_not) {
- _operator_or = true;
+ boolean _not = (!(_type_1 instanceof PrimitiveType));
+ if (_not) {
+ _or = true;
} else {
VarDecl _data_4 = message.getData();
RefableType _refType_3 = _data_4.getRefType();
boolean _isRef_1 = _refType_3.isRef();
- _operator_or = BooleanExtensions.operator_or(_operator_not, _isRef_1);
+ _or = (_not || _isRef_1);
}
- _operator_and_1 = BooleanExtensions.operator_and(hasData, _operator_or);
+ _and_1 = (hasData && _or);
}
- if (_operator_and_1) {
+ if (_and_1) {
_xifexpression_4 = "*";
} else {
_xifexpression_4 = "";
@@ -802,27 +776,27 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
String refpd = _xifexpression_4;
_builder.newLineIfNotEmpty();
String _xifexpression_5 = null;
- boolean _operator_and_2 = false;
- boolean _operator_and_3 = false;
+ boolean _and_2 = false;
+ boolean _and_3 = false;
if (!hasData) {
- _operator_and_3 = false;
+ _and_3 = false;
} else {
VarDecl _data_5 = message.getData();
RefableType _refType_4 = _data_5.getRefType();
DataType _type_2 = _refType_4.getType();
- boolean _operator_not_1 = BooleanExtensions.operator_not((_type_2 instanceof PrimitiveType));
- _operator_and_3 = BooleanExtensions.operator_and(hasData, _operator_not_1);
+ boolean _not_1 = (!(_type_2 instanceof PrimitiveType));
+ _and_3 = (hasData && _not_1);
}
- if (!_operator_and_3) {
- _operator_and_2 = false;
+ if (!_and_3) {
+ _and_2 = false;
} else {
VarDecl _data_6 = message.getData();
RefableType _refType_5 = _data_6.getRefType();
boolean _isRef_2 = _refType_5.isRef();
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isRef_2);
- _operator_and_2 = BooleanExtensions.operator_and(_operator_and_3, _operator_not_2);
+ boolean _not_2 = (!_isRef_2);
+ _and_2 = (_and_3 && _not_2);
}
- if (_operator_and_2) {
+ if (_and_2) {
_xifexpression_5 = "";
} else {
_xifexpression_5 = "&";
@@ -831,10 +805,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
String _xifexpression_6 = null;
if (hasData) {
- String _operator_plus = StringExtensions.operator_plus(", ", typeName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, refpd);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, " data");
- _xifexpression_6 = _operator_plus_2;
+ String _plus = (", " + typeName);
+ String _plus_1 = (_plus + refpd);
+ String _plus_2 = (_plus_1 + " data");
+ _xifexpression_6 = _plus_2;
} else {
_xifexpression_6 = "";
}
@@ -848,8 +822,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
}
String dataCall = _xifexpression_7;
_builder.newLineIfNotEmpty();
- MessageHandler _sendHandler = this.roomExt.getSendHandler(message, conj);
- MessageHandler hdlr = _sendHandler;
+ MessageHandler hdlr = this.roomExt.getSendHandler(message, (conj).booleanValue());
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name = message.getName();
@@ -858,8 +831,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals = (!Objects.equal(hdlr, null));
+ if (_notEquals) {
_builder.append("\t");
{
DetailCode _detailCode = hdlr.getDetailCode();
@@ -883,11 +856,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t");
String _name_2 = pc.getName();
String _name_3 = message.getName();
- String _operator_plus_3 = StringExtensions.operator_plus(dir, _name_3);
- String _memberInUse = this.stdExt.memberInUse(_name_2, _operator_plus_3);
- String _operator_plus_4 = StringExtensions.operator_plus(typeName, refp);
- String _operator_plus_5 = StringExtensions.operator_plus(refa, "data");
- String _sendMessageCall = this.sendMessageCall(hasData, "self", _memberInUse, _operator_plus_4, _operator_plus_5);
+ String _plus_3 = (dir + _name_3);
+ String _memberInUse = this.stdExt.memberInUse(_name_2, _plus_3);
+ String _plus_4 = (typeName + refp);
+ String _plus_5 = (refa + "data");
+ String _sendMessageCall = this.sendMessageCall(hasData, "self", _memberInUse, _plus_4, _plus_5);
_builder.append(_sendMessageCall, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -904,8 +877,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_1 = (!Objects.equal(hdlr, null));
+ if (_notEquals_1) {
_builder.append("\t");
_builder.append("int i;");
_builder.newLine();
@@ -944,11 +917,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t");
String _name_7 = pc.getName();
String _name_8 = message.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(dir, _name_8);
- String _memberInUse_1 = this.stdExt.memberInUse(_name_7, _operator_plus_6);
- String _operator_plus_7 = StringExtensions.operator_plus(typeName, refp);
- String _operator_plus_8 = StringExtensions.operator_plus(refa, "data");
- String _sendMessageCall_1 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[i])", _memberInUse_1, _operator_plus_7, _operator_plus_8);
+ String _plus_6 = (dir + _name_8);
+ String _memberInUse_1 = this.stdExt.memberInUse(_name_7, _plus_6);
+ String _plus_7 = (typeName + refp);
+ String _plus_8 = (refa + "data");
+ String _sendMessageCall_1 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[i])", _memberInUse_1, _plus_7, _plus_8);
_builder.append(_sendMessageCall_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -963,14 +936,14 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
_builder.newLine();
String _name_9 = message.getName();
- String _operator_plus_9 = StringExtensions.operator_plus(", int idx", data);
- String _messageSignature_2 = this.messageSignature(replPortClassName, _name_9, "", _operator_plus_9);
+ String _plus_9 = (", int idx" + data);
+ String _messageSignature_2 = this.messageSignature(replPortClassName, _name_9, "", _plus_9);
_builder.append(_messageSignature_2, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals_3) {
+ boolean _notEquals_2 = (!Objects.equal(hdlr, null));
+ if (_notEquals_2) {
_builder.append("\t");
_builder.append(portClassName, " ");
_builder.append("_");
@@ -996,11 +969,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.append("\t");
String _name_12 = pc.getName();
String _name_13 = message.getName();
- String _operator_plus_10 = StringExtensions.operator_plus(dir, _name_13);
- String _memberInUse_2 = this.stdExt.memberInUse(_name_12, _operator_plus_10);
- String _operator_plus_11 = StringExtensions.operator_plus(typeName, refp);
- String _operator_plus_12 = StringExtensions.operator_plus(refa, "data");
- String _sendMessageCall_2 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[idx])", _memberInUse_2, _operator_plus_11, _operator_plus_12);
+ String _plus_10 = (dir + _name_13);
+ String _memberInUse_2 = this.stdExt.memberInUse(_name_12, _plus_10);
+ String _plus_11 = (typeName + refp);
+ String _plus_12 = (refa + "data");
+ String _sendMessageCall_2 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[idx])", _memberInUse_2, _plus_11, _plus_12);
_builder.append(_sendMessageCall_2, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1017,17 +990,17 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
}
_builder.newLine();
{
- PortClass _portClass = this.roomExt.getPortClass(pc, conj);
- boolean _operator_notEquals_4 = ObjectExtensions.operator_notEquals(_portClass, null);
- if (_operator_notEquals_4) {
- PortClass _portClass_1 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass = this.roomExt.getPortClass(pc, (conj).booleanValue());
+ boolean _notEquals_3 = (!Objects.equal(_portClass, null));
+ if (_notEquals_3) {
+ PortClass _portClass_1 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations = _portClass_1.getOperations();
- StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(_operations, portClassName);
+ CharSequence _operationsImplementation = this.helpers.operationsImplementation(_operations, portClassName);
_builder.append(_operationsImplementation, "");
_builder.newLineIfNotEmpty();
- PortClass _portClass_2 = this.roomExt.getPortClass(pc, conj);
+ PortClass _portClass_2 = this.roomExt.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations_1 = _portClass_2.getOperations();
- StringConcatenation _operationsImplementation_1 = this.helpers.operationsImplementation(_operations_1, replPortClassName);
+ CharSequence _operationsImplementation_1 = this.helpers.operationsImplementation(_operations_1, replPortClassName);
_builder.append(_operationsImplementation_1, "");
_builder.newLineIfNotEmpty();
}
@@ -1048,9 +1021,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLine();
_builder.newLine();
{
- boolean _handlesReceive = this.roomExt.handlesReceive(pc, conj);
+ boolean _handlesReceive = this.roomExt.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive) {
- StringConcatenation _genReceiveHandlers = this.genReceiveHandlers(pc, conj);
+ CharSequence _genReceiveHandlers = this.genReceiveHandlers(pc, conj);
_builder.append(_genReceiveHandlers, "");
_builder.newLineIfNotEmpty();
}
@@ -1064,93 +1037,70 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
private String sendMessageCall(final boolean hasData, final String self, final String msg, final String typeName, final String data) {
String _xifexpression = null;
if (hasData) {
- String _operator_plus = StringExtensions.operator_plus("etPort_sendMessage(", self);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, ", ");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, msg);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, ", sizeof(");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, typeName);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "), ");
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, data);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, ");");
- _xifexpression = _operator_plus_7;
+ String _plus = ("etPort_sendMessage(" + self);
+ String _plus_1 = (_plus + ", ");
+ String _plus_2 = (_plus_1 + msg);
+ String _plus_3 = (_plus_2 + ", sizeof(");
+ String _plus_4 = (_plus_3 + typeName);
+ String _plus_5 = (_plus_4 + "), ");
+ String _plus_6 = (_plus_5 + data);
+ String _plus_7 = (_plus_6 + ");");
+ _xifexpression = _plus_7;
} else {
- String _operator_plus_8 = StringExtensions.operator_plus("etPort_sendMessage(", self);
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, ", ");
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, msg);
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, ", 0, NULL);");
- _xifexpression = _operator_plus_11;
+ String _plus_8 = ("etPort_sendMessage(" + self);
+ String _plus_9 = (_plus_8 + ", ");
+ String _plus_10 = (_plus_9 + msg);
+ String _plus_11 = (_plus_10 + ", 0, NULL);");
+ _xifexpression = _plus_11;
}
return _xifexpression;
}
private String messageSignature(final String className, final String messageName, final String methodSuffix, final String data) {
- String _operator_plus = StringExtensions.operator_plus("void ", className);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "_");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, messageName);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, methodSuffix);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "(const ");
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, className);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "* self");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, data);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, ")");
- return _operator_plus_8;
+ String _plus = ("void " + className);
+ String _plus_1 = (_plus + "_");
+ String _plus_2 = (_plus_1 + messageName);
+ String _plus_3 = (_plus_2 + methodSuffix);
+ String _plus_4 = (_plus_3 + "(const ");
+ String _plus_5 = (_plus_4 + className);
+ String _plus_6 = (_plus_5 + "* self");
+ String _plus_7 = (_plus_6 + data);
+ String _plus_8 = (_plus_7 + ")");
+ return _plus_8;
}
private String messageSetterSignature(final String className, final String messageName, final String data) {
- String _operator_plus = StringExtensions.operator_plus("void ", className);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "_");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, messageName);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "_set(");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, className);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "* self");
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, data);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, ")");
- return _operator_plus_7;
+ String _plus = ("void " + className);
+ String _plus_1 = (_plus + "_");
+ String _plus_2 = (_plus_1 + messageName);
+ String _plus_3 = (_plus_2 + "_set(");
+ String _plus_4 = (_plus_3 + className);
+ String _plus_5 = (_plus_4 + "* self");
+ String _plus_6 = (_plus_5 + data);
+ String _plus_7 = (_plus_6 + ")");
+ return _plus_7;
}
private String messageGetterSignature(final String className, final String messageName, final String type) {
- String _operator_plus = StringExtensions.operator_plus(type, " ");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, className);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, messageName);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "_get(const ");
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, className);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "* const self)");
- return _operator_plus_6;
- }
-
- private StringConcatenation 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) {
- _builder.append(" ");
- VarDecl _data_1 = m.getData();
- String _name_1 = _data_1.getName();
- _builder.append(_name_1, "");
- }
- }
- _builder.append(")");
- _builder.newLineIfNotEmpty();
- return _builder;
+ String _plus = (type + " ");
+ String _plus_1 = (_plus + className);
+ String _plus_2 = (_plus_1 + "_");
+ String _plus_3 = (_plus_2 + messageName);
+ String _plus_4 = (_plus_3 + "_get(const ");
+ String _plus_5 = (_plus_4 + className);
+ String _plus_6 = (_plus_5 + "* const self)");
+ return _plus_6;
}
- private StringConcatenation genReceiveHandlers(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genReceiveHandlers(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- String _portClassName = this.roomExt.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this.roomExt.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ String portClassName = this.roomExt.getPortClassName(pc, (conj).booleanValue());
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* receiver handlers */");
_builder.newLine();
{
- List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, conj);
+ List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, (conj).booleanValue());
for(final MessageHandler h : _receiveHandlers) {
_builder.append("void ");
_builder.append(portClassName, "");
@@ -1164,7 +1114,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t");
DetailCode _detailCode = h.getDetailCode();
- StringConcatenation _userCode = this.helpers.userCode(_detailCode);
+ CharSequence _userCode = this.helpers.userCode(_detailCode);
_builder.append(_userCode, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1182,7 +1132,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
return _xblockexpression;
}
- private StringConcatenation generateDebugHelpersImplementation(final Root root, final ProtocolClass pc) {
+ private CharSequence generateDebugHelpersImplementation(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
_builder.append("/* message names as strings for debugging (generate MSC) */");
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
index 133e2ad8f..751c964b6 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
@@ -8,25 +8,23 @@ 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.xbase.lib.IntegerExtensions;
-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 genHeaderConstants(final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genHeaderConstants(final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
List<State> _allBaseStates = this._roomExtensions.getAllBaseStates(ac);
int _size = _allBaseStates.size();
List<State> _allLeafStates = this._roomExtensions.getAllLeafStates(ac);
int _size_1 = _allLeafStates.size();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_size), ((Integer)_size_1));
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_operator_minus), ((Integer)2));
- int historySize = _operator_plus;
+ int _minus = (_size - _size_1);
+ int historySize = (_minus + 2);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* constant for state machine data */");
_builder.newLine();
@@ -42,7 +40,7 @@ public class StateMachineGen extends GenericStateMachineGenerator {
return _xblockexpression;
}
- public StringConcatenation genDataMembers(final ExpandedActorClass xpac, final ActorClass ac) {
+ public CharSequence genDataMembers(final ExpandedActorClass xpac, final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* state machine variables */");
_builder.newLine();
@@ -57,7 +55,7 @@ public class StateMachineGen extends GenericStateMachineGenerator {
return _builder;
}
- public StringConcatenation genInitialization(final ExpandedActorClass xpac, final ActorClass ac) {
+ public CharSequence genInitialization(final ExpandedActorClass xpac, final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("self->state = STATE_TOP;");
_builder.newLine();
@@ -83,7 +81,7 @@ public class StateMachineGen extends GenericStateMachineGenerator {
return _builder;
}
- public StringConcatenation genExtra(final ExpandedActorClass xpac, final ActorClass ac) {
+ public CharSequence genExtra(final ExpandedActorClass xpac, final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
String _accessLevelPrivate = this.langExt.accessLevelPrivate();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
index 6ba2c9d02..e4737ab0c 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
@@ -1,5 +1,7 @@
package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.ArrayList;
@@ -34,20 +36,14 @@ import org.eclipse.etrice.generator.c.gen.CExtensions;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
+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.CollectionExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
-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 SubSystemClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -75,61 +71,59 @@ 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 _cHeaderFileName = this.stdExt.getCHeaderFileName(_subSystemClass_2);
- String file = _cHeaderFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating SubSystemClass declaration: \'", 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.getCHeaderFileName(_subSystemClass_2);
+ String _plus = ("generating SubSystemClass declaration: \'" + 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 _generateHeaderFile = this.generateHeaderFile(root, ssi, _subSystemClass_3);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, ssi, _subSystemClass_3);
this.fileAccess.generateFile(file, _generateHeaderFile);
SubSystemClass _subSystemClass_4 = ssi.getSubSystemClass();
String _cSourceFileName = this.stdExt.getCSourceFileName(_subSystemClass_4);
file = _cSourceFileName;
- String _operator_plus_5 = StringExtensions.operator_plus("generating SubSystemClass implementation: \'", file);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' in \'");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, path);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\'");
- this.logger.logInfo(_operator_plus_8);
+ String _plus_4 = ("generating SubSystemClass implementation: \'" + file);
+ String _plus_5 = (_plus_4 + "\' in \'");
+ String _plus_6 = (_plus_5 + path);
+ String _plus_7 = (_plus_6 + "\'");
+ this.logger.logInfo(_plus_7);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_5 = ssi.getSubSystemClass();
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, ssi, _subSystemClass_5);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, ssi, _subSystemClass_5);
this.fileAccess.generateFile(file, _generateSourceFile);
SubSystemClass _subSystemClass_6 = ssi.getSubSystemClass();
String _instSourceFileName = this.stdExt.getInstSourceFileName(_subSystemClass_6);
file = _instSourceFileName;
- String _operator_plus_9 = StringExtensions.operator_plus("generating SubSystemClass instance file: \'", file);
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, "\' in \'");
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, path);
- String _operator_plus_12 = StringExtensions.operator_plus(_operator_plus_11, "\'");
- this.logger.logInfo(_operator_plus_12);
+ String _plus_8 = ("generating SubSystemClass instance file: \'" + file);
+ String _plus_9 = (_plus_8 + "\' in \'");
+ String _plus_10 = (_plus_9 + path);
+ String _plus_11 = (_plus_10 + "\'");
+ this.logger.logInfo(_plus_11);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_7 = ssi.getSubSystemClass();
- StringConcatenation _generateInstanceFile = this.generateInstanceFile(root, ssi, _subSystemClass_7);
+ CharSequence _generateInstanceFile = this.generateInstanceFile(root, ssi, _subSystemClass_7);
this.fileAccess.generateFile(file, _generateInstanceFile);
SubSystemClass _subSystemClass_8 = ssi.getSubSystemClass();
String _dispSourceFileName = this.stdExt.getDispSourceFileName(_subSystemClass_8);
file = _dispSourceFileName;
- String _operator_plus_13 = StringExtensions.operator_plus("generating SubSystemClass dispatcher file: \'", file);
- String _operator_plus_14 = StringExtensions.operator_plus(_operator_plus_13, "\' in \'");
- String _operator_plus_15 = StringExtensions.operator_plus(_operator_plus_14, path);
- String _operator_plus_16 = StringExtensions.operator_plus(_operator_plus_15, "\'");
- this.logger.logInfo(_operator_plus_16);
+ String _plus_12 = ("generating SubSystemClass dispatcher file: \'" + file);
+ String _plus_13 = (_plus_12 + "\' in \'");
+ String _plus_14 = (_plus_13 + path);
+ String _plus_15 = (_plus_14 + "\'");
+ this.logger.logInfo(_plus_15);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_9 = ssi.getSubSystemClass();
- StringConcatenation _generateDispatcherFile = this.generateDispatcherFile(root, ssi, _subSystemClass_9);
+ CharSequence _generateDispatcherFile = this.generateDispatcherFile(root, ssi, _subSystemClass_9);
this.fileAccess.generateFile(file, _generateDispatcherFile);
}
}
}
- private StringConcatenation generateHeaderFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateHeaderFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -152,12 +146,12 @@ public class SubSystemClassGen {
_builder.newLine();
_builder.newLine();
String _name_1 = ssc.getName();
- StringConcatenation _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
DetailCode _userCode1 = ssc.getUserCode1();
- StringConcatenation _userCode = this.helpers.userCode(_userCode1);
+ CharSequence _userCode = this.helpers.userCode(_userCode1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -206,12 +200,12 @@ public class SubSystemClassGen {
_builder.newLineIfNotEmpty();
_builder.newLine();
DetailCode _userCode2 = ssc.getUserCode2();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode2);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode2);
_builder.append(_userCode_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name_8 = ssc.getName();
- StringConcatenation _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_8);
+ CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_8);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -219,7 +213,7 @@ public class SubSystemClassGen {
return _builder;
}
- private StringConcatenation generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -271,7 +265,7 @@ public class SubSystemClassGen {
_builder.newLine();
_builder.newLine();
DetailCode _userCode3 = ssc.getUserCode3();
- StringConcatenation _userCode = this.helpers.userCode(_userCode3);
+ CharSequence _userCode = this.helpers.userCode(_userCode3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -416,7 +410,7 @@ public class SubSystemClassGen {
_builder.append("etMessageService_execute(&msgService_Thread1);");
_builder.newLine();
_builder.append("\t\t\t\t");
- StringConcatenation _generateDatadrivenExecutes = this.generateDatadrivenExecutes(root, ssi);
+ CharSequence _generateDatadrivenExecutes = this.generateDatadrivenExecutes(root, ssi);
_builder.append(_generateDatadrivenExecutes, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
@@ -444,7 +438,7 @@ public class SubSystemClassGen {
_builder.append("etMessageService_execute(&msgService_Thread1);");
_builder.newLine();
_builder.append("\t\t\t\t");
- StringConcatenation _generateDatadrivenExecutes_1 = this.generateDatadrivenExecutes(root, ssi);
+ CharSequence _generateDatadrivenExecutes_1 = this.generateDatadrivenExecutes(root, ssi);
_builder.append(_generateDatadrivenExecutes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t\t");
@@ -512,7 +506,7 @@ public class SubSystemClassGen {
_builder.newLineIfNotEmpty();
{
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
- Iterable<ActorInstance> _reverseView = ListExtensions.<ActorInstance>reverseView(_allContainedInstances);
+ List<ActorInstance> _reverseView = ListExtensions.<ActorInstance>reverseView(_allContainedInstances);
for(final ActorInstance ai : _reverseView) {
{
ActorClass _actorClass = ai.getActorClass();
@@ -520,13 +514,13 @@ public class SubSystemClassGen {
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isDestructor = op.isDestructor();
- return ((Boolean)_isDestructor);
+ return Boolean.valueOf(_isDestructor);
}
};
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
boolean _isEmpty = IterableExtensions.isEmpty(_filter);
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("\t");
ActorClass _actorClass_1 = ai.getActorClass();
String _name_22 = _actorClass_1.getName();
@@ -593,13 +587,13 @@ public class SubSystemClassGen {
final Function1<StandardOperation,Boolean> _function_1 = 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_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter_1);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_1);
+ if (_not_1) {
_builder.append("\t");
ActorClass _actorClass_3 = ai_1.getActorClass();
String _name_28 = _actorClass_3.getName();
@@ -655,7 +649,7 @@ public class SubSystemClassGen {
return _builder;
}
- private StringConcatenation generateInstanceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateInstanceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -763,16 +757,16 @@ public class SubSystemClassGen {
ProtocolClass _protocol = pi.getProtocol();
boolean _isConjugated = this.roomExt.isConjugated(pi);
PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_portClass, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_portClass, null));
+ if (_notEquals) {
{
ProtocolClass _protocol_1 = pi.getProtocol();
boolean _isConjugated_1 = this.roomExt.isConjugated(pi);
PortClass _portClass_1 = this.roomExt.getPortClass(_protocol_1, _isConjugated_1);
EList<Attribute> _attributes = _portClass_1.getAttributes();
boolean _isEmpty_1 = _attributes.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not) {
+ boolean _not = (!_isEmpty_1);
+ if (_not) {
{
boolean _isReplicated = pi.isReplicated();
if (_isReplicated) {
@@ -805,7 +799,7 @@ public class SubSystemClassGen {
String _pathName_2 = this.roomExt.getPathName(_path_2);
_builder.append(_pathName_2, "");
_builder.append("_var={");
- StringConcatenation _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
+ CharSequence _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
_builder.append(_genPortAttributeInitializer, "");
_builder.append("};");
_builder.newLineIfNotEmpty();
@@ -839,7 +833,7 @@ public class SubSystemClassGen {
_builder.append("/* no ports/saps/services - nothing to initialize statically */");
_builder.newLine();
} else {
- StringConcatenation _genActorInstanceInitializer = this.genActorInstanceInitializer(root, ai_2);
+ CharSequence _genActorInstanceInitializer = this.genActorInstanceInitializer(root, ai_2);
_builder.append(_genActorInstanceInitializer, "");
_builder.newLineIfNotEmpty();
}
@@ -851,52 +845,52 @@ public class SubSystemClassGen {
}
private String genReplPortAttributeInitializer(final InterfaceItemInstance pi) {
- int i = 0;
- String retval = "";
- EList<InterfaceItemInstance> _peers = pi.getPeers();
- int _size = _peers.size();
- i = _size;
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)i), ((Integer)0));
- Boolean _xwhileexpression = _operator_greaterThan;
- while (_xwhileexpression) {
- {
- String _operator_plus = StringExtensions.operator_plus(retval, "\r\n\t\t\t{");
- StringConcatenation _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _genPortAttributeInitializer);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "}");
- retval = _operator_plus_2;
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)i), ((Integer)1));
- i = _operator_minus;
- boolean _operator_greaterThan_1 = ComparableExtensions.<Integer>operator_greaterThan(((Integer)i), ((Integer)0));
- if (_operator_greaterThan_1) {
- String _operator_plus_3 = StringExtensions.operator_plus(retval, ",");
- retval = _operator_plus_3;
- }
+ int i = 0;
+ String retval = "";
+ EList<InterfaceItemInstance> _peers = pi.getPeers();
+ int _size = _peers.size();
+ i = _size;
+ boolean _greaterThan = (i > 0);
+ boolean _while = _greaterThan;
+ while (_while) {
+ {
+ String _plus = (retval + "\r\n\t\t\t{");
+ CharSequence _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
+ String _plus_1 = (_plus + _genPortAttributeInitializer);
+ String _plus_2 = (_plus_1 + "}");
+ retval = _plus_2;
+ int _minus = (i - 1);
+ i = _minus;
+ boolean _greaterThan_1 = (i > 0);
+ if (_greaterThan_1) {
+ String _plus_3 = (retval + ",");
+ retval = _plus_3;
}
- boolean _operator_greaterThan_2 = ComparableExtensions.<Integer>operator_greaterThan(((Integer)i), ((Integer)0));
- _xwhileexpression = _operator_greaterThan_2;
}
- return retval;
+ boolean _greaterThan_1 = (i > 0);
+ _while = _greaterThan_1;
+ }
+ return retval;
}
- private StringConcatenation genPortAttributeInitializer(final InterfaceItemInstance pi) {
+ private CharSequence genPortAttributeInitializer(final InterfaceItemInstance pi) {
StringConcatenation _builder = new StringConcatenation();
{
ProtocolClass _protocol = pi.getProtocol();
boolean _isConjugated = this.roomExt.isConjugated(pi);
PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
EList<Attribute> _attributes = _portClass.getAttributes();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute attr : _attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", "");
}
{
String _defaultValueLiteral = attr.getDefaultValueLiteral();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals) {
String _defaultValueLiteral_1 = attr.getDefaultValueLiteral();
_builder.append(_defaultValueLiteral_1, "");
} else {
@@ -911,113 +905,93 @@ public class SubSystemClassGen {
return _builder;
}
- private StringConcatenation genActorInstanceInitializer(final Root root, final ActorInstance ai) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genActorInstanceInitializer(final Root root, final ActorInstance ai) {
+ CharSequence _xblockexpression = null;
{
String _path = ai.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- String instName = _pathName;
+ String instName = this.roomExt.getPathName(_path);
ArrayList<InterfaceItemInstance> _arrayList = new ArrayList<InterfaceItemInstance>();
ArrayList<InterfaceItemInstance> replPorts = _arrayList;
EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
boolean _isReplicated = e.isReplicated();
- return ((Boolean)_isReplicated);
+ return Boolean.valueOf(_isReplicated);
}
};
Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);
- CollectionExtensions.<InterfaceItemInstance>addAll(replPorts, _filter);
+ Iterables.<InterfaceItemInstance>addAll(replPorts, _filter);
final Function1<InterfaceItemInstance,Boolean> _function_1 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
EList<InterfaceItemInstance> _peers = e.getPeers();
boolean _isEmpty = _peers.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- return ((Boolean)_operator_not);
+ boolean _not = (!_isEmpty);
+ return Boolean.valueOf(_not);
}
};
InterfaceItemInstance _findFirst = IterableExtensions.<InterfaceItemInstance>findFirst(replPorts, _function_1);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_findFirst, null);
- boolean haveReplSubPorts = _operator_notEquals;
+ boolean haveReplSubPorts = (!Objects.equal(_findFirst, null));
EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function_2 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
boolean _isSimple = e.isSimple();
- return ((Boolean)_isSimple);
+ return Boolean.valueOf(_isSimple);
}
};
- Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances_1, _function_2);
- Iterable<InterfaceItemInstance> simplePorts = _filter_1;
+ Iterable<InterfaceItemInstance> simplePorts = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances_1, _function_2);
ArrayList<InterfaceItemInstance> _arrayList_1 = new ArrayList<InterfaceItemInstance>();
ArrayList<InterfaceItemInstance> eventPorts = _arrayList_1;
final Function1<InterfaceItemInstance,Boolean> _function_3 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance p) {
ProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = _protocol.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
- Iterable<InterfaceItemInstance> _filter_2 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_3);
- Iterable<InterfaceItemInstance> _union = this.roomExt.<InterfaceItemInstance>union(_filter_2, replPorts);
- CollectionExtensions.<InterfaceItemInstance>addAll(eventPorts, _union);
+ Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_3);
+ Iterable<InterfaceItemInstance> _union = this.roomExt.<InterfaceItemInstance>union(_filter_1, replPorts);
+ Iterables.<InterfaceItemInstance>addAll(eventPorts, _union);
final Function1<InterfaceItemInstance,Boolean> _function_4 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance p) {
ProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = _protocol.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.DATA_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
- Iterable<InterfaceItemInstance> _filter_3 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_4);
- Iterable<InterfaceItemInstance> dataPorts = _filter_3;
+ Iterable<InterfaceItemInstance> dataPorts = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_4);
final Function1<InterfaceItemInstance,Boolean> _function_5 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance p) {
- boolean _operator_and = false;
- if (!(p instanceof PortInstance)) {
- _operator_and = false;
- } else {
- Port _port = ((PortInstance) p).getPort();
- boolean _isConjugated = _port.isConjugated();
- boolean _operator_not = BooleanExtensions.operator_not(_isConjugated);
- _operator_and = BooleanExtensions.operator_and((p instanceof PortInstance), _operator_not);
- }
- return ((Boolean)_operator_and);
- }
- };
- Iterable<InterfaceItemInstance> _filter_4 = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_5);
- Iterable<InterfaceItemInstance> recvPorts = _filter_4;
- final Function1<InterfaceItemInstance,Boolean> _function_6 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- boolean _operator_and = false;
+ boolean _and = false;
if (!(p instanceof PortInstance)) {
- _operator_and = false;
+ _and = false;
} else {
Port _port = ((PortInstance) p).getPort();
boolean _isConjugated = _port.isConjugated();
- _operator_and = BooleanExtensions.operator_and((p instanceof PortInstance), _isConjugated);
+ boolean _not = (!_isConjugated);
+ _and = ((p instanceof PortInstance) && _not);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
- Iterable<InterfaceItemInstance> _filter_5 = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_6);
- Iterable<InterfaceItemInstance> sendPorts = _filter_5;
+ Iterable<InterfaceItemInstance> recvPorts = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_5);
HashMap<InterfaceItemInstance,Integer> _hashMap = new HashMap<InterfaceItemInstance,Integer>();
HashMap<InterfaceItemInstance,Integer> offsets = _hashMap;
int offset = 0;
for (final InterfaceItemInstance p : replPorts) {
{
- offsets.put(p, ((Integer)offset));
+ offsets.put(p, Integer.valueOf(offset));
EList<InterfaceItemInstance> _peers = p.getPeers();
int _size = _peers.size();
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)_size));
- offset = _operator_plus;
+ int _plus = (offset + _size);
+ offset = _plus;
}
}
String _xifexpression = null;
if (haveReplSubPorts) {
- String _operator_plus_1 = StringExtensions.operator_plus(instName, "_repl_sub_ports");
- _xifexpression = _operator_plus_1;
+ String _plus = (instName + "_repl_sub_ports");
+ _xifexpression = _plus;
} else {
_xifexpression = "NULL";
}
@@ -1035,10 +1009,10 @@ public class SubSystemClassGen {
_builder.append("/* Replicated Sub Ports: {varData, msgService, peerAddress, localId, index} */");
_builder.newLine();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final InterfaceItemInstance pi : replPorts) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -1053,16 +1027,16 @@ public class SubSystemClassGen {
}
}
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _isEmpty = eventPorts.isEmpty();
if (!_isEmpty) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isEmpty_1 = IterableExtensions.isEmpty(recvPorts);
- _operator_and = BooleanExtensions.operator_and(_isEmpty, _isEmpty_1);
+ _and = (_isEmpty && _isEmpty_1);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
+ boolean _not = (!_and);
+ if (_not) {
_builder.append("static const ");
ActorClass _actorClass = ai.getActorClass();
String _name = _actorClass.getName();
@@ -1075,10 +1049,10 @@ public class SubSystemClassGen {
_builder.append("/* Ports: {varData, msgService, peerAddress, localId} */");
_builder.newLine();
{
- boolean hasAnyElements_1 = false;
+ boolean _hasElements_1 = false;
for(final InterfaceItemInstance pi_1 : eventPorts) {
- if (!hasAnyElements_1) {
- hasAnyElements_1 = true;
+ if (!_hasElements_1) {
+ _hasElements_1 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -1092,9 +1066,9 @@ public class SubSystemClassGen {
} else {
_builder.append("\t");
_builder.append("{");
- EList<InterfaceItemInstance> _peers_1 = pi_1.getPeers();
- int _size_1 = _peers_1.size();
- _builder.append(_size_1, " ");
+ EList<InterfaceItemInstance> _peers = pi_1.getPeers();
+ int _size = _peers.size();
+ _builder.append(_size, " ");
_builder.append(", ");
_builder.append(replSubPortsArray, " ");
_builder.append("+");
@@ -1108,17 +1082,17 @@ public class SubSystemClassGen {
}
_builder.append("\t");
{
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
boolean _isEmpty_2 = eventPorts.isEmpty();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_2);
- if (!_operator_not_1) {
- _operator_and_1 = false;
+ boolean _not_1 = (!_isEmpty_2);
+ if (!_not_1) {
+ _and_1 = false;
} else {
boolean _isEmpty_3 = IterableExtensions.isEmpty(recvPorts);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_3);
- _operator_and_1 = BooleanExtensions.operator_and(_operator_not_1, _operator_not_2);
+ boolean _not_2 = (!_isEmpty_3);
+ _and_1 = (_not_1 && _not_2);
}
- if (_operator_and_1) {
+ if (_and_1) {
_builder.append(",");
}
}
@@ -1129,10 +1103,10 @@ public class SubSystemClassGen {
_builder.append("/* data receive ports */");
_builder.newLine();
{
- boolean hasAnyElements_2 = false;
+ boolean _hasElements_2 = false;
for(final InterfaceItemInstance pi_2 : recvPorts) {
- if (!hasAnyElements_2) {
- hasAnyElements_2 = true;
+ if (!_hasElements_2) {
+ _hasElements_2 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -1164,86 +1138,73 @@ public class SubSystemClassGen {
private String genPortInitializer(final Root root, final ActorInstance ai, final InterfaceItemInstance pi) {
String _xblockexpression = null;
{
- String _xifexpression = null;
+ int _xifexpression = (int) 0;
EList<InterfaceItemInstance> _peers = pi.getPeers();
boolean _isEmpty = _peers.isEmpty();
if (_isEmpty) {
- _xifexpression = "NULL";
+ _xifexpression = 0;
} else {
- ActorClass _actorClass = ai.getActorClass();
- String _name = _actorClass.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, "_receiveMessage");
- _xifexpression = _operator_plus;
+ EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
+ InterfaceItemInstance _get = _peers_1.get(0);
+ int _objId = _get.getObjId();
+ _xifexpression = _objId;
}
- String recvMsg = _xifexpression;
+ int objId = _xifexpression;
int _xifexpression_1 = (int) 0;
- EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- boolean _isEmpty_1 = _peers_1.isEmpty();
+ EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
+ boolean _isEmpty_1 = _peers_2.isEmpty();
if (_isEmpty_1) {
_xifexpression_1 = 0;
} else {
- EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
- InterfaceItemInstance _get = _peers_2.get(0);
- int _objId = _get.getObjId();
- _xifexpression_1 = _objId;
- }
- int objId = _xifexpression_1;
- int _xifexpression_2 = (int) 0;
- EList<InterfaceItemInstance> _peers_3 = pi.getPeers();
- boolean _isEmpty_2 = _peers_3.isEmpty();
- if (_isEmpty_2) {
- _xifexpression_2 = 0;
- } else {
- EList<InterfaceItemInstance> _peers_4 = pi.getPeers();
- InterfaceItemInstance _get_1 = _peers_4.get(0);
- EList<InterfaceItemInstance> _peers_5 = _get_1.getPeers();
- int _indexOf = _peers_5.indexOf(pi);
- _xifexpression_2 = _indexOf;
+ EList<InterfaceItemInstance> _peers_3 = pi.getPeers();
+ InterfaceItemInstance _get_1 = _peers_3.get(0);
+ EList<InterfaceItemInstance> _peers_4 = _get_1.getPeers();
+ int _indexOf = _peers_4.indexOf(pi);
+ _xifexpression_1 = _indexOf;
}
- int idx = _xifexpression_2;
+ int idx = _xifexpression_1;
String _interfaceItemInstanceData = this.getInterfaceItemInstanceData(pi);
- String _operator_plus_1 = StringExtensions.operator_plus("{", _interfaceItemInstanceData);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ",");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "&msgService_Thread1, ");
- int _operator_plus_4 = IntegerExtensions.operator_plus(((Integer)objId), ((Integer)idx));
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_3, ((Integer)_operator_plus_4));
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, ", ");
+ String _plus = ("{" + _interfaceItemInstanceData);
+ String _plus_1 = (_plus + ",");
+ String _plus_2 = (_plus_1 + "&msgService_Thread1, ");
+ int _plus_3 = (objId + idx);
+ String _plus_4 = (_plus_2 + Integer.valueOf(_plus_3));
+ String _plus_5 = (_plus_4 + ", ");
ExpandedActorClass _expandedActorClass = root.getExpandedActorClass(ai);
InterfaceItem _interfaceItem = pi.getInterfaceItem();
int _interfaceItemLocalId = _expandedActorClass.getInterfaceItemLocalId(_interfaceItem);
- int _operator_plus_7 = IntegerExtensions.operator_plus(((Integer)_interfaceItemLocalId), ((Integer)1));
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_6, ((Integer)_operator_plus_7));
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, "} /* Port ");
- String _name_1 = pi.getName();
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, _name_1);
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, " */");
- _xblockexpression = (_operator_plus_11);
+ int _plus_6 = (_interfaceItemLocalId + 1);
+ String _plus_7 = (_plus_5 + Integer.valueOf(_plus_6));
+ String _plus_8 = (_plus_7 + "} /* Port ");
+ String _name = pi.getName();
+ String _plus_9 = (_plus_8 + _name);
+ String _plus_10 = (_plus_9 + " */");
+ _xblockexpression = (_plus_10);
}
return _xblockexpression;
}
private String getInterfaceItemInstanceData(final InterfaceItemInstance pi) {
- ProtocolClass _protocol = pi.getProtocol();
- boolean _isConjugated = this.roomExt.isConjugated(pi);
- PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
- return "0";
- }
- ProtocolClass _protocol_1 = pi.getProtocol();
- boolean _isConjugated_1 = this.roomExt.isConjugated(pi);
- PortClass _portClass_1 = this.roomExt.getPortClass(_protocol_1, _isConjugated_1);
- EList<Attribute> _attributes = _portClass_1.getAttributes();
- boolean _isEmpty = _attributes.isEmpty();
- if (_isEmpty) {
- return "0";
- } else {
- String _path = pi.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- String _operator_plus = StringExtensions.operator_plus("&", _pathName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "_var");
- return _operator_plus_1;
- }
+ ProtocolClass _protocol = pi.getProtocol();
+ boolean _isConjugated = this.roomExt.isConjugated(pi);
+ PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
+ return "0";
+ }
+ ProtocolClass _protocol_1 = pi.getProtocol();
+ boolean _isConjugated_1 = this.roomExt.isConjugated(pi);
+ PortClass _portClass_1 = this.roomExt.getPortClass(_protocol_1, _isConjugated_1);
+ EList<Attribute> _attributes = _portClass_1.getAttributes();
+ boolean _isEmpty = _attributes.isEmpty();
+ if (_isEmpty) {
+ return "0";
+ } else {
+ String _path = pi.getPath();
+ String _pathName = this.roomExt.getPathName(_path);
+ String _plus = ("&" + _pathName);
+ return (_plus + "_var");
+ }
}
private String genRecvPortInitializer(final Root root, final ActorInstance ai, final InterfaceItemInstance pi) {
@@ -1255,86 +1216,83 @@ public class SubSystemClassGen {
return "{NULL}";
}
EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- InterfaceItemInstance _get = _peers_1.get(0);
- InterfaceItemInstance peer = _get;
+ InterfaceItemInstance peer = _peers_1.get(0);
EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
- InterfaceItemInstance _get_1 = _peers_2.get(0);
- EObject _eContainer = _get_1.eContainer();
+ InterfaceItemInstance _get = _peers_2.get(0);
+ EObject _eContainer = _get.eContainer();
ActorInstance peerInst = ((ActorInstance) _eContainer);
String _path = peerInst.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- String instName = _pathName;
- String _operator_plus = StringExtensions.operator_plus("{&", instName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, ".");
+ String instName = this.roomExt.getPathName(_path);
+ String _plus = ("{&" + instName);
+ String _plus_1 = (_plus + ".");
String _name = peer.getName();
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _name);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "}");
- _xblockexpression = (_operator_plus_3);
+ String _plus_2 = (_plus_1 + _name);
+ String _plus_3 = (_plus_2 + "}");
+ _xblockexpression = (_plus_3);
}
return _xblockexpression;
}
private String genReplSubPortInitializers(final Root root, final ActorInstance ai, final InterfaceItemInstance pi) {
- String result = "";
- EList<InterfaceItemInstance> _peers = pi.getPeers();
- for (final InterfaceItemInstance p : _peers) {
- {
- EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- int _indexOf = _peers_1.indexOf(p);
- int idx = _indexOf;
- String _xifexpression = null;
- EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
- int _size = _peers_2.size();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_size), ((Integer)1));
- boolean _operator_lessThan = ComparableExtensions.<Integer>operator_lessThan(((Integer)idx), ((Integer)_operator_minus));
- if (_operator_lessThan) {
- _xifexpression = ",";
- } else {
- _xifexpression = "";
- }
- String comma = _xifexpression;
- String _interfaceItemInstanceData = this.getInterfaceItemInstanceData(pi);
- String iiiD = _interfaceItemInstanceData;
- String _xifexpression_1 = null;
- boolean _equals = iiiD.equals("0");
- if (_equals) {
- String _operator_plus = StringExtensions.operator_plus(iiiD, ",");
- _xifexpression_1 = _operator_plus;
- } else {
- String _operator_plus_1 = StringExtensions.operator_plus(iiiD, "[");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ((Integer)idx));
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "],");
- _xifexpression_1 = _operator_plus_3;
- }
- iiiD = _xifexpression_1;
- String _operator_plus_4 = StringExtensions.operator_plus(result, "{");
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, iiiD);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "&msgService_Thread1, ");
- int _objId = p.getObjId();
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, ((Integer)_objId));
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, ", ");
- ExpandedActorClass _expandedActorClass = root.getExpandedActorClass(ai);
- InterfaceItem _interfaceItem = pi.getInterfaceItem();
- int _interfaceItemLocalId = _expandedActorClass.getInterfaceItemLocalId(_interfaceItem);
- int _operator_plus_9 = IntegerExtensions.operator_plus(((Integer)_interfaceItemLocalId), ((Integer)1));
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_8, ((Integer)_operator_plus_9));
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, ", ");
- String _operator_plus_12 = StringExtensions.operator_plus(_operator_plus_11, ((Integer)idx));
- String _operator_plus_13 = StringExtensions.operator_plus(_operator_plus_12, "}");
- String _operator_plus_14 = StringExtensions.operator_plus(_operator_plus_13, comma);
- String _operator_plus_15 = StringExtensions.operator_plus(_operator_plus_14, " /* Repl Sub Port ");
- String _name = pi.getName();
- String _operator_plus_16 = StringExtensions.operator_plus(_operator_plus_15, _name);
- String _operator_plus_17 = StringExtensions.operator_plus(_operator_plus_16, " idx +");
- String _operator_plus_18 = StringExtensions.operator_plus(_operator_plus_17, ((Integer)idx));
- String _operator_plus_19 = StringExtensions.operator_plus(_operator_plus_18, "*/\n");
- result = _operator_plus_19;
+ String result = "";
+ EList<InterfaceItemInstance> _peers = pi.getPeers();
+ for (final InterfaceItemInstance p : _peers) {
+ {
+ EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
+ int idx = _peers_1.indexOf(p);
+ String _xifexpression = null;
+ EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
+ int _size = _peers_2.size();
+ int _minus = (_size - 1);
+ boolean _lessThan = (idx < _minus);
+ if (_lessThan) {
+ _xifexpression = ",";
+ } else {
+ _xifexpression = "";
+ }
+ String comma = _xifexpression;
+ String iiiD = this.getInterfaceItemInstanceData(pi);
+ String _xifexpression_1 = null;
+ boolean _equals = iiiD.equals("0");
+ if (_equals) {
+ String _plus = (iiiD + ",");
+ _xifexpression_1 = _plus;
+ } else {
+ String _plus_1 = (iiiD + "[");
+ String _plus_2 = (_plus_1 + Integer.valueOf(idx));
+ String _plus_3 = (_plus_2 + "],");
+ _xifexpression_1 = _plus_3;
}
+ iiiD = _xifexpression_1;
+ String _plus_4 = (result +
+ "{");
+ String _plus_5 = (_plus_4 + iiiD);
+ String _plus_6 = (_plus_5 + "&msgService_Thread1, ");
+ int _objId = p.getObjId();
+ String _plus_7 = (_plus_6 + Integer.valueOf(_objId));
+ String _plus_8 = (_plus_7 + ", ");
+ ExpandedActorClass _expandedActorClass = root.getExpandedActorClass(ai);
+ InterfaceItem _interfaceItem = pi.getInterfaceItem();
+ int _interfaceItemLocalId = _expandedActorClass.getInterfaceItemLocalId(_interfaceItem);
+ int _plus_9 = (_interfaceItemLocalId + 1);
+ String _plus_10 = (_plus_8 + Integer.valueOf(_plus_9));
+ String _plus_11 = (_plus_10 + ", ");
+ String _plus_12 = (_plus_11 + Integer.valueOf(idx));
+ String _plus_13 = (_plus_12 + "}");
+ String _plus_14 = (_plus_13 + comma);
+ String _plus_15 = (_plus_14 + " /* Repl Sub Port ");
+ String _name = pi.getName();
+ String _plus_16 = (_plus_15 + _name);
+ String _plus_17 = (_plus_16 + " idx +");
+ String _plus_18 = (_plus_17 + Integer.valueOf(idx));
+ String _plus_19 = (_plus_18 + "*/\n");
+ result = _plus_19;
}
- return result;
+ }
+ return result;
}
- private StringConcatenation generateDispatcherFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateDispatcherFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -1388,8 +1346,8 @@ public class SubSystemClassGen {
public Boolean apply(final InterfaceItemInstance p) {
ProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = _protocol.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);
@@ -1405,8 +1363,8 @@ public class SubSystemClassGen {
int _objId = pi.getObjId();
EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
int _indexOf = _peers_1.indexOf(peer);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_objId), ((Integer)_indexOf));
- _builder.append(_operator_plus, " ");
+ int _plus = (_objId + _indexOf);
+ _builder.append(_plus, " ");
_builder.append(":");
_builder.newLineIfNotEmpty();
{
@@ -1669,25 +1627,25 @@ public class SubSystemClassGen {
return _builder;
}
- private StringConcatenation generateDatadrivenExecutes(final Root root, final SubSystemInstance ssi) {
+ private CharSequence generateDatadrivenExecutes(final Root root, final SubSystemInstance ssi) {
StringConcatenation _builder = new StringConcatenation();
{
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
for(final ActorInstance ai : _allContainedInstances) {
{
- boolean _operator_or = false;
+ boolean _or = false;
ActorClass _actorClass = ai.getActorClass();
ActorCommunicationType _commType = _actorClass.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- if (_operator_equals) {
- _operator_or = true;
+ boolean _equals = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
+ if (_equals) {
+ _or = true;
} else {
ActorClass _actorClass_1 = ai.getActorClass();
ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.DATA_DRIVEN);
- _operator_or = BooleanExtensions.operator_or(_operator_equals, _operator_equals_1);
+ boolean _equals_1 = Objects.equal(_commType_1, ActorCommunicationType.DATA_DRIVEN);
+ _or = (_equals || _equals_1);
}
- if (_operator_or) {
+ if (_or) {
ActorClass _actorClass_2 = ai.getActorClass();
String _name = _actorClass_2.getName();
_builder.append(_name, "");
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
index c2116359d..a1a5d02f7 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/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.c");
+ String _plus_1 = (_name + "_Runner.c");
SubSystemClass _subSystemClass_2 = sc.getSubSystemClass();
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, sc, _subSystemClass_2);
- this.fileAccess.generateFile(_operator_plus_1, _generateSourceFile);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, sc, _subSystemClass_2);
+ this.fileAccess.generateFile(_plus_1, _generateSourceFile);
}
}
}
- public StringConcatenation generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ public CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
index b24f40370..e0b8574bc 100644
--- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
@@ -12,8 +12,9 @@ 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.xtext.generator;bundle-version="2.1.1"
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
+ org.eclipse.xtext.generator;bundle-version="2.1.1",
+ com.google.inject;bundle-version="3.0.0"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.generator.doc;uses:="org.eclipse.etrice.generator.base",
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
index 4ba396681..ce99ce171 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
@@ -1,5 +1,6 @@
package org.eclipse.etrice.generator.doc.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.File;
@@ -29,16 +30,12 @@ import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.base.IRoomGenerator;
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.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
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 DocGen implements IRoomGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -53,24 +50,22 @@ public class DocGen implements IRoomGenerator {
EList<RoomModel> _models = root.getModels();
for (final RoomModel model : _models) {
{
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String path = _docGenerationTargetPath;
+ String path = this.roomExt.getDocGenerationTargetPath(model);
String _name = model.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".tex");
- String file = _operator_plus;
- String _operator_plus_1 = StringExtensions.operator_plus("generating LaTeX documentation: \'", 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 = (_name + ".tex");
+ String _plus = ("generating LaTeX documentation: \'" + 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 _generateModelDoc = this.generateModelDoc(root, model);
+ CharSequence _generateModelDoc = this.generateModelDoc(root, model);
this.fileAccess.generateFile(file, _generateModelDoc);
}
}
}
- public StringConcatenation generateModelDoc(final Root root, final RoomModel model) {
+ public CharSequence generateModelDoc(final Root root, final RoomModel model) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\documentclass[titlepage]{article}");
_builder.newLine();
@@ -240,27 +235,27 @@ public class DocGen implements IRoomGenerator {
_builder.append("\\section{Model Description}");
_builder.newLine();
Documentation _docu = model.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\section{Subsystem Description}");
_builder.newLine();
- StringConcatenation _generateAllSubSysClassDocs = this.generateAllSubSysClassDocs(root, model);
+ CharSequence _generateAllSubSysClassDocs = this.generateAllSubSysClassDocs(root, model);
_builder.append(_generateAllSubSysClassDocs, "");
_builder.newLineIfNotEmpty();
_builder.append("\\section{Protocol Class Description}");
_builder.newLine();
- StringConcatenation _generateAllProtocolClassDocs = this.generateAllProtocolClassDocs(root, model);
+ CharSequence _generateAllProtocolClassDocs = this.generateAllProtocolClassDocs(root, model);
_builder.append(_generateAllProtocolClassDocs, "");
_builder.newLineIfNotEmpty();
_builder.append("\\section{Data Class Description}");
_builder.newLine();
- StringConcatenation _generateAllDataClassDocs = this.generateAllDataClassDocs(root, model);
+ CharSequence _generateAllDataClassDocs = this.generateAllDataClassDocs(root, model);
_builder.append(_generateAllDataClassDocs, "");
_builder.newLineIfNotEmpty();
_builder.append("\\section{Actor Class Description}");
_builder.newLine();
- StringConcatenation _generateAllActorClassDocs = this.generateAllActorClassDocs(root, model);
+ CharSequence _generateAllActorClassDocs = this.generateAllActorClassDocs(root, model);
_builder.append(_generateAllActorClassDocs, "");
_builder.newLineIfNotEmpty();
_builder.append("\\end{document}");
@@ -268,12 +263,12 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateAllSubSysClassDocs(final Root root, final RoomModel model) {
+ public CharSequence generateAllSubSysClassDocs(final Root root, final RoomModel model) {
StringConcatenation _builder = new StringConcatenation();
{
EList<SubSystemClass> _subSystemClasses = model.getSubSystemClasses();
for(final SubSystemClass ssc : _subSystemClasses) {
- StringConcatenation _generateSubSysClassDoc = this.generateSubSysClassDoc(root, model, ssc);
+ CharSequence _generateSubSysClassDoc = this.generateSubSysClassDoc(root, model, ssc);
_builder.append(_generateSubSysClassDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -281,29 +276,25 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateSubSysClassDoc(final Root root, final RoomModel model, final SubSystemClass ssc) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generateSubSysClassDoc(final Root root, final RoomModel model, final SubSystemClass ssc) {
+ CharSequence _xblockexpression = null;
{
String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
+ String _plus = (_docGenerationTargetPath + "images\\");
String _name = ssc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_structure.jpg");
- String filename = _operator_plus_2;
+ String _plus_1 = (_plus + _name);
+ String filename = (_plus_1 + "_structure.jpg");
String _replaceAll = filename.replaceAll("\\\\", "/");
filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
+ String latexFilename = filename.replaceAll("/", "//");
String _docGenerationTargetPath_1 = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus_3 = StringExtensions.operator_plus(_docGenerationTargetPath_1, "images\\");
+ String _plus_2 = (_docGenerationTargetPath_1 + "images\\");
String _name_1 = ssc.getName();
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, _name_1);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "_instanceTree.jpg");
- String filenamei = _operator_plus_5;
- String _replaceAll_2 = filenamei.replaceAll("\\\\", "/");
- filenamei = _replaceAll_2;
- String _replaceAll_3 = filenamei.replaceAll("/", "//");
- String latexFilenamei = _replaceAll_3;
+ String _plus_3 = (_plus_2 + _name_1);
+ String filenamei = (_plus_3 + "_instanceTree.jpg");
+ String _replaceAll_1 = filenamei.replaceAll("\\\\", "/");
+ filenamei = _replaceAll_1;
+ String latexFilenamei = filenamei.replaceAll("/", "//");
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\level{2}{");
String _name_2 = ssc.getName();
@@ -311,7 +302,7 @@ public class DocGen implements IRoomGenerator {
_builder.append("}");
_builder.newLineIfNotEmpty();
Documentation _docu = ssc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\level{3}{Structure}");
@@ -321,8 +312,8 @@ public class DocGen implements IRoomGenerator {
boolean _equals = _fileExists.equals("true");
if (_equals) {
String _name_3 = ssc.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(_name_3, " Structure");
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_6);
+ String _plus_4 = (_name_3 + " Structure");
+ CharSequence _includeGraphics = this.includeGraphics(latexFilename, "0.4", _plus_4);
_builder.append(_includeGraphics, "");
_builder.newLineIfNotEmpty();
}
@@ -334,8 +325,8 @@ public class DocGen implements IRoomGenerator {
boolean _equals_1 = _fileExists_1.equals("true");
if (_equals_1) {
String _name_4 = ssc.getName();
- String _operator_plus_7 = StringExtensions.operator_plus(_name_4, " Instance Tree");
- StringConcatenation _includeGraphics_1 = this.includeGraphics(latexFilenamei, "0.5", _operator_plus_7);
+ String _plus_5 = (_name_4 + " Instance Tree");
+ CharSequence _includeGraphics_1 = this.includeGraphics(latexFilenamei, "0.5", _plus_5);
_builder.append(_includeGraphics_1, "");
_builder.newLineIfNotEmpty();
}
@@ -345,12 +336,12 @@ public class DocGen implements IRoomGenerator {
return _xblockexpression;
}
- public StringConcatenation generateAllDataClassDocs(final Root root, final RoomModel model) {
+ public CharSequence generateAllDataClassDocs(final Root root, final RoomModel model) {
StringConcatenation _builder = new StringConcatenation();
{
EList<DataClass> _dataClasses = model.getDataClasses();
for(final DataClass dc : _dataClasses) {
- StringConcatenation _generateDataClassDoc = this.generateDataClassDoc(root, dc);
+ CharSequence _generateDataClassDoc = this.generateDataClassDoc(root, dc);
_builder.append(_generateDataClassDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -358,7 +349,7 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateDataClassDoc(final Root root, final DataClass dc) {
+ public CharSequence generateDataClassDoc(final Root root, final DataClass dc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\level{2} {");
String _name = dc.getName();
@@ -366,31 +357,31 @@ public class DocGen implements IRoomGenerator {
_builder.append("}");
_builder.newLineIfNotEmpty();
Documentation _docu = dc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\level{3}{Attributes}");
_builder.newLine();
EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _generateAttributesDoc = this.generateAttributesDoc(_attributes);
+ CharSequence _generateAttributesDoc = this.generateAttributesDoc(_attributes);
_builder.append(_generateAttributesDoc, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\\level{3}{Operations}");
_builder.newLine();
EList<StandardOperation> _operations = dc.getOperations();
- StringConcatenation _generateOperationsDoc = this.generateOperationsDoc(_operations);
+ CharSequence _generateOperationsDoc = this.generateOperationsDoc(_operations);
_builder.append(_generateOperationsDoc, "");
_builder.newLineIfNotEmpty();
return _builder;
}
- public StringConcatenation generateAllProtocolClassDocs(final Root root, final RoomModel model) {
+ public CharSequence generateAllProtocolClassDocs(final Root root, final RoomModel model) {
StringConcatenation _builder = new StringConcatenation();
{
EList<GeneralProtocolClass> _protocolClasses = model.getProtocolClasses();
for(final GeneralProtocolClass pc : _protocolClasses) {
- StringConcatenation _generateProtocolClassDoc = this.generateProtocolClassDoc(root, pc);
+ CharSequence _generateProtocolClassDoc = this.generateProtocolClassDoc(root, pc);
_builder.append(_generateProtocolClassDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -398,7 +389,7 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- protected StringConcatenation _generateProtocolClassDoc(final Root root, final ProtocolClass pc) {
+ protected CharSequence _generateProtocolClassDoc(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("\t");
_builder.append("\\level{2} {");
@@ -408,7 +399,7 @@ public class DocGen implements IRoomGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t");
Documentation _docu = pc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -436,8 +427,8 @@ public class DocGen implements IRoomGenerator {
_builder.append(" & ");
{
VarDecl _data = ims.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 = ims.getData();
String _name_2 = _data_1.getName();
@@ -447,7 +438,7 @@ public class DocGen implements IRoomGenerator {
}
_builder.append(" & ");
Documentation _docu_1 = ims.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_1);
+ CharSequence _generateDocText_1 = this.generateDocText(_docu_1);
_builder.append(_generateDocText_1, " ");
_builder.append("\\\\");
_builder.newLineIfNotEmpty();
@@ -485,8 +476,8 @@ public class DocGen implements IRoomGenerator {
_builder.append(" & ");
{
VarDecl _data_2 = oms.getData();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_data_2, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_data_2, null));
+ if (_notEquals_1) {
_builder.append(" ");
VarDecl _data_3 = oms.getData();
String _name_4 = _data_3.getName();
@@ -496,7 +487,7 @@ public class DocGen implements IRoomGenerator {
}
_builder.append(" & ");
Documentation _docu_2 = oms.getDocu();
- StringConcatenation _generateDocText_2 = this.generateDocText(_docu_2);
+ CharSequence _generateDocText_2 = this.generateDocText(_docu_2);
_builder.append(_generateDocText_2, " ");
_builder.append("\\\\");
_builder.newLineIfNotEmpty();
@@ -511,7 +502,7 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- protected StringConcatenation _generateProtocolClassDoc(final Root root, final CompoundProtocolClass pc) {
+ protected CharSequence _generateProtocolClassDoc(final Root root, final CompoundProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\level{2} {");
String _name = pc.getName();
@@ -519,7 +510,7 @@ public class DocGen implements IRoomGenerator {
_builder.append("}");
_builder.newLineIfNotEmpty();
Documentation _docu = pc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\level{3}{Sub Protocols}");
@@ -553,12 +544,12 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateAllActorClassDocs(final Root root, final RoomModel model) {
+ public CharSequence generateAllActorClassDocs(final Root root, final RoomModel model) {
StringConcatenation _builder = new StringConcatenation();
{
EList<ActorClass> _actorClasses = model.getActorClasses();
for(final ActorClass ac : _actorClasses) {
- StringConcatenation _generateActorClassDoc = this.generateActorClassDoc(root, model, ac);
+ CharSequence _generateActorClassDoc = this.generateActorClassDoc(root, model, ac);
_builder.append(_generateActorClassDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -566,19 +557,17 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateActorClassDoc(final Root root, final RoomModel model, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generateActorClassDoc(final Root root, final RoomModel model, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
+ String _plus = (_docGenerationTargetPath + "images\\");
String _name = ac.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_structure.jpg");
- String filename = _operator_plus_2;
+ String _plus_1 = (_plus + _name);
+ String filename = (_plus_1 + "_structure.jpg");
String _replaceAll = filename.replaceAll("\\\\", "/");
filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
+ String latexFilename = filename.replaceAll("/", "//");
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\level{2}{");
String _name_1 = ac.getName();
@@ -586,7 +575,7 @@ public class DocGen implements IRoomGenerator {
_builder.append("}");
_builder.newLineIfNotEmpty();
Documentation _docu = ac.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\level{3}{Structure}");
@@ -597,8 +586,8 @@ public class DocGen implements IRoomGenerator {
boolean _equals = _fileExists.equals("true");
if (_equals) {
String _name_2 = ac.getName();
- String _operator_plus_3 = StringExtensions.operator_plus(_name_2, " Structure");
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_3);
+ String _plus_2 = (_name_2 + " Structure");
+ CharSequence _includeGraphics = this.includeGraphics(latexFilename, "0.4", _plus_2);
_builder.append(_includeGraphics, "");
_builder.newLineIfNotEmpty();
}
@@ -607,14 +596,14 @@ public class DocGen implements IRoomGenerator {
_builder.append("\\level{3}{Attributes}");
_builder.newLine();
EList<Attribute> _attributes = ac.getAttributes();
- StringConcatenation _generateAttributesDoc = this.generateAttributesDoc(_attributes);
+ CharSequence _generateAttributesDoc = this.generateAttributesDoc(_attributes);
_builder.append(_generateAttributesDoc, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\\level{3}{Operations}");
_builder.newLine();
EList<StandardOperation> _operations = ac.getOperations();
- StringConcatenation _generateOperationsDoc = this.generateOperationsDoc(_operations);
+ CharSequence _generateOperationsDoc = this.generateOperationsDoc(_operations);
_builder.append(_generateOperationsDoc, "");
_builder.newLineIfNotEmpty();
{
@@ -622,7 +611,7 @@ public class DocGen implements IRoomGenerator {
if (_hasNonEmptyStateMachine) {
_builder.append("\\level{3}{Statemachine}");
_builder.newLine();
- StringConcatenation _generateFsmDoc = this.generateFsmDoc(model, ac);
+ CharSequence _generateFsmDoc = this.generateFsmDoc(model, ac);
_builder.append(_generateFsmDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -632,19 +621,17 @@ public class DocGen implements IRoomGenerator {
return _xblockexpression;
}
- public StringConcatenation generateFsmDoc(final RoomModel model, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generateFsmDoc(final RoomModel model, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
+ String _plus = (_docGenerationTargetPath + "images\\");
String _name = ac.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_behavior.jpg");
- String filename = _operator_plus_2;
+ String _plus_1 = (_plus + _name);
+ String filename = (_plus_1 + "_behavior.jpg");
String _replaceAll = filename.replaceAll("\\\\", "/");
filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
+ String latexFilename = filename.replaceAll("/", "//");
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\level{4}{Top Level}");
_builder.newLine();
@@ -653,8 +640,8 @@ public class DocGen implements IRoomGenerator {
boolean _equals = _fileExists.equals("true");
if (_equals) {
String _name_1 = ac.getName();
- String _operator_plus_3 = StringExtensions.operator_plus(_name_1, " Top State");
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_3);
+ String _plus_2 = (_name_1 + " Top State");
+ CharSequence _includeGraphics = this.includeGraphics(latexFilename, "0.4", _plus_2);
_builder.append(_includeGraphics, "");
_builder.newLineIfNotEmpty();
}
@@ -668,18 +655,18 @@ public class DocGen implements IRoomGenerator {
for(final State s : _states) {
{
Documentation _docu = s.getDocu();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_docu, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_docu, null));
+ if (_notEquals) {
_builder.append("\\textbf{State description} \\textit{");
String _statePathName = this.roomExt.getStatePathName(s);
- String _replaceAll_2 = _statePathName.replaceAll("_", "\\\\_");
- _builder.append(_replaceAll_2, "");
+ String _replaceAll_1 = _statePathName.replaceAll("_", "\\\\_");
+ _builder.append(_replaceAll_1, "");
_builder.append("}:");
_builder.newLineIfNotEmpty();
_builder.append("\\newline");
_builder.newLine();
Documentation _docu_1 = s.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu_1);
+ CharSequence _generateDocText = this.generateDocText(_docu_1);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\newline\\newline");
@@ -695,8 +682,8 @@ public class DocGen implements IRoomGenerator {
for(final ChoicePoint c : _chPoints) {
{
Documentation _docu_2 = c.getDocu();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_docu_2, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_docu_2, null));
+ if (_notEquals_1) {
_builder.append("\\textbf{Choicepoint description} \\textit{");
String _name_2 = c.getName();
_builder.append(_name_2, "");
@@ -705,7 +692,7 @@ public class DocGen implements IRoomGenerator {
_builder.append("\\newline");
_builder.newLine();
Documentation _docu_3 = c.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_3);
+ CharSequence _generateDocText_1 = this.generateDocText(_docu_3);
_builder.append(_generateDocText_1, "");
_builder.newLineIfNotEmpty();
_builder.append("\\newline\\newline");
@@ -723,9 +710,9 @@ public class DocGen implements IRoomGenerator {
for(final State s_1 : _states_1) {
{
boolean _isLeaf = this.roomExt.isLeaf(s_1);
- boolean _operator_not = BooleanExtensions.operator_not(_isLeaf);
- if (_operator_not) {
- StringConcatenation _generateStateDoc = this.generateStateDoc(model, ac, s_1);
+ boolean _not = (!_isLeaf);
+ if (_not) {
+ CharSequence _generateStateDoc = this.generateStateDoc(model, ac, s_1);
_builder.append(_generateStateDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -737,29 +724,27 @@ public class DocGen implements IRoomGenerator {
return _xblockexpression;
}
- public StringConcatenation generateStateDoc(final RoomModel model, final ActorClass ac, final State state) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generateStateDoc(final RoomModel model, final ActorClass ac, final State state) {
+ CharSequence _xblockexpression = null;
{
String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
+ String _plus = (_docGenerationTargetPath + "images\\");
String _name = ac.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_");
+ String _plus_1 = (_plus + _name);
+ String _plus_2 = (_plus_1 + "_");
String _statePathName = this.roomExt.getStatePathName(state);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, _statePathName);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "_behavior.jpg");
- String filename = _operator_plus_4;
+ String _plus_3 = (_plus_2 + _statePathName);
+ String filename = (_plus_3 + "_behavior.jpg");
String _replaceAll = filename.replaceAll("\\\\", "/");
filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
- String _operator_plus_5 = StringExtensions.operator_plus("Gen Filename: ", filename);
- this.logger.logInfo(_operator_plus_5);
+ String latexFilename = filename.replaceAll("/", "//");
+ String _plus_4 = ("Gen Filename: " + filename);
+ this.logger.logInfo(_plus_4);
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\level{4}{Subgraph ");
String _statePathName_1 = this.roomExt.getStatePathName(state);
- String _replaceAll_2 = _statePathName_1.replaceAll("_", "\\\\_");
- _builder.append(_replaceAll_2, "");
+ String _replaceAll_1 = _statePathName_1.replaceAll("_", "\\\\_");
+ _builder.append(_replaceAll_1, "");
_builder.append("}");
_builder.newLineIfNotEmpty();
{
@@ -767,10 +752,10 @@ public class DocGen implements IRoomGenerator {
boolean _equals = _fileExists.equals("true");
if (_equals) {
String _name_1 = ac.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(_name_1, "_");
+ String _plus_5 = (_name_1 + "_");
String _statePathName_2 = this.roomExt.getStatePathName(state);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, _statePathName_2);
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_7);
+ String _plus_6 = (_plus_5 + _statePathName_2);
+ CharSequence _includeGraphics = this.includeGraphics(latexFilename, "0.4", _plus_6);
_builder.append(_includeGraphics, "");
_builder.newLineIfNotEmpty();
}
@@ -784,18 +769,18 @@ public class DocGen implements IRoomGenerator {
for(final State s : _states) {
{
Documentation _docu = s.getDocu();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_docu, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_docu, null));
+ if (_notEquals) {
_builder.append("\\textbf{State description} \\textit{");
String _statePathName_3 = this.roomExt.getStatePathName(s);
- String _replaceAll_3 = _statePathName_3.replaceAll("_", "\\\\_");
- _builder.append(_replaceAll_3, "");
+ String _replaceAll_2 = _statePathName_3.replaceAll("_", "\\\\_");
+ _builder.append(_replaceAll_2, "");
_builder.append("}:");
_builder.newLineIfNotEmpty();
_builder.append("\\newline");
_builder.newLine();
Documentation _docu_1 = s.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu_1);
+ CharSequence _generateDocText = this.generateDocText(_docu_1);
_builder.append(_generateDocText, "");
_builder.newLineIfNotEmpty();
_builder.append("\\newline\\newline");
@@ -811,8 +796,8 @@ public class DocGen implements IRoomGenerator {
for(final ChoicePoint c : _chPoints) {
{
Documentation _docu_2 = c.getDocu();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_docu_2, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_docu_2, null));
+ if (_notEquals_1) {
_builder.append("\\textbf{Choicepoint description} \\textit{");
String _name_2 = c.getName();
_builder.append(_name_2, "");
@@ -821,7 +806,7 @@ public class DocGen implements IRoomGenerator {
_builder.append("\\newline");
_builder.newLine();
Documentation _docu_3 = c.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_3);
+ CharSequence _generateDocText_1 = this.generateDocText(_docu_3);
_builder.append(_generateDocText_1, "");
_builder.newLineIfNotEmpty();
_builder.append("\\newline\\newline");
@@ -840,9 +825,9 @@ public class DocGen implements IRoomGenerator {
for(final State s_1 : _states_1) {
{
boolean _isLeaf = this.roomExt.isLeaf(s_1);
- boolean _operator_not = BooleanExtensions.operator_not(_isLeaf);
- if (_operator_not) {
- StringConcatenation _generateStateDoc = this.generateStateDoc(model, ac, s_1);
+ boolean _not = (!_isLeaf);
+ if (_not) {
+ CharSequence _generateStateDoc = this.generateStateDoc(model, ac, s_1);
_builder.append(_generateStateDoc, "");
_builder.newLineIfNotEmpty();
}
@@ -854,12 +839,12 @@ public class DocGen implements IRoomGenerator {
return _xblockexpression;
}
- public StringConcatenation generateAttributesDoc(final List<Attribute> attributes) {
+ public CharSequence generateAttributesDoc(final List<Attribute> attributes) {
StringConcatenation _builder = new StringConcatenation();
{
boolean _isEmpty = attributes.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("\\begin{tabular}[ht]{|l|l|l|}");
_builder.newLine();
_builder.append("\\hline");
@@ -879,7 +864,7 @@ public class DocGen implements IRoomGenerator {
_builder.append(_name_1, "");
_builder.append(" & ");
Documentation _docu = at.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
+ CharSequence _generateDocText = this.generateDocText(_docu);
_builder.append(_generateDocText, "");
_builder.append("\\\\");
_builder.newLineIfNotEmpty();
@@ -894,7 +879,7 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateOperationsDoc(final List<StandardOperation> operations) {
+ public CharSequence generateOperationsDoc(final List<StandardOperation> operations) {
StringConcatenation _builder = new StringConcatenation();
{
for(final StandardOperation op : operations) {
@@ -915,8 +900,8 @@ public class DocGen implements IRoomGenerator {
_builder.append("ReturnType: & ");
{
RefableType _returntype = op.getReturntype();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_returntype, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_returntype, null));
+ if (_notEquals) {
RefableType _returntype_1 = op.getReturntype();
DataType _type = _returntype_1.getType();
String _name_1 = _type.getName();
@@ -934,10 +919,10 @@ public class DocGen implements IRoomGenerator {
_builder.append("Arguments: & ");
{
EList<VarDecl> _arguments = op.getArguments();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final VarDecl pa : _arguments) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", " ");
}
@@ -954,8 +939,8 @@ public class DocGen implements IRoomGenerator {
_builder.newLineIfNotEmpty();
{
Documentation _docu = op.getDocu();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_docu, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_docu, null));
+ if (_notEquals_1) {
_builder.append("\t");
_builder.append("\\hline");
_builder.newLine();
@@ -963,12 +948,12 @@ public class DocGen implements IRoomGenerator {
Documentation _docu_1 = op.getDocu();
String _string = _docu_1.toString();
int _length = _string.length();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_length), ((Integer)85));
- if (_operator_greaterThan) {
+ boolean _greaterThan = (_length > 85);
+ if (_greaterThan) {
_builder.append("\t");
_builder.append("\\multicolumn{2} {|p{13cm}|} {");
Documentation _docu_2 = op.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu_2);
+ CharSequence _generateDocText = this.generateDocText(_docu_2);
_builder.append(_generateDocText, " ");
_builder.append("}\\\\");
_builder.newLineIfNotEmpty();
@@ -976,7 +961,7 @@ public class DocGen implements IRoomGenerator {
_builder.append("\t");
_builder.append("\\multicolumn{2} {|l|} {");
Documentation _docu_3 = op.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_3);
+ CharSequence _generateDocText_1 = this.generateDocText(_docu_3);
_builder.append(_generateDocText_1, " ");
_builder.append("}\\\\");
_builder.newLineIfNotEmpty();
@@ -996,11 +981,11 @@ public class DocGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generateDocText(final Documentation doc) {
+ public CharSequence generateDocText(final Documentation doc) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(doc, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(doc, null));
+ if (_notEquals) {
EList<String> _text = doc.getText();
String _join = IterableExtensions.join(_text);
_builder.append(_join, "");
@@ -1011,31 +996,25 @@ public class DocGen implements IRoomGenerator {
}
public String fileExists(final String f) {
- File _file = new File(f);
- final File file = _file;
- boolean _exists = file.exists();
- final boolean exist = _exists;
- boolean _operator_equals = ObjectExtensions.operator_equals(((Boolean)exist), ((Boolean)true));
- if (_operator_equals) {
- {
- String _operator_plus = StringExtensions.operator_plus("File found ! ", f);
- this.logger.logInfo(_operator_plus);
- return "true";
- }
- } else {
- {
- String _operator_plus_1 = StringExtensions.operator_plus("File not found ! ", f);
- this.logger.logInfo(_operator_plus_1);
- return "false";
- }
- }
+ File _file = new File(f);
+ final File file = _file;
+ final boolean exist = file.exists();
+ boolean _equals = (exist == true);
+ if (_equals) {
+ String _plus = ("File found ! " + f);
+ this.logger.logInfo(_plus);
+ return "true";
+ } else {
+ String _plus_1 = ("File not found ! " + f);
+ this.logger.logInfo(_plus_1);
+ return "false";
+ }
}
- public StringConcatenation includeGraphics(final String filename, final String scale, final String caption) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence includeGraphics(final String filename, final String scale, final String caption) {
+ CharSequence _xblockexpression = null;
{
- String _replaceAll = caption.replaceAll("_", "\\\\_");
- String latexCaption = _replaceAll;
+ String latexCaption = caption.replaceAll("_", "\\\\_");
StringConcatenation _builder = new StringConcatenation();
_builder.append("\\begin{center}");
_builder.newLine();
@@ -1058,11 +1037,10 @@ public class DocGen implements IRoomGenerator {
public String irgendwas(final Root root, final ActorClass ac) {
String _name = ac.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".bla");
- return _operator_plus;
+ return (_name + ".bla");
}
- public StringConcatenation generateProtocolClassDoc(final Root root, final GeneralProtocolClass pc) {
+ public CharSequence generateProtocolClassDoc(final Root root, final GeneralProtocolClass pc) {
if (pc instanceof CompoundProtocolClass) {
return _generateProtocolClassDoc(root, (CompoundProtocolClass)pc);
} else if (pc instanceof ProtocolClass) {
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
index deb19cedc..fd37ab880 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
@@ -14,12 +14,12 @@ import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.generator.base.IRoomGenerator;
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;
+import org.eclipse.xtext.xbase.lib.Exceptions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class InstanceDiagramGen implements IRoomGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -35,34 +35,32 @@ public class InstanceDiagramGen implements IRoomGenerator {
for (final RoomModel model : _models) {
{
String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "/images");
- String path = _operator_plus;
+ String path = (_docGenerationTargetPath + "/images");
this.fileAccess.setOutputPath(path);
String file2 = "dot2jpg.bat";
EList<SubSystemInstance> _subSystemInstances = root.getSubSystemInstances();
for (final SubSystemInstance sc : _subSystemInstances) {
{
String _name = sc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_name, "_instanceTree.dot");
- String file = _operator_plus_1;
- String _operator_plus_2 = StringExtensions.operator_plus("generating LaTeX documentation: \'", file);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "\' in \'");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, path);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "\'");
- this.logger.logInfo(_operator_plus_5);
+ String file = (_name + "_instanceTree.dot");
+ String _plus = ("generating LaTeX documentation: \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
SubSystemClass _subSystemClass = sc.getSubSystemClass();
- StringConcatenation _generate = this.generate(root, sc, _subSystemClass);
+ CharSequence _generate = this.generate(root, sc, _subSystemClass);
this.fileAccess.generateFile(file, _generate);
}
}
- StringConcatenation _generate2jpg = this.generate2jpg(root);
+ CharSequence _generate2jpg = this.generate2jpg(root);
this.fileAccess.generateFile(file2, _generate2jpg);
this.runDot2Jpg();
}
}
}
- public StringConcatenation generate2jpg(final Root root) {
+ public CharSequence generate2jpg(final Root root) {
StringConcatenation _builder = new StringConcatenation();
{
EList<SubSystemInstance> _subSystemInstances = root.getSubSystemInstances();
@@ -80,7 +78,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation generate(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ public CharSequence generate(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("digraph ");
String _name = ssi.getName();
@@ -109,7 +107,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
EList<ActorInstance> _instances = ssi.getInstances();
for(final ActorInstance ai : _instances) {
_builder.append("\t");
- StringConcatenation _instance = this.instance(ai);
+ CharSequence _instance = this.instance(ai);
_builder.append(_instance, " ");
_builder.newLineIfNotEmpty();
}
@@ -119,7 +117,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
return _builder;
}
- public StringConcatenation instance(final ActorInstance ai) {
+ public CharSequence instance(final ActorInstance ai) {
StringConcatenation _builder = new StringConcatenation();
EObject _eContainer = ai.eContainer();
StructureInstance parent = ((StructureInstance) _eContainer);
@@ -148,7 +146,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
{
EList<ActorInstance> _instances = ai.getInstances();
for(final ActorInstance sub_ai : _instances) {
- StringConcatenation _instance = this.instance(sub_ai);
+ CharSequence _instance = this.instance(sub_ai);
_builder.append(_instance, "");
_builder.newLineIfNotEmpty();
}
@@ -162,8 +160,13 @@ public class InstanceDiagramGen implements IRoomGenerator {
Runtime _runtime = Runtime.getRuntime();
Process _exec = _runtime.exec("dot2jpg.bat");
_xtrycatchfinallyexpression = _exec;
- } catch (final Exception e) {
- e.printStackTrace();
+ } catch (final Throwable _t) {
+ if (_t instanceof Exception) {
+ final Exception e = (Exception)_t;
+ e.printStackTrace();
+ } else {
+ throw Exceptions.sneakyThrow(_t);
+ }
}
return _xtrycatchfinallyexpression;
}
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
index 9ea2869c4..28eaa6ec8 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
@@ -12,8 +12,8 @@ import org.eclipse.etrice.generator.generic.PrepareFileSystem;
import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class MainGen implements IGenerator {
@Inject
private InstanceDiagramGen instanceDiagramGen;
@@ -25,17 +25,17 @@ public class MainGen implements IGenerator {
private DocGen docGen;
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.instanceDiagramGen.doGenerate(e);
- this.docGen.doGenerate(e);
+ this.instanceDiagramGen.doGenerate(e);
+ this.docGen.doGenerate(e);
}
}
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();
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index e71a6478c..7b0bd006b 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.xtext.generator;bundle-version="2.1.1",
org.eclipse.xtext;bundle-version="2.1.1",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
org.eclipse.etrice.core.config;bundle-version="0.2.0"
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.etrice.generator.generic
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java
index 1eecf2d2f..5504f864e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/GeneratorBaseModule.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.etrice.core.genmodel.base.ILogger;
import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.xtext.parser.IEncodingProvider;
import com.google.inject.Binder;
import com.google.inject.Module;
@@ -40,6 +41,8 @@ public class GeneratorBaseModule implements Module {
binder.bind(Diagnostician.class).in(Singleton.class);
binder.bind(IDiagnostician.class).to(Diagnostician.class);
+
+ binder.bind(IEncodingProvider.class).to(IEncodingProvider.Runtime.class);
}
}
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
index 94d6f1c0d..3bf8b31cb 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
@@ -94,7 +94,6 @@ class GenericStateMachineGenerator {
var dct = new DetailCodeTranslator(ac, translator)
var async = ac.commType==ActorCommunicationType::ASYNCHRONOUS
var eventDriven = ac.commType==ActorCommunicationType::EVENT_DRIVEN
- var dataDriven = ac.commType==ActorCommunicationType::DATA_DRIVEN
var handleEvents = async || eventDriven
'''
@@ -269,7 +268,6 @@ class GenericStateMachineGenerator {
var async = xpac.actorClass.commType==ActorCommunicationType::ASYNCHRONOUS
var eventDriven = xpac.actorClass.commType==ActorCommunicationType::EVENT_DRIVEN
var dataDriven = xpac.actorClass.commType==ActorCommunicationType::DATA_DRIVEN
- var handleEvents = async || eventDriven
'''
switch («langExt.memberAccess»state) {
«FOR state : xpac.stateMachine.getLeafStateList()»
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
index b418c90bc..feed46412 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
@@ -225,11 +225,11 @@ class RoomExtensions {
p.name + (if (conj) "Conj" else "") + (if (repl) "Repl" else "") +"Port"
}
- def String getPortClassName(ExternalPort p){
+ def dispatch String getPortClassName(ExternalPort p){
return p.ifport.getPortClassName()
}
- def String getPortClassName(ServiceImplementation svc) {
+ def dispatch String getPortClassName(ServiceImplementation svc) {
return svc.spp.protocol.getPortClassName(false, true)
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java
index ee1fc5835..e930c7ba2 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java
@@ -1,5 +1,6 @@
package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.ArrayList;
@@ -30,73 +31,56 @@ import org.eclipse.etrice.core.room.ProtocolClass;
import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.generator.base.ConfigHelper;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
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 ConfigExtension {
@Inject
private ILanguageExtension languageExt;
public String getInitValue(final Attribute a) {
- String _configDefaultValue = this.getConfigDefaultValue(a);
- String value = _configDefaultValue;
- boolean _operator_equals = ObjectExtensions.operator_equals(value, null);
- if (_operator_equals) {
- String _defaultValueLiteral = a.getDefaultValueLiteral();
- value = _defaultValueLiteral;
- }
- return value;
+ String value = this.getConfigDefaultValue(a);
+ boolean _equals = Objects.equal(value, null);
+ if (_equals) {
+ String _defaultValueLiteral = a.getDefaultValueLiteral();
+ value = _defaultValueLiteral;
+ }
+ return value;
}
public String getConfigDefaultValue(final Attribute attr) {
- String _xifexpression = null;
EObject _eContainer = attr.eContainer();
if ((_eContainer instanceof ActorClass)) {
- {
- EObject _eContainer_1 = attr.eContainer();
- ActorClass ac = ((ActorClass) _eContainer_1);
- ActorClassConfig _classConfig = this.getClassConfig(ac);
- EList<AttrClassConfig> _attributes = _classConfig==null?(EList<AttrClassConfig>)null:_classConfig.getAttributes();
- String _configValue = _attributes==null?(String)null:this.getConfigValue(_attributes, attr);
- return _configValue;
- }
+ EObject _eContainer_1 = attr.eContainer();
+ ActorClass ac = ((ActorClass) _eContainer_1);
+ ActorClassConfig _classConfig = this.getClassConfig(ac);
+ EList<AttrClassConfig> _attributes = _classConfig==null?(EList<AttrClassConfig>)null:_classConfig.getAttributes();
+ return _attributes==null?(String)null:this.getConfigValue(_attributes, attr);
} else {
- String _xifexpression_1 = null;
EObject _eContainer_2 = attr.eContainer();
if ((_eContainer_2 instanceof PortClass)) {
- {
- EObject _eContainer_3 = attr.eContainer();
- PortClass pc = ((PortClass) _eContainer_3);
- EObject _eContainer_4 = pc.eContainer();
- ProtocolClass protocol = ((ProtocolClass) _eContainer_4);
- ProtocolClassConfig _protocolConfig = this.getProtocolConfig(((ProtocolClass) protocol));
- ProtocolClassConfig prcConfig = _protocolConfig;
- PortClass _regular = protocol.getRegular();
- boolean _equals = pc.equals(_regular);
- if (_equals) {
- PortClassConfig _regular_1 = prcConfig==null?(PortClassConfig)null:prcConfig.getRegular();
- EList<AttrClassConfig> _attributes_1 = _regular_1==null?(EList<AttrClassConfig>)null:_regular_1.getAttributes();
- String _configValue_1 = _attributes_1==null?(String)null:this.getConfigValue(_attributes_1, attr);
- return _configValue_1;
- } else {
- PortClassConfig _conjugated = prcConfig==null?(PortClassConfig)null:prcConfig.getConjugated();
- EList<AttrClassConfig> _attributes_2 = _conjugated==null?(EList<AttrClassConfig>)null:_conjugated.getAttributes();
- String _configValue_2 = _attributes_2==null?(String)null:this.getConfigValue(_attributes_2, attr);
- return _configValue_2;
- }
+ EObject _eContainer_3 = attr.eContainer();
+ PortClass pc = ((PortClass) _eContainer_3);
+ EObject _eContainer_4 = pc.eContainer();
+ ProtocolClass protocol = ((ProtocolClass) _eContainer_4);
+ ProtocolClassConfig prcConfig = this.getProtocolConfig(((ProtocolClass) protocol));
+ PortClass _regular = protocol.getRegular();
+ boolean _equals = pc.equals(_regular);
+ if (_equals) {
+ PortClassConfig _regular_1 = prcConfig==null?(PortClassConfig)null:prcConfig.getRegular();
+ EList<AttrClassConfig> _attributes_1 = _regular_1==null?(EList<AttrClassConfig>)null:_regular_1.getAttributes();
+ return _attributes_1==null?(String)null:this.getConfigValue(_attributes_1, attr);
+ } else {
+ PortClassConfig _conjugated = prcConfig==null?(PortClassConfig)null:prcConfig.getConjugated();
+ EList<AttrClassConfig> _attributes_2 = _conjugated==null?(EList<AttrClassConfig>)null:_conjugated.getAttributes();
+ return _attributes_2==null?(String)null:this.getConfigValue(_attributes_2, attr);
}
}
- _xifexpression = _xifexpression_1;
}
- return _xifexpression;
+ return null;
}
public String getConfigValue(final List<AttrClassConfig> attrConfigs, final Attribute attr) {
@@ -104,7 +88,7 @@ public class ConfigExtension {
public Boolean apply(final AttrClassConfig attrConfig) {
Attribute _attribute = attrConfig.getAttribute();
boolean _equals = _attribute.equals(attr);
- return ((Boolean)_equals);
+ return Boolean.valueOf(_equals);
}
};
AttrClassConfig _findFirst = IterableExtensions.<AttrClassConfig>findFirst(attrConfigs, _function);
@@ -124,96 +108,92 @@ public class ConfigExtension {
}
public String stringValue(final LiteralArray literalArray, final Attribute attr) {
- String string = "";
- boolean _operator_and = false;
- boolean _isArray = this.isArray(attr);
- if (!_isArray) {
- _operator_and = false;
- } else {
- EList<Literal> _literals = literalArray.getLiterals();
- int _size = _literals.size();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)1));
- _operator_and = BooleanExtensions.operator_and(_isArray, _operator_greaterThan);
- }
- if (_operator_and) {
- {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("{ ");
- {
- EList<Literal> _literals_1 = literalArray.getLiterals();
- for(final Literal literal : _literals_1) {
- String _stringValue = this.stringValue(literal);
- _builder.append(_stringValue, "");
- _builder.append(", ");
- }
- }
- String _operator_plus = StringExtensions.operator_plus(string, _builder);
- string = _operator_plus;
- int _length = string.length();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_length), ((Integer)2));
- String _substring = string.substring(0, _operator_minus);
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append(" ");
- _builder_1.append("}");
- String _operator_plus_1 = StringExtensions.operator_plus(_substring, _builder_1);
- string = _operator_plus_1;
+ String string = "";
+ boolean _and = false;
+ boolean _isArray = this.isArray(attr);
+ if (!_isArray) {
+ _and = false;
+ } else {
+ EList<Literal> _literals = literalArray.getLiterals();
+ int _size = _literals.size();
+ boolean _greaterThan = (_size > 1);
+ _and = (_isArray && _greaterThan);
+ }
+ if (_and) {
+ StringConcatenation _builder = new StringConcatenation();
+ _builder.append("{ ");
+ {
+ EList<Literal> _literals_1 = literalArray.getLiterals();
+ for(final Literal literal : _literals_1) {
+ String _stringValue = this.stringValue(literal);
+ _builder.append(_stringValue, "");
+ _builder.append(", ");
}
- } else {
- EList<Literal> _literals_2 = literalArray.getLiterals();
- Literal _get = _literals_2.get(0);
- String _stringValue_1 = this.stringValue(_get);
- string = _stringValue_1;
}
- return string;
+ String _plus = (string + _builder.toString());
+ string = _plus;
+ int _length = string.length();
+ int _minus = (_length - 2);
+ String _substring = string.substring(0, _minus);
+ StringConcatenation _builder_1 = new StringConcatenation();
+ _builder_1.append(" ");
+ _builder_1.append("}");
+ String _plus_1 = (_substring + _builder_1.toString());
+ string = _plus_1;
+ } else {
+ EList<Literal> _literals_2 = literalArray.getLiterals();
+ Literal _get = _literals_2.get(0);
+ String _stringValue_1 = this.stringValue(_get);
+ string = _stringValue_1;
+ }
+ return string;
}
private String stringValue(final Literal literal) {
String _switchResult = null;
- final Literal literal_1 = literal;
- boolean matched = false;
- if (!matched) {
- if (literal_1 instanceof BooleanLiteral) {
- final BooleanLiteral literal_2 = (BooleanLiteral) literal_1;
- matched=true;
- boolean _isIsTrue = literal_2.isIsTrue();
- String _string = ((Boolean)_isIsTrue).toString();
+ boolean _matched = false;
+ if (!_matched) {
+ if (literal instanceof BooleanLiteral) {
+ final BooleanLiteral _booleanLiteral = (BooleanLiteral)literal;
+ _matched=true;
+ boolean _isIsTrue = _booleanLiteral.isIsTrue();
+ String _string = Boolean.valueOf(_isIsTrue).toString();
_switchResult = _string;
}
}
- if (!matched) {
- if (literal_1 instanceof IntLiteral) {
- final IntLiteral literal_3 = (IntLiteral) literal_1;
- matched=true;
- int _value = literal_3.getValue();
- String _string_1 = ((Integer)_value).toString();
- _switchResult = _string_1;
+ if (!_matched) {
+ if (literal instanceof IntLiteral) {
+ final IntLiteral _intLiteral = (IntLiteral)literal;
+ _matched=true;
+ int _value = _intLiteral.getValue();
+ String _string = Integer.valueOf(_value).toString();
+ _switchResult = _string;
}
}
- if (!matched) {
- if (literal_1 instanceof RealLiteral) {
- final RealLiteral literal_4 = (RealLiteral) literal_1;
- matched=true;
- double _value_1 = literal_4.getValue();
- String _string_2 = ((Double)_value_1).toString();
- _switchResult = _string_2;
+ if (!_matched) {
+ if (literal instanceof RealLiteral) {
+ final RealLiteral _realLiteral = (RealLiteral)literal;
+ _matched=true;
+ double _value = _realLiteral.getValue();
+ String _string = Double.valueOf(_value).toString();
+ _switchResult = _string;
}
}
- if (!matched) {
- if (literal_1 instanceof StringLiteral) {
- final StringLiteral literal_5 = (StringLiteral) literal_1;
- matched=true;
+ if (!_matched) {
+ if (literal instanceof StringLiteral) {
+ final StringLiteral _stringLiteral = (StringLiteral)literal;
+ _matched=true;
String _xblockexpression = null;
{
- String _value_2 = literal_5.getValue();
- String _string_3 = _value_2.toString();
- String value = _string_3;
+ String _value = _stringLiteral.getValue();
+ String value = _value.toString();
String _xifexpression = null;
int _length = value.length();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_length), ((Integer)1));
- if (_operator_equals) {
- String _operator_plus = StringExtensions.operator_plus("\'", value);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\'");
- _xifexpression = _operator_plus_1;
+ boolean _equals = (_length == 1);
+ if (_equals) {
+ String _plus = ("\'" + value);
+ String _plus_1 = (_plus + "\'");
+ _xifexpression = _plus_1;
} else {
String _charArrayExpr = this.languageExt.toCharArrayExpr(value);
_xifexpression = _charArrayExpr;
@@ -233,62 +213,58 @@ public class ConfigExtension {
RefableType _refType = attr.getRefType();
DataType _type = _refType.getType();
if ((_type instanceof PrimitiveType)) {
- {
- RefableType _refType_1 = attr.getRefType();
- DataType _type_1 = _refType_1.getType();
- PrimitiveType primitive = ((PrimitiveType) _type_1);
- LiteralType _type_2 = primitive.getType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_type_2, LiteralType.CHAR);
- isChar = _operator_equals;
- }
+ RefableType _refType_1 = attr.getRefType();
+ DataType _type_1 = _refType_1.getType();
+ PrimitiveType primitive = ((PrimitiveType) _type_1);
+ LiteralType _type_2 = primitive.getType();
+ boolean _equals = Objects.equal(_type_2, LiteralType.CHAR);
+ isChar = _equals;
}
- boolean _operator_and = false;
- boolean _operator_not = BooleanExtensions.operator_not(isChar);
- if (!_operator_not) {
- _operator_and = false;
+ boolean _and = false;
+ boolean _not = (!isChar);
+ if (!_not) {
+ _and = false;
} else {
int _size = attr.getSize();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)0));
- _operator_and = BooleanExtensions.operator_and(_operator_not, _operator_greaterThan);
+ boolean _greaterThan = (_size > 0);
+ _and = (_not && _greaterThan);
}
- _xblockexpression = (_operator_and);
+ _xblockexpression = (_and);
}
return _xblockexpression;
}
public List<AttrInstanceConfig> getConfigAttributes(final ActorInstance ai) {
- ArrayList<AttrInstanceConfig> _arrayList = new ArrayList<AttrInstanceConfig>();
- ArrayList<AttrInstanceConfig> attrConfigs = _arrayList;
- String _path = ai.getPath();
- ActorInstanceConfig _get = ConfigHelper.instanceMap.get(_path);
- ActorInstanceConfig config = _get;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(config, null);
- if (_operator_notEquals) {
- EList<AttrInstanceConfig> _attributes = config.getAttributes();
- for (final AttrInstanceConfig attrConfig : _attributes) {
- LiteralArray _value = attrConfig.getValue();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_value, null);
- if (_operator_notEquals_1) {
- attrConfigs.add(attrConfig);
- }
+ ArrayList<AttrInstanceConfig> _arrayList = new ArrayList<AttrInstanceConfig>();
+ ArrayList<AttrInstanceConfig> attrConfigs = _arrayList;
+ String _path = ai.getPath();
+ ActorInstanceConfig config = ConfigHelper.instanceMap.get(_path);
+ boolean _notEquals = (!Objects.equal(config, null));
+ if (_notEquals) {
+ EList<AttrInstanceConfig> _attributes = config.getAttributes();
+ for (final AttrInstanceConfig attrConfig : _attributes) {
+ LiteralArray _value = attrConfig.getValue();
+ boolean _notEquals_1 = (!Objects.equal(_value, null));
+ if (_notEquals_1) {
+ attrConfigs.add(attrConfig);
}
}
- return attrConfigs;
+ }
+ return attrConfigs;
}
public List<PortInstanceConfig> getConfigPorts(final ActorInstance ai) {
- ArrayList<PortInstanceConfig> _arrayList = new ArrayList<PortInstanceConfig>();
- ArrayList<PortInstanceConfig> portConfigs = _arrayList;
- String _path = ai.getPath();
- ActorInstanceConfig _get = ConfigHelper.instanceMap.get(_path);
- ActorInstanceConfig config = _get;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(config, null);
- if (_operator_notEquals) {
- EList<PortInstanceConfig> _ports = config.getPorts();
- for (final PortInstanceConfig portConfig : _ports) {
- portConfigs.add(portConfig);
- }
+ ArrayList<PortInstanceConfig> _arrayList = new ArrayList<PortInstanceConfig>();
+ ArrayList<PortInstanceConfig> portConfigs = _arrayList;
+ String _path = ai.getPath();
+ ActorInstanceConfig config = ConfigHelper.instanceMap.get(_path);
+ boolean _notEquals = (!Objects.equal(config, null));
+ if (_notEquals) {
+ EList<PortInstanceConfig> _ports = config.getPorts();
+ for (final PortInstanceConfig portConfig : _ports) {
+ portConfigs.add(portConfig);
}
- return portConfigs;
+ }
+ return portConfigs;
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
index 85d09c0a9..fb9ff2024 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
@@ -14,8 +14,6 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class GenericActorClassGenerator {
@@ -26,68 +24,67 @@ public class GenericActorClassGenerator {
private RoomExtensions roomExt;
public String genInterfaceItemConstants(final ExpandedActorClass xpac, final ActorClass ac) {
- List<Port> _xifexpression = null;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- List<Port> _endPorts = this.roomExt.getEndPorts(ac);
- _xifexpression = _endPorts;
- } else {
- List<Port> _allEndPorts = this.roomExt.getAllEndPorts(ac);
- _xifexpression = _allEndPorts;
- }
- List<Port> endPorts = _xifexpression;
- List<SAPRef> _xifexpression_1 = null;
- boolean _usesInheritance_1 = this.langExt.usesInheritance();
- if (_usesInheritance_1) {
- EList<SAPRef> _strSAPs = ac.getStrSAPs();
- _xifexpression_1 = _strSAPs;
- } else {
- List<SAPRef> _allSAPs = this.roomExt.getAllSAPs(ac);
- _xifexpression_1 = _allSAPs;
- }
- List<SAPRef> strSAPs = _xifexpression_1;
- List<ServiceImplementation> _xifexpression_2 = null;
- boolean _usesInheritance_2 = this.langExt.usesInheritance();
- if (_usesInheritance_2) {
- EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
- _xifexpression_2 = _serviceImplementations;
- } else {
- List<ServiceImplementation> _allServiceImplementations = this.roomExt.getAllServiceImplementations(ac);
- _xifexpression_2 = _allServiceImplementations;
- }
- List<ServiceImplementation> svcImpls = _xifexpression_2;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- for (final Port ep : endPorts) {
- String _name = ep.getName();
- String _operator_plus = StringExtensions.operator_plus("IFITEM_", _name);
- int _interfaceItemLocalId = xpac.getInterfaceItemLocalId(ep);
- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)1), ((Integer)_interfaceItemLocalId));
- String _string = ((Integer)_operator_plus_1).toString();
- Pair<String,String> _pair = Tuples.<String, String>pair(_operator_plus, _string);
- list.add(_pair);
- }
- for (final SAPRef sap : strSAPs) {
- String _name_1 = sap.getName();
- String _operator_plus_2 = StringExtensions.operator_plus("IFITEM_", _name_1);
- int _interfaceItemLocalId_1 = xpac.getInterfaceItemLocalId(sap);
- int _operator_plus_3 = IntegerExtensions.operator_plus(((Integer)1), ((Integer)_interfaceItemLocalId_1));
- String _string_1 = ((Integer)_operator_plus_3).toString();
- Pair<String,String> _pair_1 = Tuples.<String, String>pair(_operator_plus_2, _string_1);
- list.add(_pair_1);
- }
- for (final ServiceImplementation svc : svcImpls) {
- SPPRef _spp = svc.getSpp();
- String _name_2 = _spp.getName();
- String _operator_plus_4 = StringExtensions.operator_plus("IFITEM_", _name_2);
- SPPRef _spp_1 = svc.getSpp();
- int _interfaceItemLocalId_2 = xpac.getInterfaceItemLocalId(_spp_1);
- int _operator_plus_5 = IntegerExtensions.operator_plus(((Integer)1), ((Integer)_interfaceItemLocalId_2));
- String _string_2 = ((Integer)_operator_plus_5).toString();
- Pair<String,String> _pair_2 = Tuples.<String, String>pair(_operator_plus_4, _string_2);
- list.add(_pair_2);
- }
- String _genEnumeration = this.langExt.genEnumeration("interface_items", list);
- return _genEnumeration;
+ List<Port> _xifexpression = null;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ List<Port> _endPorts = this.roomExt.getEndPorts(ac);
+ _xifexpression = _endPorts;
+ } else {
+ List<Port> _allEndPorts = this.roomExt.getAllEndPorts(ac);
+ _xifexpression = _allEndPorts;
+ }
+ List<Port> endPorts = _xifexpression;
+ List<SAPRef> _xifexpression_1 = null;
+ boolean _usesInheritance_1 = this.langExt.usesInheritance();
+ if (_usesInheritance_1) {
+ EList<SAPRef> _strSAPs = ac.getStrSAPs();
+ _xifexpression_1 = _strSAPs;
+ } else {
+ List<SAPRef> _allSAPs = this.roomExt.getAllSAPs(ac);
+ _xifexpression_1 = _allSAPs;
+ }
+ List<SAPRef> strSAPs = _xifexpression_1;
+ List<ServiceImplementation> _xifexpression_2 = null;
+ boolean _usesInheritance_2 = this.langExt.usesInheritance();
+ if (_usesInheritance_2) {
+ EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
+ _xifexpression_2 = _serviceImplementations;
+ } else {
+ List<ServiceImplementation> _allServiceImplementations = this.roomExt.getAllServiceImplementations(ac);
+ _xifexpression_2 = _allServiceImplementations;
+ }
+ List<ServiceImplementation> svcImpls = _xifexpression_2;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ for (final Port ep : endPorts) {
+ String _name = ep.getName();
+ String _plus = ("IFITEM_" + _name);
+ int _interfaceItemLocalId = xpac.getInterfaceItemLocalId(ep);
+ int _plus_1 = (1 + _interfaceItemLocalId);
+ String _string = Integer.valueOf(_plus_1).toString();
+ Pair<String,String> _pair = Tuples.<String, String>pair(_plus, _string);
+ list.add(_pair);
+ }
+ for (final SAPRef sap : strSAPs) {
+ String _name_1 = sap.getName();
+ String _plus_2 = ("IFITEM_" + _name_1);
+ int _interfaceItemLocalId_1 = xpac.getInterfaceItemLocalId(sap);
+ int _plus_3 = (1 + _interfaceItemLocalId_1);
+ String _string_1 = Integer.valueOf(_plus_3).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_plus_2, _string_1);
+ list.add(_pair_1);
+ }
+ for (final ServiceImplementation svc : svcImpls) {
+ SPPRef _spp = svc.getSpp();
+ String _name_2 = _spp.getName();
+ String _plus_4 = ("IFITEM_" + _name_2);
+ SPPRef _spp_1 = svc.getSpp();
+ int _interfaceItemLocalId_2 = xpac.getInterfaceItemLocalId(_spp_1);
+ int _plus_5 = (1 + _interfaceItemLocalId_2);
+ String _string_2 = Integer.valueOf(_plus_5).toString();
+ Pair<String,String> _pair_2 = Tuples.<String, String>pair(_plus_4, _string_2);
+ list.add(_pair_2);
+ }
+ return this.langExt.genEnumeration("interface_items", list);
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
index a5f0de1db..66a2003d5 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
@@ -15,8 +15,6 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class GenericProtocolClassGenerator {
@@ -27,106 +25,95 @@ public class GenericProtocolClassGenerator {
private RoomExtensions roomExt;
public String genMessageIDs(final ProtocolClass pc) {
- int offset = 0;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- String _name = pc.getName();
- String _memberInDeclaration = this.langExt.memberInDeclaration(_name, "MSG_MIN");
- String _string = ((Integer)offset).toString();
- Pair<String,String> _pair = Tuples.<String, String>pair(_memberInDeclaration, _string);
- list.add(_pair);
- List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);
- for (final Message msg : _allOutgoingMessages) {
- {
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus;
- String _name_1 = pc.getName();
- String _name_2 = msg.getName();
- String _operator_plus_1 = StringExtensions.operator_plus("OUT_", _name_2);
- String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, _operator_plus_1);
- String _string_1 = ((Integer)offset).toString();
- Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
- list.add(_pair_1);
- }
+ int offset = 0;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ String _name = pc.getName();
+ String _memberInDeclaration = this.langExt.memberInDeclaration(_name, "MSG_MIN");
+ String _string = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair = Tuples.<String, String>pair(_memberInDeclaration, _string);
+ list.add(_pair);
+ List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);
+ for (final Message msg : _allOutgoingMessages) {
+ {
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _name_1 = pc.getName();
+ String _name_2 = msg.getName();
+ String _plus_1 = ("OUT_" + _name_2);
+ String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, _plus_1);
+ String _string_1 = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
+ list.add(_pair_1);
}
- List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
- for (final Message msg_1 : _allIncomingMessages) {
- {
- int _operator_plus_2 = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus_2;
- String _name_3 = pc.getName();
- String _name_4 = msg_1.getName();
- String _operator_plus_3 = StringExtensions.operator_plus("IN_", _name_4);
- String _memberInDeclaration_2 = this.langExt.memberInDeclaration(_name_3, _operator_plus_3);
- String _string_2 = ((Integer)offset).toString();
- Pair<String,String> _pair_2 = Tuples.<String, String>pair(_memberInDeclaration_2, _string_2);
- list.add(_pair_2);
- }
+ }
+ List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
+ for (final Message msg_1 : _allIncomingMessages) {
+ {
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _name_1 = pc.getName();
+ String _name_2 = msg_1.getName();
+ String _plus_1 = ("IN_" + _name_2);
+ String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, _plus_1);
+ String _string_1 = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
+ list.add(_pair_1);
}
- int _operator_plus_4 = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus_4;
- String _name_5 = pc.getName();
- String _memberInDeclaration_3 = this.langExt.memberInDeclaration(_name_5, "MSG_MAX");
- String _string_3 = ((Integer)offset).toString();
- Pair<String,String> _pair_3 = Tuples.<String, String>pair(_memberInDeclaration_3, _string_3);
- list.add(_pair_3);
- String _name_6 = pc.getName();
- String _memberInDeclaration_4 = this.langExt.memberInDeclaration(_name_6, "msg_ids");
- String _genEnumeration = this.langExt.genEnumeration(_memberInDeclaration_4, list);
- return _genEnumeration;
+ }
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _name_1 = pc.getName();
+ String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, "MSG_MAX");
+ String _string_1 = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
+ list.add(_pair_1);
+ String _name_2 = pc.getName();
+ String _memberInDeclaration_2 = this.langExt.memberInDeclaration(_name_2, "msg_ids");
+ return this.langExt.genEnumeration(_memberInDeclaration_2, list);
}
public String getMessageID(final MessageFromIf mif) {
Message _message = mif.getMessage();
InterfaceItem _from = mif.getFrom();
- String _messageID = this.getMessageID(_message, _from);
- return _messageID;
+ return this.getMessageID(_message, _from);
}
public String getMessageID(final Message msg, final InterfaceItem item) {
- if ((item instanceof Port)) {
- {
- Port p = ((Port) item);
- String _xifexpression = null;
- boolean _isConjugated = p.isConjugated();
- if (_isConjugated) {
- _xifexpression = "OUT_";
- } else {
- _xifexpression = "IN_";
- }
- String direction = _xifexpression;
- GeneralProtocolClass _protocol = p.getProtocol();
- String _name = _protocol.getName();
- String _name_1 = msg.getName();
- String _operator_plus = StringExtensions.operator_plus(direction, _name_1);
- String _memberInUse = this.langExt.memberInUse(_name, _operator_plus);
- return _memberInUse;
- }
+ if ((item instanceof Port)) {
+ Port p = ((Port) item);
+ String _xifexpression = null;
+ boolean _isConjugated = p.isConjugated();
+ if (_isConjugated) {
+ _xifexpression = "OUT_";
+ } else {
+ _xifexpression = "IN_";
+ }
+ String direction = _xifexpression;
+ GeneralProtocolClass _protocol = p.getProtocol();
+ String _name = _protocol.getName();
+ String _name_1 = msg.getName();
+ String _plus = (direction + _name_1);
+ return this.langExt.memberInUse(_name, _plus);
+ } else {
+ if ((item instanceof SAPRef)) {
+ SAPRef sap = ((SAPRef) item);
+ ProtocolClass _protocol_1 = sap.getProtocol();
+ String _name_2 = _protocol_1.getName();
+ String _name_3 = msg.getName();
+ String _plus_1 = ("OUT_" + _name_3);
+ return this.langExt.memberInUse(_name_2, _plus_1);
} else {
- if ((item instanceof SAPRef)) {
- {
- SAPRef sap = ((SAPRef) item);
- ProtocolClass _protocol_1 = sap.getProtocol();
- String _name_2 = _protocol_1.getName();
- String _name_3 = msg.getName();
- String _operator_plus_1 = StringExtensions.operator_plus("OUT_", _name_3);
- String _memberInUse_1 = this.langExt.memberInUse(_name_2, _operator_plus_1);
- return _memberInUse_1;
- }
- } else {
- if ((item instanceof SPPRef)) {
- {
- SPPRef spp = ((SPPRef) item);
- ProtocolClass _protocol_2 = spp.getProtocol();
- String _name_4 = _protocol_2.getName();
- String _name_5 = msg.getName();
- String _operator_plus_2 = StringExtensions.operator_plus("IN_", _name_5);
- String _memberInUse_2 = this.langExt.memberInUse(_name_4, _operator_plus_2);
- return _memberInUse_2;
- }
- }
+ if ((item instanceof SPPRef)) {
+ SPPRef spp = ((SPPRef) item);
+ ProtocolClass _protocol_2 = spp.getProtocol();
+ String _name_4 = _protocol_2.getName();
+ String _name_5 = msg.getName();
+ String _plus_2 = ("IN_" + _name_5);
+ return this.langExt.memberInUse(_name_4, _plus_2);
}
}
- return "unknown interface item";
+ }
+ return "unknown interface item";
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
index 2e212f3a5..4db22d8e6 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
@@ -1,7 +1,9 @@
package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
@@ -29,15 +31,11 @@ import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
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")
public class GenericStateMachineGenerator {
@@ -57,147 +55,136 @@ public class GenericStateMachineGenerator {
protected ITranslationProvider translator;
private String genStateIdConstants(final ExpandedActorClass xpac, final ActorClass ac) {
- int _xifexpression = (int) 0;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- int _numberOfInheritedBaseStates = this.roomExt.getNumberOfInheritedBaseStates(ac);
- _xifexpression = _numberOfInheritedBaseStates;
- } else {
- _xifexpression = 0;
- }
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)2), ((Integer)_xifexpression));
- int offset = _operator_plus;
- List<State> _xifexpression_1 = null;
- boolean _usesInheritance_1 = this.langExt.usesInheritance();
- if (_usesInheritance_1) {
- StateGraph _stateMachine = ac.getStateMachine();
- List<State> _baseStateList = this.roomExt.getBaseStateList(_stateMachine);
- _xifexpression_1 = _baseStateList;
- } else {
- StateGraph _stateMachine_1 = xpac.getStateMachine();
- List<State> _baseStateList_1 = this.roomExt.getBaseStateList(_stateMachine_1);
- _xifexpression_1 = _baseStateList_1;
- }
- List<State> baseStates = _xifexpression_1;
- ArrayList<State> _leafStatesLast = this.roomExt.getLeafStatesLast(baseStates);
- baseStates = _leafStatesLast;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- boolean _usesInheritance_2 = this.langExt.usesInheritance();
- boolean _operator_not = BooleanExtensions.operator_not(_usesInheritance_2);
- if (_operator_not) {
- {
- Pair<String,String> _pair = Tuples.<String, String>pair("NO_STATE", "0");
- list.add(_pair);
- Pair<String,String> _pair_1 = Tuples.<String, String>pair("STATE_TOP", "1");
- list.add(_pair_1);
- }
- }
- for (final State state : baseStates) {
- {
- String _stateId = this.roomExt.getStateId(state);
- String _string = ((Integer)offset).toString();
- Pair<String,String> _pair_2 = Tuples.<String, String>pair(_stateId, _string);
- list.add(_pair_2);
- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus_1;
- }
+ int _xifexpression = (int) 0;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ int _numberOfInheritedBaseStates = this.roomExt.getNumberOfInheritedBaseStates(ac);
+ _xifexpression = _numberOfInheritedBaseStates;
+ } else {
+ _xifexpression = 0;
+ }
+ int offset = (2 + _xifexpression);
+ List<State> _xifexpression_1 = null;
+ boolean _usesInheritance_1 = this.langExt.usesInheritance();
+ if (_usesInheritance_1) {
+ StateGraph _stateMachine = ac.getStateMachine();
+ List<State> _baseStateList = this.roomExt.getBaseStateList(_stateMachine);
+ _xifexpression_1 = _baseStateList;
+ } else {
+ StateGraph _stateMachine_1 = xpac.getStateMachine();
+ List<State> _baseStateList_1 = this.roomExt.getBaseStateList(_stateMachine_1);
+ _xifexpression_1 = _baseStateList_1;
+ }
+ List<State> baseStates = _xifexpression_1;
+ ArrayList<State> _leafStatesLast = this.roomExt.getLeafStatesLast(baseStates);
+ baseStates = _leafStatesLast;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ boolean _usesInheritance_2 = this.langExt.usesInheritance();
+ boolean _not = (!_usesInheritance_2);
+ if (_not) {
+ Pair<String,String> _pair = Tuples.<String, String>pair("NO_STATE", "0");
+ list.add(_pair);
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair("STATE_TOP", "1");
+ list.add(_pair_1);
+ }
+ for (final State state : baseStates) {
+ {
+ String _stateId = this.roomExt.getStateId(state);
+ String _string = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_2 = Tuples.<String, String>pair(_stateId, _string);
+ list.add(_pair_2);
+ int _plus = (offset + 1);
+ offset = _plus;
}
- String _genEnumeration = this.langExt.genEnumeration("state_ids", list);
- return _genEnumeration;
+ }
+ return this.langExt.genEnumeration("state_ids", list);
}
private String genTransitionChainConstants(final ExpandedActorClass xpac, final ActorClass ac) {
- EList<TransitionChain> _xifexpression = null;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- EList<TransitionChain> _ownTransitionChains = xpac.getOwnTransitionChains();
- _xifexpression = _ownTransitionChains;
- } else {
- EList<TransitionChain> _transitionChains = xpac.getTransitionChains();
- _xifexpression = _transitionChains;
- }
- EList<TransitionChain> chains = _xifexpression;
- int _xifexpression_1 = (int) 0;
- boolean _usesInheritance_1 = this.langExt.usesInheritance();
- if (_usesInheritance_1) {
- EList<TransitionChain> _transitionChains_1 = xpac.getTransitionChains();
- int _size = _transitionChains_1.size();
- int _size_1 = chains.size();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_size), ((Integer)_size_1));
- _xifexpression_1 = _operator_minus;
- } else {
- _xifexpression_1 = 0;
- }
- int offset = _xifexpression_1;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- for (final TransitionChain chain : chains) {
- {
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus;
- String _chainId = this.roomExt.getChainId(chain);
- String _string = ((Integer)offset).toString();
- Pair<String,String> _pair = Tuples.<String, String>pair(_chainId, _string);
- list.add(_pair);
- }
+ EList<TransitionChain> _xifexpression = null;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ EList<TransitionChain> _ownTransitionChains = xpac.getOwnTransitionChains();
+ _xifexpression = _ownTransitionChains;
+ } else {
+ EList<TransitionChain> _transitionChains = xpac.getTransitionChains();
+ _xifexpression = _transitionChains;
+ }
+ EList<TransitionChain> chains = _xifexpression;
+ int _xifexpression_1 = (int) 0;
+ boolean _usesInheritance_1 = this.langExt.usesInheritance();
+ if (_usesInheritance_1) {
+ EList<TransitionChain> _transitionChains_1 = xpac.getTransitionChains();
+ int _size = _transitionChains_1.size();
+ int _size_1 = chains.size();
+ int _minus = (_size - _size_1);
+ _xifexpression_1 = _minus;
+ } else {
+ _xifexpression_1 = 0;
+ }
+ int offset = _xifexpression_1;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ for (final TransitionChain chain : chains) {
+ {
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _chainId = this.roomExt.getChainId(chain);
+ String _string = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair = Tuples.<String, String>pair(_chainId, _string);
+ list.add(_pair);
}
- String _genEnumeration = this.langExt.genEnumeration("chain_ids", list);
- return _genEnumeration;
+ }
+ return this.langExt.genEnumeration("chain_ids", list);
}
private String genTriggerConstants(final ExpandedActorClass xpac, final ActorClass ac) {
- EList<MessageFromIf> _xifexpression = null;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- EList<MessageFromIf> _ownTriggers = xpac.getOwnTriggers();
- _xifexpression = _ownTriggers;
- } else {
- EList<MessageFromIf> _triggers = xpac.getTriggers();
- _xifexpression = _triggers;
- }
- EList<MessageFromIf> triggers = _xifexpression;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- Pair<String,String> _pair = Tuples.<String, String>pair("POLLING", "0");
- list.add(_pair);
- for (final MessageFromIf mif : triggers) {
- String _triggerCodeName = xpac.getTriggerCodeName(mif);
- InterfaceItem _from = mif.getFrom();
- String _name = _from.getName();
- String _operator_plus = StringExtensions.operator_plus("IFITEM_", _name);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, " + EVT_SHIFT*");
- String _messageID = this.pcGen.getMessageID(mif);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _messageID);
- Pair<String,String> _pair_1 = Tuples.<String, String>pair(_triggerCodeName, _operator_plus_2);
- list.add(_pair_1);
- }
- String _genEnumeration = this.langExt.genEnumeration("triggers", list);
- return _genEnumeration;
+ EList<MessageFromIf> _xifexpression = null;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ EList<MessageFromIf> _ownTriggers = xpac.getOwnTriggers();
+ _xifexpression = _ownTriggers;
+ } else {
+ EList<MessageFromIf> _triggers = xpac.getTriggers();
+ _xifexpression = _triggers;
+ }
+ EList<MessageFromIf> triggers = _xifexpression;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ Pair<String,String> _pair = Tuples.<String, String>pair("POLLING", "0");
+ list.add(_pair);
+ for (final MessageFromIf mif : triggers) {
+ String _triggerCodeName = xpac.getTriggerCodeName(mif);
+ InterfaceItem _from = mif.getFrom();
+ String _name = _from.getName();
+ String _plus = ("IFITEM_" + _name);
+ String _plus_1 = (_plus + " + EVT_SHIFT*");
+ String _messageID = this.pcGen.getMessageID(mif);
+ String _plus_2 = (_plus_1 + _messageID);
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_triggerCodeName, _plus_2);
+ list.add(_pair_1);
+ }
+ return this.langExt.genEnumeration("triggers", list);
}
- public StringConcatenation genStateMachine(final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genStateMachine(final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
this.translator.setActorClass(ac);
DetailCodeTranslator _detailCodeTranslator = new DetailCodeTranslator(ac, this.translator);
DetailCodeTranslator dct = _detailCodeTranslator;
ActorCommunicationType _commType = ac.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals;
+ boolean async = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
ActorCommunicationType _commType_1 = ac.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
- boolean eventDriven = _operator_equals_1;
- ActorCommunicationType _commType_2 = ac.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals_2;
- boolean _operator_or = false;
+ boolean eventDriven = Objects.equal(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
+ boolean _or = false;
if (async) {
- _operator_or = true;
+ _or = true;
} else {
- _operator_or = BooleanExtensions.operator_or(async, eventDriven);
+ _or = (async || eventDriven);
}
- boolean handleEvents = _operator_or;
+ boolean handleEvents = _or;
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
_builder.append("/* state IDs */");
@@ -218,7 +205,7 @@ public class GenericStateMachineGenerator {
_builder.append(_genTriggerConstants, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
- StringConcatenation _genExtra = this.genExtra(xpac, ac);
+ CharSequence _genExtra = this.genExtra(xpac, ac);
_builder.append(_genExtra, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -229,16 +216,16 @@ public class GenericStateMachineGenerator {
List<State> _stateList = this.roomExt.getStateList(_stateMachine);
for(final State state : _stateList) {
{
- boolean _operator_or_1 = false;
+ boolean _or_1 = false;
boolean _usesInheritance = this.langExt.usesInheritance();
- boolean _operator_not = BooleanExtensions.operator_not(_usesInheritance);
- if (_operator_not) {
- _operator_or_1 = true;
+ boolean _not = (!_usesInheritance);
+ if (_not) {
+ _or_1 = true;
} else {
boolean _isOwnObject = xpac.isOwnObject(state);
- _operator_or_1 = BooleanExtensions.operator_or(_operator_not, _isOwnObject);
+ _or_1 = (_not || _isOwnObject);
}
- if (_operator_or_1) {
+ if (_or_1) {
{
boolean _hasEntryCode = this.roomExt.hasEntryCode(state);
if (_hasEntryCode) {
@@ -315,27 +302,26 @@ public class GenericStateMachineGenerator {
List<Transition> _transitionList = this.roomExt.getTransitionList(_stateMachine_1);
for(final Transition tr : _transitionList) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _isOwnObject_1 = xpac.isOwnObject(tr);
if (!_isOwnObject_1) {
- _operator_and = false;
+ _and = false;
} else {
boolean _hasActionCode = this.roomExt.hasActionCode(tr);
- _operator_and = BooleanExtensions.operator_and(_isOwnObject_1, _hasActionCode);
+ _and = (_isOwnObject_1 && _hasActionCode);
}
- if (_operator_and) {
+ if (_and) {
TransitionChain _chain = xpac.getChain(tr);
- Transition _transition = _chain.getTransition();
- Transition start = _transition;
+ Transition start = _chain.getTransition();
_builder.newLineIfNotEmpty();
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
if (!(start instanceof NonInitialTransition)) {
- _operator_and_1 = false;
+ _and_1 = false;
} else {
- boolean _operator_not_1 = BooleanExtensions.operator_not((start instanceof GuardedTransition));
- _operator_and_1 = BooleanExtensions.operator_and((start instanceof NonInitialTransition), _operator_not_1);
+ boolean _not_1 = (!(start instanceof GuardedTransition));
+ _and_1 = ((start instanceof NonInitialTransition) && _not_1);
}
- boolean hasArgs = _operator_and_1;
+ boolean hasArgs = _and_1;
_builder.newLineIfNotEmpty();
String _accessLevelProtected_2 = this.langExt.accessLevelProtected();
_builder.append(_accessLevelProtected_2, "");
@@ -500,8 +486,7 @@ public class GenericStateMachineGenerator {
_builder.append("switch (chain) {");
_builder.newLine();
_builder.append("\t\t");
- EList<TransitionChain> _transitionChains = xpac.getTransitionChains();
- EList<TransitionChain> allchains = _transitionChains;
+ EList<TransitionChain> allchains = xpac.getTransitionChains();
_builder.newLineIfNotEmpty();
{
for(final TransitionChain tc : allchains) {
@@ -633,8 +618,7 @@ public class GenericStateMachineGenerator {
_builder.append("\t");
_builder.append("\t");
StateGraph _subgraph_1 = state_2.getSubgraph();
- Transition _initTransition = this.roomExt.getInitTransition(_subgraph_1);
- Transition sub_initt = _initTransition;
+ Transition sub_initt = this.roomExt.getInitTransition(_subgraph_1);
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("\t");
@@ -753,8 +737,7 @@ public class GenericStateMachineGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t");
StateGraph _stateMachine_4 = xpac.getStateMachine();
- Transition _initTransition_1 = this.roomExt.getInitTransition(_stateMachine_4);
- Transition initt = _initTransition_1;
+ Transition initt = this.roomExt.getInitTransition(_stateMachine_4);
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("int chain = ");
@@ -888,7 +871,7 @@ public class GenericStateMachineGenerator {
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genStateSwitch = this.genStateSwitch(xpac, dct);
+ CharSequence _genStateSwitch = this.genStateSwitch(xpac, dct);
_builder.append(_genStateSwitch, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -896,7 +879,7 @@ public class GenericStateMachineGenerator {
_builder.newLine();
} else {
_builder.append("\t");
- StringConcatenation _genStateSwitch_1 = this.genStateSwitch(xpac, dct);
+ CharSequence _genStateSwitch_1 = this.genStateSwitch(xpac, dct);
_builder.append(_genStateSwitch_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -954,28 +937,18 @@ public class GenericStateMachineGenerator {
return _xblockexpression;
}
- private StringConcatenation genStateSwitch(final ExpandedActorClass xpac, final DetailCodeTranslator dct) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genStateSwitch(final ExpandedActorClass xpac, final DetailCodeTranslator dct) {
+ CharSequence _xblockexpression = null;
{
ActorClass _actorClass = xpac.getActorClass();
ActorCommunicationType _commType = _actorClass.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals;
+ boolean async = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
ActorClass _actorClass_1 = xpac.getActorClass();
ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
- boolean eventDriven = _operator_equals_1;
+ boolean eventDriven = Objects.equal(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
ActorClass _actorClass_2 = xpac.getActorClass();
ActorCommunicationType _commType_2 = _actorClass_2.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals_2;
- boolean _operator_or = false;
- if (async) {
- _operator_or = true;
- } else {
- _operator_or = BooleanExtensions.operator_or(async, eventDriven);
- }
- boolean handleEvents = _operator_or;
+ boolean dataDriven = Objects.equal(_commType_2, ActorCommunicationType.DATA_DRIVEN);
StringConcatenation _builder = new StringConcatenation();
_builder.append("switch (");
String _memberAccess = this.langExt.memberAccess();
@@ -996,13 +969,12 @@ public class GenericStateMachineGenerator {
if (async) {
_builder.append("\t");
_builder.append("\t");
- EList<ActiveTrigger> _activeTriggers = xpac.getActiveTriggers(state);
- EList<ActiveTrigger> atlist = _activeTriggers;
+ EList<ActiveTrigger> atlist = xpac.getActiveTriggers(state);
_builder.newLineIfNotEmpty();
{
boolean _isEmpty = atlist.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("\t");
_builder.append("\t");
_builder.append("switch(trigger) {");
@@ -1014,7 +986,7 @@ public class GenericStateMachineGenerator {
_builder.append("\t");
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataDrivenTriggers = this.genDataDrivenTriggers(xpac, state, dct);
+ CharSequence _genDataDrivenTriggers = this.genDataDrivenTriggers(xpac, state, dct);
_builder.append(_genDataDrivenTriggers, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1025,7 +997,7 @@ public class GenericStateMachineGenerator {
_builder.append("\t");
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genEventDrivenTriggers = this.genEventDrivenTriggers(xpac, state, atlist, dct);
+ CharSequence _genEventDrivenTriggers = this.genEventDrivenTriggers(xpac, state, atlist, dct);
_builder.append(_genEventDrivenTriggers, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1035,7 +1007,7 @@ public class GenericStateMachineGenerator {
} else {
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataDrivenTriggers_1 = this.genDataDrivenTriggers(xpac, state, dct);
+ CharSequence _genDataDrivenTriggers_1 = this.genDataDrivenTriggers(xpac, state, dct);
_builder.append(_genDataDrivenTriggers_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -1044,20 +1016,19 @@ public class GenericStateMachineGenerator {
if (dataDriven) {
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataDrivenTriggers_2 = this.genDataDrivenTriggers(xpac, state, dct);
+ CharSequence _genDataDrivenTriggers_2 = this.genDataDrivenTriggers(xpac, state, dct);
_builder.append(_genDataDrivenTriggers_2, " ");
_builder.newLineIfNotEmpty();
} else {
if (eventDriven) {
_builder.append("\t");
_builder.append("\t");
- EList<ActiveTrigger> _activeTriggers_1 = xpac.getActiveTriggers(state);
- EList<ActiveTrigger> atlist_1 = _activeTriggers_1;
+ EList<ActiveTrigger> atlist_1 = xpac.getActiveTriggers(state);
_builder.newLineIfNotEmpty();
{
boolean _isEmpty_1 = atlist_1.isEmpty();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_1);
+ if (_not_1) {
_builder.append("\t");
_builder.append("\t");
_builder.append("switch(trigger) {");
@@ -1065,7 +1036,7 @@ public class GenericStateMachineGenerator {
_builder.append("\t");
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genEventDrivenTriggers_1 = this.genEventDrivenTriggers(xpac, state, atlist_1, dct);
+ CharSequence _genEventDrivenTriggers_1 = this.genEventDrivenTriggers(xpac, state, atlist_1, dct);
_builder.append(_genEventDrivenTriggers_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1091,19 +1062,18 @@ public class GenericStateMachineGenerator {
return _xblockexpression;
}
- private StringConcatenation genDataDrivenTriggers(final ExpandedActorClass xpac, final State state, final DetailCodeTranslator dct) {
+ private CharSequence genDataDrivenTriggers(final ExpandedActorClass xpac, final State state, final DetailCodeTranslator dct) {
StringConcatenation _builder = new StringConcatenation();
- StringConcatenation _genDoCodes = this.genDoCodes(state);
+ CharSequence _genDoCodes = this.genDoCodes(state);
_builder.append(_genDoCodes, "");
_builder.newLineIfNotEmpty();
List<Transition> _outgoingTransitionsHierarchical = this.roomExt.getOutgoingTransitionsHierarchical(xpac, state);
final Function1<Transition,Boolean> _function = new Function1<Transition,Boolean>() {
public Boolean apply(final Transition t) {
- return ((Boolean)(t instanceof GuardedTransition));
+ return Boolean.valueOf((t instanceof GuardedTransition));
}
};
- Iterable<Transition> _filter = IterableExtensions.<Transition>filter(_outgoingTransitionsHierarchical, _function);
- Iterable<Transition> transitions = _filter;
+ Iterable<Transition> transitions = IterableExtensions.<Transition>filter(_outgoingTransitionsHierarchical, _function);
_builder.newLineIfNotEmpty();
{
for(final Transition tr : transitions) {
@@ -1116,8 +1086,7 @@ public class GenericStateMachineGenerator {
_builder.append("{");
_builder.newLine();
_builder.append("\t");
- TransitionChain _chain = xpac.getChain(tr);
- TransitionChain chain = _chain;
+ TransitionChain chain = xpac.getChain(tr);
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("chain = ");
@@ -1151,8 +1120,8 @@ public class GenericStateMachineGenerator {
_builder.newLine();
{
Transition _last = IterableExtensions.<Transition>last(transitions);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(tr, _last);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(tr, _last));
+ if (_notEquals) {
_builder.append("else ");
_builder.newLine();
}
@@ -1162,7 +1131,7 @@ public class GenericStateMachineGenerator {
return _builder;
}
- private StringConcatenation genEventDrivenTriggers(final ExpandedActorClass xpac, final State state, final List<ActiveTrigger> atlist, final DetailCodeTranslator dct) {
+ private CharSequence genEventDrivenTriggers(final ExpandedActorClass xpac, final State state, final List<ActiveTrigger> atlist, final DetailCodeTranslator dct) {
StringConcatenation _builder = new StringConcatenation();
{
for(final ActiveTrigger at : atlist) {
@@ -1173,8 +1142,7 @@ public class GenericStateMachineGenerator {
_builder.append(":");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- boolean _hasGuard = this.roomExt.hasGuard(xpac, at);
- boolean needData = _hasGuard;
+ boolean needData = this.roomExt.hasGuard(xpac, at);
_builder.newLineIfNotEmpty();
_builder.append("\t");
{
@@ -1188,21 +1156,20 @@ public class GenericStateMachineGenerator {
_builder.newLineIfNotEmpty();
{
EList<TriggeredTransition> _transitions = at.getTransitions();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final TriggeredTransition tt : _transitions) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(" else ", " ");
}
_builder.append("\t");
- TransitionChain _chain = xpac.getChain(tt);
- TransitionChain chain = _chain;
+ TransitionChain chain = xpac.getChain(tt);
_builder.newLineIfNotEmpty();
_builder.append("\t");
Transition _transition = chain.getTransition();
String _trigger_1 = at.getTrigger();
- StringConcatenation _guard = this.guard(_transition, _trigger_1, xpac, dct);
+ CharSequence _guard = this.guard(_transition, _trigger_1, xpac, dct);
_builder.append(_guard, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1265,23 +1232,22 @@ public class GenericStateMachineGenerator {
return _builder;
}
- public StringConcatenation genExtra(final ExpandedActorClass xpac, final ActorClass ac) {
+ public CharSequence genExtra(final ExpandedActorClass xpac, final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
return _builder;
}
- private StringConcatenation _guard(final TriggeredTransition tt, final String trigger, final ExpandedActorClass ac, final DetailCodeTranslator dct) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence _guard(final TriggeredTransition tt, final String trigger, final ExpandedActorClass ac, final DetailCodeTranslator dct) {
+ CharSequence _xblockexpression = null;
{
EList<Trigger> _triggers = tt.getTriggers();
final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
public Boolean apply(final Trigger e) {
boolean _isMatching = ac.isMatching(e, trigger);
- return ((Boolean)_isMatching);
+ return Boolean.valueOf(_isMatching);
}
};
- Trigger _findFirst = IterableExtensions.<Trigger>findFirst(_triggers, _function);
- Trigger tr = _findFirst;
+ Trigger tr = IterableExtensions.<Trigger>findFirst(_triggers, _function);
StringConcatenation _builder = new StringConcatenation();
{
boolean _hasGuard = this.roomExt.hasGuard(tr);
@@ -1300,14 +1266,14 @@ public class GenericStateMachineGenerator {
return _xblockexpression;
}
- private StringConcatenation _guard(final Transition t, final String trigger, final ExpandedActorClass ac, final DetailCodeTranslator dct) {
+ private CharSequence _guard(final Transition t, final String trigger, final ExpandedActorClass ac, final DetailCodeTranslator dct) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* error */");
_builder.newLine();
return _builder;
}
- private StringConcatenation genDoCodes(final State state) {
+ private CharSequence genDoCodes(final State state) {
StringConcatenation _builder = new StringConcatenation();
{
boolean _hasDoCode = this.roomExt.hasDoCode(state);
@@ -1324,7 +1290,7 @@ public class GenericStateMachineGenerator {
if ((_eContainer_1 instanceof State)) {
EObject _eContainer_2 = state.eContainer();
EObject _eContainer_3 = _eContainer_2.eContainer();
- StringConcatenation _genDoCodes = this.genDoCodes(((State) _eContainer_3));
+ CharSequence _genDoCodes = this.genDoCodes(((State) _eContainer_3));
_builder.append(_genDoCodes, "");
_builder.newLineIfNotEmpty();
}
@@ -1332,11 +1298,14 @@ public class GenericStateMachineGenerator {
return _builder;
}
- private StringConcatenation guard(final Transition tt, final String trigger, final ExpandedActorClass ac, final DetailCodeTranslator dct) {
+ private CharSequence guard(final Transition tt, final String trigger, final ExpandedActorClass ac, final DetailCodeTranslator dct) {
if (tt instanceof TriggeredTransition) {
return _guard((TriggeredTransition)tt, trigger, ac, dct);
- } else {
+ } else if (tt != null) {
return _guard(tt, trigger, ac, dct);
+ } else {
+ throw new IllegalArgumentException("Unhandled parameter types: " +
+ Arrays.<Object>asList(tt, trigger, ac, dct).toString());
}
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
index 752d71f47..828ac29cc 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
@@ -12,12 +12,11 @@ import org.eclipse.etrice.core.genmodel.base.ILogger;
import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.RoomModel;
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 PrepareFileSystem {
@Inject
private RoomExtensions roomExt;
@@ -29,49 +28,46 @@ public class PrepareFileSystem {
private ILogger logger;
public void prepare(final Resource resource) {
- HashSet<String> _hashSet = new HashSet<String>();
- Set<String> pathes = _hashSet;
- EList<EObject> _contents = resource.getContents();
- for (final EObject e : _contents) {
- if ((e instanceof Root)) {
- EList<RoomModel> _usedRoomModels = ((Root) e).getUsedRoomModels();
- for (final RoomModel mdl : _usedRoomModels) {
- String _generationTargetPath = this.roomExt.getGenerationTargetPath(mdl);
- pathes.add(_generationTargetPath);
- }
+ HashSet<String> _hashSet = new HashSet<String>();
+ Set<String> pathes = _hashSet;
+ EList<EObject> _contents = resource.getContents();
+ for (final EObject e : _contents) {
+ if ((e instanceof Root)) {
+ EList<RoomModel> _usedRoomModels = ((Root) e).getUsedRoomModels();
+ for (final RoomModel mdl : _usedRoomModels) {
+ String _generationTargetPath = this.roomExt.getGenerationTargetPath(mdl);
+ pathes.add(_generationTargetPath);
}
}
- for (final String path : pathes) {
- {
- String _operator_plus = StringExtensions.operator_plus("clearing ", path);
- this.logger.logInfo(_operator_plus);
- File _file = new File(path);
- File f = _file;
- this.eraseContents(f);
- this.fileAccess.setOutputPath(path);
- StringConcatenation _readmeText = this.readmeText();
- this.fileAccess.generateFile("readme.txt", _readmeText);
- }
+ }
+ for (final String path : pathes) {
+ {
+ String _plus = ("clearing " + path);
+ this.logger.logInfo(_plus);
+ File _file = new File(path);
+ File f = _file;
+ this.eraseContents(f);
+ this.fileAccess.setOutputPath(path);
+ CharSequence _readmeText = this.readmeText();
+ this.fileAccess.generateFile("readme.txt", _readmeText);
}
+ }
}
public void eraseContents(final File f) {
boolean _isDirectory = f.isDirectory();
if (_isDirectory) {
- {
- File[] _listFiles = f.listFiles();
- File[] children = _listFiles;
- for (final File child : children) {
- {
- this.eraseContents(child);
- child.delete();
- }
+ File[] children = f.listFiles();
+ for (final File child : children) {
+ {
+ this.eraseContents(child);
+ child.delete();
}
}
}
}
- public StringConcatenation readmeText() {
+ public CharSequence readmeText() {
StringConcatenation _builder = new StringConcatenation();
_builder.append("This directory is an eTrice code generation target.");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
index c9244c22f..9710dc201 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
@@ -1,5 +1,6 @@
package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -20,16 +21,12 @@ import org.eclipse.etrice.generator.base.ITranslationProvider;
import org.eclipse.etrice.generator.generic.ConfigExtension;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.TypeHelpers;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-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 ProcedureHelpers {
@Inject
private ILanguageExtension languageExt;
@@ -46,11 +43,11 @@ public class ProcedureHelpers {
@Inject
private ILogger logger;
- public StringConcatenation userCode(final DetailCode dc) {
+ public CharSequence userCode(final DetailCode dc) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(dc, null));
+ if (_notEquals) {
_builder.append("/*--------------------- begin user code ---------------------*/");
_builder.newLine();
{
@@ -71,7 +68,7 @@ public class ProcedureHelpers {
/**
* TODO: add ref type
*/
- public StringConcatenation attributes(final List<Attribute> attribs) {
+ public CharSequence attributes(final List<Attribute> attribs) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- attributes ---------------------*/");
_builder.newLine();
@@ -79,8 +76,8 @@ public class ProcedureHelpers {
for(final Attribute attribute : attribs) {
{
int _size = attribute.getSize();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_size), ((Integer)0));
- if (_operator_equals) {
+ boolean _equals = (_size == 0);
+ if (_equals) {
RefableType _refType = attribute.getRefType();
DataType _type = _refType.getType();
String _typeName = this._typeHelpers.typeName(_type);
@@ -118,82 +115,78 @@ public class ProcedureHelpers {
}
public String arrayInitializer(final Attribute att) {
- String _xifexpression = null;
- String _defaultValueLiteral = att.getDefaultValueLiteral();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals) {
- String _defaultValueLiteral_1 = att.getDefaultValueLiteral();
- _xifexpression = _defaultValueLiteral_1;
- } else {
- RefableType _refType = att.getRefType();
- DataType _type = _refType.getType();
- String _defaultValue = this._typeHelpers.defaultValue(_type);
- _xifexpression = _defaultValue;
- }
- String dflt = _xifexpression;
- boolean _startsWith = dflt.startsWith("{");
- if (_startsWith) {
- {
- String[] _split = dflt.split(",");
- int _size = ((List<String>)Conversions.doWrapArray(_split)).size();
- int _size_1 = att.getSize();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(((Integer)_size), ((Integer)_size_1));
- if (_operator_notEquals_1) {
- String _name = att.getName();
- String _operator_plus = StringExtensions.operator_plus("WARNING: array size determined by initializer differs from attribute size (", _name);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "[");
- int _size_2 = att.getSize();
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ((Integer)_size_2));
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "] <-> ");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, dflt);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, ")");
- this.logger.logInfo(_operator_plus_5);
- }
- return dflt;
- }
+ String _xifexpression = null;
+ String _defaultValueLiteral = att.getDefaultValueLiteral();
+ boolean _notEquals = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals) {
+ String _defaultValueLiteral_1 = att.getDefaultValueLiteral();
+ _xifexpression = _defaultValueLiteral_1;
+ } else {
+ RefableType _refType = att.getRefType();
+ DataType _type = _refType.getType();
+ String _defaultValue = this._typeHelpers.defaultValue(_type);
+ _xifexpression = _defaultValue;
+ }
+ String dflt = _xifexpression;
+ boolean _startsWith = dflt.startsWith("{");
+ if (_startsWith) {
+ String[] _split = dflt.split(",");
+ int _size = ((List<String>)Conversions.doWrapArray(_split)).size();
+ int _size_1 = att.getSize();
+ boolean _notEquals_1 = (_size != _size_1);
+ if (_notEquals_1) {
+ String _name = att.getName();
+ String _plus = ("WARNING: array size determined by initializer differs from attribute size (" + _name);
+ String _plus_1 = (_plus + "[");
+ int _size_2 = att.getSize();
+ String _plus_2 = (_plus_1 + Integer.valueOf(_size_2));
+ String _plus_3 = (_plus_2 + "] <-> ");
+ String _plus_4 = (_plus_3 + dflt);
+ String _plus_5 = (_plus_4 + ")");
+ this.logger.logInfo(_plus_5);
}
- String result = "{";
- int i = 0;
- int _size_3 = att.getSize();
- boolean _operator_lessThan = ComparableExtensions.<Integer>operator_lessThan(((Integer)i), ((Integer)_size_3));
- Boolean _xwhileexpression = _operator_lessThan;
- while (_xwhileexpression) {
- {
- String _operator_plus_6 = StringExtensions.operator_plus(result, dflt);
- result = _operator_plus_6;
- int _operator_plus_7 = IntegerExtensions.operator_plus(((Integer)i), ((Integer)1));
- i = _operator_plus_7;
- int _size_4 = att.getSize();
- boolean _operator_lessThan_1 = ComparableExtensions.<Integer>operator_lessThan(((Integer)i), ((Integer)_size_4));
- if (_operator_lessThan_1) {
- String _operator_plus_8 = StringExtensions.operator_plus(result, ", ");
- result = _operator_plus_8;
- }
+ return dflt;
+ }
+ String result = "{";
+ int i = 0;
+ int _size_3 = att.getSize();
+ boolean _lessThan = (i < _size_3);
+ boolean _while = _lessThan;
+ while (_while) {
+ {
+ String _plus_6 = (result + dflt);
+ result = _plus_6;
+ int _plus_7 = (i + 1);
+ i = _plus_7;
+ int _size_4 = att.getSize();
+ boolean _lessThan_1 = (i < _size_4);
+ if (_lessThan_1) {
+ String _plus_8 = (result + ", ");
+ result = _plus_8;
}
- int _size_5 = att.getSize();
- boolean _operator_lessThan_2 = ComparableExtensions.<Integer>operator_lessThan(((Integer)i), ((Integer)_size_5));
- _xwhileexpression = _operator_lessThan_2;
}
- String _operator_plus_9 = StringExtensions.operator_plus(result, "}");
- return _operator_plus_9;
+ int _size_4 = att.getSize();
+ boolean _lessThan_1 = (i < _size_4);
+ _while = _lessThan_1;
+ }
+ return (result + "}");
}
- public StringConcatenation attributeInitialization(final List<Attribute> attribs, final boolean useClassDefaultsOnly) {
+ public CharSequence attributeInitialization(final List<Attribute> attribs, final boolean useClassDefaultsOnly) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("// initialize attributes");
_builder.newLine();
{
for(final Attribute a : attribs) {
- String _initValue = this._configExtension.getInitValue(a);
- String value = _initValue;
+ String value = this._configExtension.getInitValue(a);
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(value, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(value, null));
+ if (_notEquals) {
{
boolean _isArray = this._configExtension.isArray(a);
- boolean _operator_not = BooleanExtensions.operator_not(_isArray);
- if (_operator_not) {
+ boolean _not = (!_isArray);
+ if (_not) {
String _name = a.getName();
_builder.append(_name, "");
_builder.append(" = ");
@@ -245,28 +238,28 @@ public class ProcedureHelpers {
}
}
} else {
- boolean _operator_or = false;
- boolean _operator_or_1 = false;
+ boolean _or = false;
+ boolean _or_1 = false;
RefableType _refType_2 = a.getRefType();
DataType _type_2 = _refType_2.getType();
if ((_type_2 instanceof ComplexType)) {
- _operator_or_1 = true;
+ _or_1 = true;
} else {
int _size_2 = a.getSize();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size_2), ((Integer)1));
- _operator_or_1 = BooleanExtensions.operator_or((_type_2 instanceof ComplexType), _operator_greaterThan);
+ boolean _greaterThan = (_size_2 > 1);
+ _or_1 = ((_type_2 instanceof ComplexType) || _greaterThan);
}
- if (_operator_or_1) {
- _operator_or = true;
+ if (_or_1) {
+ _or = true;
} else {
- boolean _operator_not_1 = BooleanExtensions.operator_not(useClassDefaultsOnly);
- _operator_or = BooleanExtensions.operator_or(_operator_or_1, _operator_not_1);
+ boolean _not_1 = (!useClassDefaultsOnly);
+ _or = (_or_1 || _not_1);
}
- if (_operator_or) {
+ if (_or) {
{
int _size_3 = a.getSize();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_size_3), ((Integer)0));
- if (_operator_equals) {
+ boolean _equals = (_size_3 == 0);
+ if (_equals) {
{
RefableType _refType_3 = a.getRefType();
boolean _isRef = _refType_3.isRef();
@@ -304,8 +297,8 @@ public class ProcedureHelpers {
_builder.append("];");
_builder.newLineIfNotEmpty();
{
- boolean _operator_not_2 = BooleanExtensions.operator_not(useClassDefaultsOnly);
- if (_operator_not_2) {
+ boolean _not_2 = (!useClassDefaultsOnly);
+ if (_not_2) {
_builder.append("for (int i=0;i<");
int _size_5 = a.getSize();
_builder.append(_size_5, "");
@@ -344,17 +337,17 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation attributeSettersGettersDeclaration(final List<Attribute> attribs, final String classname) {
+ public CharSequence attributeSettersGettersDeclaration(final List<Attribute> attribs, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("//--------------------- attribute setters and getters");
_builder.newLine();
{
for(final Attribute attribute : attribs) {
- StringConcatenation _setterHeader = this.setterHeader(attribute, classname);
+ CharSequence _setterHeader = this.setterHeader(attribute, classname);
_builder.append(_setterHeader, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
- StringConcatenation _terHeader = this.getterHeader(attribute, classname);
+ CharSequence _terHeader = this.getterHeader(attribute, classname);
_builder.append(_terHeader, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -363,13 +356,13 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation attributeSettersGettersImplementation(final List<Attribute> attribs, final String classname) {
+ public CharSequence attributeSettersGettersImplementation(final List<Attribute> attribs, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("//--------------------- attribute setters and getters");
_builder.newLine();
{
for(final Attribute attribute : attribs) {
- StringConcatenation _setterHeader = this.setterHeader(attribute, classname);
+ CharSequence _setterHeader = this.setterHeader(attribute, classname);
_builder.append(_setterHeader, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -385,7 +378,7 @@ public class ProcedureHelpers {
_builder.newLineIfNotEmpty();
_builder.append("}");
_builder.newLine();
- StringConcatenation _terHeader = this.getterHeader(attribute, classname);
+ CharSequence _terHeader = this.getterHeader(attribute, classname);
_builder.append(_terHeader, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -404,7 +397,7 @@ public class ProcedureHelpers {
return _builder;
}
- private StringConcatenation setterHeader(final Attribute attribute, final String classname) {
+ private CharSequence setterHeader(final Attribute attribute, final String classname) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -421,8 +414,8 @@ public class ProcedureHelpers {
_builder.append(_typeName, "");
{
int _size = attribute.getSize();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(((Integer)_size), ((Integer)0));
- if (_operator_notEquals) {
+ boolean _notEquals = (_size != 0);
+ if (_notEquals) {
_builder.append("[]");
}
}
@@ -433,7 +426,7 @@ public class ProcedureHelpers {
return _builder;
}
- private StringConcatenation getterHeader(final Attribute attribute, final String classname) {
+ private CharSequence getterHeader(final Attribute attribute, final String classname) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -443,8 +436,8 @@ public class ProcedureHelpers {
_builder.append(_typeName, "");
{
int _size = attribute.getSize();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(((Integer)_size), ((Integer)0));
- if (_operator_notEquals) {
+ boolean _notEquals = (_size != 0);
+ if (_notEquals) {
_builder.append("[]");
}
}
@@ -459,13 +452,13 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation argList(final List<Attribute> attributes) {
+ public CharSequence argList(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(", ", "");
}
@@ -475,8 +468,8 @@ public class ProcedureHelpers {
_builder.append(_typeName, "");
{
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("[]");
}
}
@@ -488,7 +481,7 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation getterImplementation(final String typeName, final String name, final String classname) {
+ public CharSequence getterImplementation(final String typeName, final String name, final String classname) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -512,7 +505,7 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation invokeGetter(final String name, final String classname) {
+ public CharSequence invokeGetter(final String name, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("get");
String _firstUpper = StringExtensions.toFirstUpper(name);
@@ -524,7 +517,7 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation invokeSetter(final String name, final String classname, final String value) {
+ public CharSequence invokeSetter(final String name, final String classname, final String value) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("set");
String _firstUpper = StringExtensions.toFirstUpper(name);
@@ -537,24 +530,24 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation operationsDeclaration(final List<? extends Operation> operations, final String classname) {
+ public CharSequence operationsDeclaration(final List<? extends Operation> operations, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- operations ---------------------*/");
_builder.newLine();
{
for(final Operation operation : operations) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _usesInheritance = this.languageExt.usesInheritance();
if (!_usesInheritance) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isConstructor = RoomHelpers.isConstructor(operation);
- _operator_and = BooleanExtensions.operator_and(_usesInheritance, _isConstructor);
+ _and = (_usesInheritance && _isConstructor);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
- StringConcatenation _operationSignature = this.operationSignature(operation, classname, true);
+ boolean _not = (!_and);
+ if (_not) {
+ CharSequence _operationSignature = this.operationSignature(operation, classname, true);
_builder.append(_operationSignature, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -565,24 +558,24 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation operationsImplementation(final List<? extends Operation> operations, final String classname) {
+ public CharSequence operationsImplementation(final List<? extends Operation> operations, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- operations ---------------------*/");
_builder.newLine();
{
for(final Operation operation : operations) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _usesInheritance = this.languageExt.usesInheritance();
if (!_usesInheritance) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isConstructor = RoomHelpers.isConstructor(operation);
- _operator_and = BooleanExtensions.operator_and(_usesInheritance, _isConstructor);
+ _and = (_usesInheritance && _isConstructor);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
- StringConcatenation _operationSignature = this.operationSignature(operation, classname, false);
+ boolean _not = (!_and);
+ if (_not) {
+ CharSequence _operationSignature = this.operationSignature(operation, classname, false);
_builder.append(_operationSignature, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -604,8 +597,8 @@ public class ProcedureHelpers {
return _builder;
}
- public StringConcatenation operationsImplementation(final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence operationsImplementation(final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
this.translator.setActorClass(ac);
DetailCodeTranslator _detailCodeTranslator = new DetailCodeTranslator(ac, this.translator);
@@ -617,18 +610,18 @@ public class ProcedureHelpers {
EList<StandardOperation> _operations = ac.getOperations();
for(final StandardOperation operation : _operations) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _usesInheritance = this.languageExt.usesInheritance();
if (!_usesInheritance) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isConstructor = RoomHelpers.isConstructor(operation);
- _operator_and = BooleanExtensions.operator_and(_usesInheritance, _isConstructor);
+ _and = (_usesInheritance && _isConstructor);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
+ boolean _not = (!_and);
+ if (_not) {
String _name = ac.getName();
- StringConcatenation _operationSignature = this.operationSignature(operation, _name, false);
+ CharSequence _operationSignature = this.operationSignature(operation, _name, false);
_builder.append(_operationSignature, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -648,30 +641,30 @@ public class ProcedureHelpers {
return _xblockexpression;
}
- private StringConcatenation operationSignature(final Operation operation, final String classname, final boolean isDeclaration) {
- StringConcatenation _xifexpression = null;
+ private CharSequence operationSignature(final Operation operation, final String classname, final boolean isDeclaration) {
+ CharSequence _xifexpression = null;
boolean _isConstructor = RoomHelpers.isConstructor(operation);
if (_isConstructor) {
String _constructorName = this.languageExt.constructorName(classname);
String _constructorReturnType = this.languageExt.constructorReturnType();
- StringConcatenation _classOperationSignature = this.classOperationSignature(classname, _constructorName, "", _constructorReturnType, isDeclaration);
+ CharSequence _classOperationSignature = this.classOperationSignature(classname, _constructorName, "", _constructorReturnType, isDeclaration);
_xifexpression = _classOperationSignature;
} else {
- StringConcatenation _xifexpression_1 = null;
+ CharSequence _xifexpression_1 = null;
boolean _isDestructor = RoomHelpers.isDestructor(operation);
if (_isDestructor) {
String _destructorName = this.languageExt.destructorName(classname);
String _destructorReturnType = this.languageExt.destructorReturnType();
- StringConcatenation _classOperationSignature_1 = this.classOperationSignature(classname, _destructorName, "", _destructorReturnType, isDeclaration);
+ CharSequence _classOperationSignature_1 = this.classOperationSignature(classname, _destructorName, "", _destructorReturnType, isDeclaration);
_xifexpression_1 = _classOperationSignature_1;
} else {
String _name = operation.getName();
EList<VarDecl> _arguments = operation.getArguments();
- StringConcatenation _BuildArgumentList = this.BuildArgumentList(_arguments);
+ CharSequence _BuildArgumentList = this.BuildArgumentList(_arguments);
String _string = _BuildArgumentList.toString();
RefableType _returntype = operation.getReturntype();
String _dataTypeToString = this.dataTypeToString(_returntype);
- StringConcatenation _classOperationSignature_2 = this.classOperationSignature(classname, _name, _string, _dataTypeToString, isDeclaration);
+ CharSequence _classOperationSignature_2 = this.classOperationSignature(classname, _name, _string, _dataTypeToString, isDeclaration);
_xifexpression_1 = _classOperationSignature_2;
}
_xifexpression = _xifexpression_1;
@@ -681,8 +674,8 @@ public class ProcedureHelpers {
private String dataTypeToString(final RefableType type) {
String _xifexpression = null;
- boolean _operator_equals = ObjectExtensions.operator_equals(type, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(type, null);
+ if (_equals) {
_xifexpression = "void";
} else {
String _xifexpression_1 = null;
@@ -691,8 +684,8 @@ public class ProcedureHelpers {
DataType _type = type.getType();
String _typeName = this._typeHelpers.typeName(_type);
String _pointerLiteral = this.languageExt.pointerLiteral();
- String _operator_plus = StringExtensions.operator_plus(_typeName, _pointerLiteral);
- _xifexpression_1 = _operator_plus;
+ String _plus = (_typeName + _pointerLiteral);
+ _xifexpression_1 = _plus;
} else {
DataType _type_1 = type.getType();
String _typeName_1 = this._typeHelpers.typeName(_type_1);
@@ -706,13 +699,13 @@ public class ProcedureHelpers {
/**
* builds comma separated argument list as string from EList<VarDecl> arguments
*/
- private StringConcatenation BuildArgumentList(final EList<VarDecl> arguments) {
+ private CharSequence BuildArgumentList(final EList<VarDecl> arguments) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final VarDecl argument : arguments) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
@@ -736,7 +729,7 @@ public class ProcedureHelpers {
return _builder;
}
- private StringConcatenation classOperationSignature(final String classname, final String operationname, final String argumentList, final String returnType, final boolean isDeclaration) {
+ private CharSequence classOperationSignature(final String classname, final String operationname, final String argumentList, final String returnType, final boolean isDeclaration) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -746,8 +739,8 @@ public class ProcedureHelpers {
_builder.append(_memberInDeclaration, "");
_builder.append("(");
boolean _isEmpty = argumentList.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- String _selfPointer = this.languageExt.selfPointer(classname, _operator_not);
+ boolean _not = (!_isEmpty);
+ String _selfPointer = this.languageExt.selfPointer(classname, _not);
_builder.append(_selfPointer, "");
_builder.append(argumentList, "");
_builder.append(")");
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
index 868b66dce..30d6ddb1f 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
@@ -1,5 +1,7 @@
package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
import com.google.inject.Singleton;
import java.io.File;
import java.util.ArrayList;
@@ -24,7 +26,6 @@ import org.eclipse.etrice.core.room.ExternalPort;
import org.eclipse.etrice.core.room.GeneralProtocolClass;
import org.eclipse.etrice.core.room.Guard;
import org.eclipse.etrice.core.room.InitialTransition;
-import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
import org.eclipse.etrice.core.room.MessageHandler;
import org.eclipse.etrice.core.room.Port;
@@ -49,43 +50,37 @@ import org.eclipse.etrice.core.room.TriggeredTransition;
import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.base.CodegenHelpers;
import org.eclipse.etrice.generator.base.DetailCodeTranslator;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.CollectionExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class RoomExtensions {
public <T extends Object> List<T> union(final List<T> l1, final List<T> l2) {
- ArrayList<T> _arrayList = new ArrayList<T>();
- ArrayList<T> ret = _arrayList;
- ret.addAll(l1);
- ret.addAll(l2);
- return ret;
+ ArrayList<T> _arrayList = new ArrayList<T>();
+ ArrayList<T> ret = _arrayList;
+ ret.addAll(l1);
+ ret.addAll(l2);
+ return ret;
}
public <T extends Object> Iterable<T> union(final Iterable<T> l1, final Iterable<T> l2) {
- ArrayList<T> _arrayList = new ArrayList<T>();
- ArrayList<T> ret = _arrayList;
- CollectionExtensions.<T>addAll(ret, l1);
- CollectionExtensions.<T>addAll(ret, l2);
- return ret;
+ ArrayList<T> _arrayList = new ArrayList<T>();
+ ArrayList<T> ret = _arrayList;
+ Iterables.<T>addAll(ret, l1);
+ Iterables.<T>addAll(ret, l2);
+ return ret;
}
public List<Port> punion(final List<Port> in1, final List<ExternalPort> in2) {
- ArrayList<Port> _arrayList = new ArrayList<Port>();
- ArrayList<Port> ret = _arrayList;
- for (final ExternalPort ele : in2) {
- Port _ifport = ele.getIfport();
- ret.add(_ifport);
- }
- ret.addAll(in1);
- return ret;
+ ArrayList<Port> _arrayList = new ArrayList<Port>();
+ ArrayList<Port> ret = _arrayList;
+ for (final ExternalPort ele : in2) {
+ Port _ifport = ele.getIfport();
+ ret.add(_ifport);
+ }
+ ret.addAll(in1);
+ return ret;
}
public String getGenerationPathSegment() {
@@ -97,28 +92,24 @@ public class RoomExtensions {
}
public String getModelPath(final EObject e) {
- Resource _eResource = e.eResource();
- Resource res = _eResource;
- boolean _operator_equals = ObjectExtensions.operator_equals(res, null);
- if (_operator_equals) {
- return "";
- } else {
- URI _uRI = res.getURI();
- String _fileString = _uRI.toFileString();
- return _fileString;
- }
+ Resource res = e.eResource();
+ boolean _equals = Objects.equal(res, null);
+ if (_equals) {
+ return "";
+ } else {
+ URI _uRI = res.getURI();
+ return _uRI.toFileString();
+ }
}
public String getPackage(final RoomClass rc) {
EObject _eContainer = rc.eContainer();
- String _name = ((RoomModel) _eContainer).getName();
- return _name;
+ return ((RoomModel) _eContainer).getName();
}
public String getPathFromPackage(final String packageName) {
String _replaceAll = packageName.replaceAll("\\.", "/");
- String _operator_plus = StringExtensions.operator_plus(_replaceAll, "/");
- return _operator_plus;
+ return (_replaceAll + "/");
}
public String getPath(final RoomClass rc) {
@@ -128,68 +119,61 @@ public class RoomExtensions {
}
public String getProjectPath(final EObject e) {
- Resource _eResource = e.eResource();
- Resource res = _eResource;
- boolean _operator_equals = ObjectExtensions.operator_equals(res, null);
- if (_operator_equals) {
+ Resource res = e.eResource();
+ boolean _equals = Objects.equal(res, null);
+ if (_equals) {
+ return "";
+ } else {
+ File _file = new File("");
+ File tmpf = _file;
+ URI _uRI = res.getURI();
+ String _fileString = _uRI.toFileString();
+ File _file_1 = new File(_fileString);
+ tmpf = _file_1;
+ boolean _isFile = tmpf.isFile();
+ boolean _not = (!_isFile);
+ if (_not) {
return "";
- } else {
+ }
+ boolean isProject = false;
+ boolean _dowhile = false;
+ do {
{
- File _file = new File("");
- File tmpf = _file;
- URI _uRI = res.getURI();
- String _fileString = _uRI.toFileString();
- File _file_1 = new File(_fileString);
- tmpf = _file_1;
- boolean _isFile = tmpf.isFile();
- boolean _operator_not = BooleanExtensions.operator_not(_isFile);
- if (_operator_not) {
- return "";
- }
- boolean isProject = false;
- Boolean _xdowhileexpression;
- do {
- {
- File _parentFile = tmpf.getParentFile();
- tmpf = _parentFile;
- String[] _list = tmpf.list();
- String[] contents = _list;
- for (final String f : contents) {
- boolean _equals = f.equals(".project");
- if (_equals) {
- isProject = true;
- }
- }
+ File _parentFile = tmpf.getParentFile();
+ tmpf = _parentFile;
+ String[] contents = tmpf.list();
+ for (final String f : contents) {
+ boolean _equals_1 = f.equals(".project");
+ if (_equals_1) {
+ isProject = true;
}
- boolean _operator_and = false;
- boolean _operator_not_1 = BooleanExtensions.operator_not(isProject);
- if (!_operator_not_1) {
- _operator_and = false;
- } else {
- File _parentFile_1 = tmpf.getParentFile();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_parentFile_1, null);
- _operator_and = BooleanExtensions.operator_and(_operator_not_1, _operator_notEquals);
- }
- _xdowhileexpression = _operator_and;
- } while(_xdowhileexpression);
- String _absolutePath = tmpf.getAbsolutePath();
- return _absolutePath;
+ }
}
- }
+ boolean _and = false;
+ boolean _not_1 = (!isProject);
+ if (!_not_1) {
+ _and = false;
+ } else {
+ File _parentFile = tmpf.getParentFile();
+ boolean _notEquals = (!Objects.equal(_parentFile, null));
+ _and = (_not_1 && _notEquals);
+ }
+ _dowhile = _and;
+ } while(_dowhile);
+ return tmpf.getAbsolutePath();
+ }
}
public String getGenerationTargetPath(final EObject e) {
String _projectPath = this.getProjectPath(e);
String _generationPathSegment = this.getGenerationPathSegment();
- String _operator_plus = StringExtensions.operator_plus(_projectPath, _generationPathSegment);
- return _operator_plus;
+ return (_projectPath + _generationPathSegment);
}
public String getDocGenerationTargetPath(final EObject e) {
String _projectPath = this.getProjectPath(e);
String _docGenerationPathSegment = this.getDocGenerationPathSegment();
- String _operator_plus = StringExtensions.operator_plus(_projectPath, _docGenerationPathSegment);
- return _operator_plus;
+ return (_projectPath + _docGenerationPathSegment);
}
public List<Port> getEndPorts(final ActorClass ac) {
@@ -202,15 +186,14 @@ public class RoomExtensions {
public List<Port> getAllEndPorts(final ActorClass ac) {
List<Port> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- List<Port> _endPorts = this.getEndPorts(ac);
- return _endPorts;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return this.getEndPorts(ac);
} else {
ActorClass _base_1 = ac.getBase();
List<Port> _allEndPorts = this.getAllEndPorts(_base_1);
- List<Port> _endPorts_1 = this.getEndPorts(ac);
- List<Port> _union = this.<Port>union(_allEndPorts, _endPorts_1);
+ List<Port> _endPorts = this.getEndPorts(ac);
+ List<Port> _union = this.<Port>union(_allEndPorts, _endPorts);
_xifexpression = _union;
}
return _xifexpression;
@@ -219,15 +202,14 @@ public class RoomExtensions {
public List<SAPRef> getAllSAPs(final ActorClass ac) {
List<SAPRef> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<SAPRef> _strSAPs = ac.getStrSAPs();
- return _strSAPs;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return ac.getStrSAPs();
} else {
ActorClass _base_1 = ac.getBase();
List<SAPRef> _allSAPs = this.getAllSAPs(_base_1);
- EList<SAPRef> _strSAPs_1 = ac.getStrSAPs();
- List<SAPRef> _union = this.<SAPRef>union(_allSAPs, _strSAPs_1);
+ EList<SAPRef> _strSAPs = ac.getStrSAPs();
+ List<SAPRef> _union = this.<SAPRef>union(_allSAPs, _strSAPs);
_xifexpression = _union;
}
return _xifexpression;
@@ -236,15 +218,14 @@ public class RoomExtensions {
public List<ServiceImplementation> getAllServiceImplementations(final ActorClass ac) {
List<ServiceImplementation> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
- return _serviceImplementations;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return ac.getServiceImplementations();
} else {
ActorClass _base_1 = ac.getBase();
List<ServiceImplementation> _allServiceImplementations = this.getAllServiceImplementations(_base_1);
- EList<ServiceImplementation> _serviceImplementations_1 = ac.getServiceImplementations();
- List<ServiceImplementation> _union = this.<ServiceImplementation>union(_allServiceImplementations, _serviceImplementations_1);
+ EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
+ List<ServiceImplementation> _union = this.<ServiceImplementation>union(_allServiceImplementations, _serviceImplementations);
_xifexpression = _union;
}
return _xifexpression;
@@ -258,15 +239,14 @@ public class RoomExtensions {
public List<Attribute> getAllAttributes(final DataClass dc) {
List<Attribute> _xifexpression = null;
DataClass _base = dc.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<Attribute> _attributes = dc.getAttributes();
- return _attributes;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return dc.getAttributes();
} else {
DataClass _base_1 = dc.getBase();
List<Attribute> _allAttributes = this.getAllAttributes(_base_1);
- EList<Attribute> _attributes_1 = dc.getAttributes();
- List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes_1);
+ EList<Attribute> _attributes = dc.getAttributes();
+ List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes);
_xifexpression = _union;
}
return _xifexpression;
@@ -275,15 +255,14 @@ public class RoomExtensions {
public List<Attribute> getAllAttributes(final ActorClass ac) {
List<Attribute> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<Attribute> _attributes = ac.getAttributes();
- return _attributes;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return ac.getAttributes();
} else {
ActorClass _base_1 = ac.getBase();
List<Attribute> _allAttributes = this.getAllAttributes(_base_1);
- EList<Attribute> _attributes_1 = ac.getAttributes();
- List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes_1);
+ EList<Attribute> _attributes = ac.getAttributes();
+ List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes);
_xifexpression = _union;
}
return _xifexpression;
@@ -306,14 +285,12 @@ public class RoomExtensions {
protected String _getPortClassName(final SAPRef sap) {
ProtocolClass _protocol = sap.getProtocol();
- String _portClassName = this.getPortClassName(_protocol, true);
- return _portClassName;
+ return this.getPortClassName(_protocol, true);
}
protected String _getPortClassName(final SPPRef spp) {
ProtocolClass _protocol = spp.getProtocol();
- String _portClassName = this.getPortClassName(_protocol, false, true);
- return _portClassName;
+ return this.getPortClassName(_protocol, false, true);
}
public String getPortClassName(final ProtocolClass p, final boolean conj) {
@@ -329,56 +306,51 @@ public class RoomExtensions {
} else {
_xifexpression = "";
}
- String _operator_plus = StringExtensions.operator_plus(_name, _xifexpression);
+ String _plus = (_name + _xifexpression);
String _xifexpression_1 = null;
if (repl) {
_xifexpression_1 = "Repl";
} else {
_xifexpression_1 = "";
}
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _xifexpression_1);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "Port");
- return _operator_plus_2;
+ String _plus_1 = (_plus + _xifexpression_1);
+ String _plus_2 = (_plus_1 + "Port");
+ return _plus_2;
}
- public String getPortClassName(final ExternalPort p) {
+ protected String _getPortClassName(final ExternalPort p) {
Port _ifport = p.getIfport();
- String _portClassName = this.getPortClassName(_ifport);
- return _portClassName;
+ return this.getPortClassName(_ifport);
}
- public String getPortClassName(final ServiceImplementation svc) {
+ protected String _getPortClassName(final ServiceImplementation svc) {
SPPRef _spp = svc.getSpp();
ProtocolClass _protocol = _spp.getProtocol();
- String _portClassName = this.getPortClassName(_protocol, false, true);
- return _portClassName;
+ return this.getPortClassName(_protocol, false, true);
}
public List<Message> getAllIncomingMessages(final ProtocolClass pc) {
ProtocolClass _base = pc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
ProtocolClass _base_1 = pc.getBase();
List<Message> _allIncomingMessages = this.getAllIncomingMessages(_base_1);
EList<Message> _incomingMessages = pc.getIncomingMessages();
- List<Message> _union = this.<Message>union(_allIncomingMessages, _incomingMessages);
- return _union;
+ return this.<Message>union(_allIncomingMessages, _incomingMessages);
} else {
- EList<Message> _incomingMessages_1 = pc.getIncomingMessages();
- return _incomingMessages_1;
+ return pc.getIncomingMessages();
}
}
public List<Message> getAllOutgoingMessages(final ProtocolClass pc) {
EList<Message> _xifexpression = null;
ProtocolClass _base = pc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
ProtocolClass _base_1 = pc.getBase();
List<Message> _allOutgoingMessages = this.getAllOutgoingMessages(_base_1);
EList<Message> _outgoingMessages = pc.getOutgoingMessages();
- List<Message> _union = this.<Message>union(_allOutgoingMessages, _outgoingMessages);
- return _union;
+ return this.<Message>union(_allOutgoingMessages, _outgoingMessages);
} else {
EList<Message> _outgoingMessages_1 = pc.getOutgoingMessages();
_xifexpression = _outgoingMessages_1;
@@ -388,79 +360,72 @@ public class RoomExtensions {
public List<Message> getIncoming(final ProtocolClass pc, final boolean conj) {
if (conj) {
- List<Message> _allOutgoingMessages = this.getAllOutgoingMessages(pc);
- return _allOutgoingMessages;
+ return this.getAllOutgoingMessages(pc);
} else {
- List<Message> _allIncomingMessages = this.getAllIncomingMessages(pc);
- return _allIncomingMessages;
+ return this.getAllIncomingMessages(pc);
}
}
public List<Message> getOutgoing(final ProtocolClass pc, final boolean conj) {
if (conj) {
- List<Message> _allIncomingMessages = this.getAllIncomingMessages(pc);
- return _allIncomingMessages;
+ return this.getAllIncomingMessages(pc);
} else {
- List<Message> _allOutgoingMessages = this.getAllOutgoingMessages(pc);
- return _allOutgoingMessages;
+ return this.getAllOutgoingMessages(pc);
}
}
public PortClass getPortClass(final ProtocolClass pc, final boolean conj) {
if (conj) {
- PortClass _conjugate = pc.getConjugate();
- return _conjugate;
+ return pc.getConjugate();
} else {
- PortClass _regular = pc.getRegular();
- return _regular;
+ return pc.getRegular();
}
}
public boolean handlesSend(final ProtocolClass pc, final boolean conj) {
- PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
- return false;
- } else {
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _outgoing = this.getOutgoing(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _outgoing.contains(_msg);
- if (_contains) {
- return true;
- }
+ PortClass _portClass = this.getPortClass(pc, conj);
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
+ return false;
+ } else {
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _outgoing = this.getOutgoing(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _outgoing.contains(_msg);
+ if (_contains) {
+ return true;
}
}
- return false;
+ }
+ return false;
}
public boolean handlesReceive(final ProtocolClass pc, final boolean conj) {
- PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
- return false;
- } else {
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _incoming = this.getIncoming(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _incoming.contains(_msg);
- if (_contains) {
- return true;
- }
+ PortClass _portClass = this.getPortClass(pc, conj);
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
+ return false;
+ } else {
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _incoming = this.getIncoming(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _incoming.contains(_msg);
+ if (_contains) {
+ return true;
}
}
- return false;
+ }
+ return false;
}
public boolean isConjugated(final InterfaceItemInstance iii) {
if ((iii instanceof PortInstance)) {
Port _port = ((PortInstance) iii).getPort();
- boolean _isConjugated = _port.isConjugated();
- return _isConjugated;
+ return _port.isConjugated();
} else {
if ((iii instanceof SAPInstance)) {
return true;
@@ -476,51 +441,47 @@ public class RoomExtensions {
public List<MessageHandler> getReceiveHandlers(final ProtocolClass pc, final boolean conj) {
PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
ArrayList<MessageHandler> _arrayList = new ArrayList<MessageHandler>();
return _arrayList;
} else {
- {
- ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
- ArrayList<MessageHandler> res = _arrayList_1;
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _incoming = this.getIncoming(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _incoming.contains(_msg);
- if (_contains) {
- res.add(hdlr);
- }
+ ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
+ ArrayList<MessageHandler> res = _arrayList_1;
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _incoming = this.getIncoming(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _incoming.contains(_msg);
+ if (_contains) {
+ res.add(hdlr);
}
- return res;
}
+ return res;
}
}
public List<MessageHandler> getSendHandlers(final ProtocolClass pc, final boolean conj) {
PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
ArrayList<MessageHandler> _arrayList = new ArrayList<MessageHandler>();
return _arrayList;
} else {
- {
- ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
- ArrayList<MessageHandler> res = _arrayList_1;
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _outgoing = this.getOutgoing(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _outgoing.contains(_msg);
- if (_contains) {
- res.add(hdlr);
- }
+ ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
+ ArrayList<MessageHandler> res = _arrayList_1;
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _outgoing = this.getOutgoing(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _outgoing.contains(_msg);
+ if (_contains) {
+ res.add(hdlr);
}
- return res;
}
+ return res;
}
}
@@ -530,135 +491,127 @@ public class RoomExtensions {
final Function1<MessageHandler,Boolean> _function = new Function1<MessageHandler,Boolean>() {
public Boolean apply(final MessageHandler e) {
Message _msg = e.getMsg();
- boolean _operator_equals = ObjectExtensions.operator_equals(_msg, m);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_msg, m);
+ return Boolean.valueOf(_equals);
}
};
- MessageHandler _findFirst = IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function);
- return _findFirst;
+ return IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function);
}
public boolean isIncoming(final Message m) {
EObject _eContainer = m.eContainer();
List<Message> _allIncomingMessages = this.getAllIncomingMessages(((ProtocolClass) _eContainer));
- boolean _contains = _allIncomingMessages.contains(m);
- return _contains;
+ return _allIncomingMessages.contains(m);
}
public String getCodeName(final Message m) {
boolean _isIncoming = this.isIncoming(m);
if (_isIncoming) {
String _name = m.getName();
- String _operator_plus = StringExtensions.operator_plus("IN_", _name);
- return _operator_plus;
+ return ("IN_" + _name);
} else {
String _name_1 = m.getName();
- String _operator_plus_1 = StringExtensions.operator_plus("OUT_", _name_1);
- return _operator_plus_1;
+ return ("OUT_" + _name_1);
}
}
public boolean isLeaf(final State s) {
StateGraph _subgraph = s.getSubgraph();
- boolean _operator_equals = ObjectExtensions.operator_equals(_subgraph, null);
- return _operator_equals;
+ boolean _equals = Objects.equal(_subgraph, null);
+ return _equals;
}
public List<State> getLeafStateList(final StateGraph sg) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> res = _arrayList;
- EList<State> _states = sg.getStates();
- for (final State s : _states) {
- List<State> _leafStateList = this.getLeafStateList(s);
- res.addAll(_leafStateList);
- }
- return res;
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> res = _arrayList;
+ EList<State> _states = sg.getStates();
+ for (final State s : _states) {
+ List<State> _leafStateList = this.getLeafStateList(s);
+ res.addAll(_leafStateList);
+ }
+ return res;
}
public List<State> getLeafStateList(final State s) {
boolean _isLeaf = this.isLeaf(s);
if (_isLeaf) {
- {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> res = _arrayList;
- res.add(s);
- return res;
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> res = _arrayList;
+ res.add(s);
+ return res;
} else {
StateGraph _subgraph = s.getSubgraph();
- List<State> _leafStateList = this.getLeafStateList(_subgraph);
- return _leafStateList;
+ return this.getLeafStateList(_subgraph);
}
}
public List<State> getStateList(final StateGraph sg) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> ret = _arrayList;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(sg, null);
- if (_operator_notEquals) {
- EList<State> _states = sg.getStates();
- for (final State e : _states) {
- {
- ret.add(e);
- StateGraph _subgraph = e.getSubgraph();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_subgraph, null);
- if (_operator_notEquals_1) {
- StateGraph _subgraph_1 = e.getSubgraph();
- List<State> _stateList = this.getStateList(_subgraph_1);
- ret.addAll(_stateList);
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> ret = _arrayList;
+ boolean _notEquals = (!Objects.equal(sg, null));
+ if (_notEquals) {
+ EList<State> _states = sg.getStates();
+ for (final State e : _states) {
+ {
+ ret.add(e);
+ StateGraph _subgraph = e.getSubgraph();
+ boolean _notEquals_1 = (!Objects.equal(_subgraph, null));
+ if (_notEquals_1) {
+ StateGraph _subgraph_1 = e.getSubgraph();
+ List<State> _stateList = this.getStateList(_subgraph_1);
+ ret.addAll(_stateList);
}
}
}
- return ret;
+ }
+ return ret;
}
public List<State> getBaseStateList(final StateGraph sg) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> ret = _arrayList;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(sg, null);
- if (_operator_notEquals) {
- List<State> _stateList = this.getStateList(sg);
- for (final State e : _stateList) {
- if ((e instanceof SimpleState)) {
- ret.add(e);
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> ret = _arrayList;
+ boolean _notEquals = (!Objects.equal(sg, null));
+ if (_notEquals) {
+ List<State> _stateList = this.getStateList(sg);
+ for (final State e : _stateList) {
+ if ((e instanceof SimpleState)) {
+ ret.add(e);
}
}
- return ret;
+ }
+ return ret;
}
public ArrayList<State> getLeafStatesLast(final List<State> states) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> leaf = _arrayList;
- ArrayList<State> _arrayList_1 = new ArrayList<State>();
- ArrayList<State> nonLeaf = _arrayList_1;
- for (final State state : states) {
- boolean _isLeaf = this.isLeaf(state);
- if (_isLeaf) {
- leaf.add(state);
- } else {
- nonLeaf.add(state);
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> leaf = _arrayList;
+ ArrayList<State> _arrayList_1 = new ArrayList<State>();
+ ArrayList<State> nonLeaf = _arrayList_1;
+ for (final State state : states) {
+ boolean _isLeaf = this.isLeaf(state);
+ if (_isLeaf) {
+ leaf.add(state);
+ } else {
+ nonLeaf.add(state);
}
- nonLeaf.addAll(leaf);
- return nonLeaf;
+ }
+ nonLeaf.addAll(leaf);
+ return nonLeaf;
}
public List<State> getAllBaseStates(final ActorClass ac) {
List<State> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
StateGraph _stateMachine = ac.getStateMachine();
- List<State> _baseStateList = this.getBaseStateList(_stateMachine);
- return _baseStateList;
+ return this.getBaseStateList(_stateMachine);
} else {
ActorClass _base_1 = ac.getBase();
List<State> _allBaseStates = this.getAllBaseStates(_base_1);
StateGraph _stateMachine_1 = ac.getStateMachine();
- List<State> _baseStateList_1 = this.getBaseStateList(_stateMachine_1);
- List<State> _union = this.<State>union(_allBaseStates, _baseStateList_1);
+ List<State> _baseStateList = this.getBaseStateList(_stateMachine_1);
+ List<State> _union = this.<State>union(_allBaseStates, _baseStateList);
_xifexpression = _union;
}
return _xifexpression;
@@ -667,20 +620,19 @@ public class RoomExtensions {
public List<State> getAllBaseStatesLeavesLast(final ActorClass ac) {
List<State> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
StateGraph _stateMachine = ac.getStateMachine();
List<State> _baseStateList = this.getBaseStateList(_stateMachine);
- ArrayList<State> _leafStatesLast = this.getLeafStatesLast(_baseStateList);
- return _leafStatesLast;
+ return this.getLeafStatesLast(_baseStateList);
} else {
ActorClass _base_1 = ac.getBase();
List<State> _allBaseStates = this.getAllBaseStates(_base_1);
- ArrayList<State> _leafStatesLast_1 = this.getLeafStatesLast(_allBaseStates);
+ ArrayList<State> _leafStatesLast = this.getLeafStatesLast(_allBaseStates);
StateGraph _stateMachine_1 = ac.getStateMachine();
List<State> _baseStateList_1 = this.getBaseStateList(_stateMachine_1);
- ArrayList<State> _leafStatesLast_2 = this.getLeafStatesLast(_baseStateList_1);
- List<State> _union = this.<State>union(_leafStatesLast_1, _leafStatesLast_2);
+ ArrayList<State> _leafStatesLast_1 = this.getLeafStatesLast(_baseStateList_1);
+ List<State> _union = this.<State>union(_leafStatesLast, _leafStatesLast_1);
_xifexpression = _union;
}
return _xifexpression;
@@ -689,71 +641,70 @@ public class RoomExtensions {
public List<State> getAllLeafStates(final ActorClass ac) {
List<State> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
StateGraph _stateMachine = ac.getStateMachine();
- List<State> _leafStateList = this.getLeafStateList(_stateMachine);
- return _leafStateList;
+ return this.getLeafStateList(_stateMachine);
} else {
ActorClass _base_1 = ac.getBase();
List<State> _allLeafStates = this.getAllLeafStates(_base_1);
StateGraph _stateMachine_1 = ac.getStateMachine();
- List<State> _leafStateList_1 = this.getLeafStateList(_stateMachine_1);
- List<State> _union = this.<State>union(_allLeafStates, _leafStateList_1);
+ List<State> _leafStateList = this.getLeafStateList(_stateMachine_1);
+ List<State> _union = this.<State>union(_allLeafStates, _leafStateList);
_xifexpression = _union;
}
return _xifexpression;
}
public boolean overridesStop(final ActorClass ac) {
- boolean _operator_or = false;
+ boolean _or = false;
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation e) {
- boolean _operator_and = false;
- boolean _operator_and_1 = false;
+ boolean _and = false;
+ boolean _and_1 = false;
String _name = e.getName();
- boolean _operator_equals = ObjectExtensions.operator_equals(_name, "stop");
- if (!_operator_equals) {
- _operator_and_1 = false;
+ boolean _equals = Objects.equal(_name, "stop");
+ if (!_equals) {
+ _and_1 = false;
} else {
EList<VarDecl> _arguments = e.getArguments();
boolean _isEmpty = _arguments.isEmpty();
- _operator_and_1 = BooleanExtensions.operator_and(_operator_equals, _isEmpty);
+ _and_1 = (_equals && _isEmpty);
}
- if (!_operator_and_1) {
- _operator_and = false;
+ if (!_and_1) {
+ _and = false;
} else {
RefableType _returntype = e.getReturntype();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_returntype, null);
- _operator_and = BooleanExtensions.operator_and(_operator_and_1, _operator_equals_1);
+ boolean _equals_1 = Objects.equal(_returntype, null);
+ _and = (_and_1 && _equals_1);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
boolean _exists = IterableExtensions.<StandardOperation>exists(_operations, _function);
if (_exists) {
- _operator_or = true;
+ _or = true;
} else {
- boolean _operator_and = false;
+ boolean _and = false;
ActorClass _base = ac.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (!_operator_notEquals) {
- _operator_and = false;
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (!_notEquals) {
+ _and = false;
} else {
ActorClass _base_1 = ac.getBase();
boolean _overridesStop = this.overridesStop(_base_1);
- _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _overridesStop);
+ _and = (_notEquals && _overridesStop);
}
- _operator_or = BooleanExtensions.operator_or(_exists, _operator_and);
+ _or = (_exists || _and);
}
- return _operator_or;
+ return _or;
}
public int getNumberOfInheritedStates(final ActorClass ac) {
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
return 0;
} else {
ActorClass _base_1 = ac.getBase();
@@ -762,15 +713,14 @@ public class RoomExtensions {
int _size = _stateList.size();
ActorClass _base_2 = ac.getBase();
int _numberOfInheritedStates = this.getNumberOfInheritedStates(_base_2);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_size), ((Integer)_numberOfInheritedStates));
- return _operator_plus;
+ return (_size + _numberOfInheritedStates);
}
}
public int getNumberOfInheritedBaseStates(final ActorClass ac) {
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
return 0;
} else {
ActorClass _base_1 = ac.getBase();
@@ -779,123 +729,119 @@ public class RoomExtensions {
int _size = _baseStateList.size();
ActorClass _base_2 = ac.getBase();
int _numberOfInheritedBaseStates = this.getNumberOfInheritedBaseStates(_base_2);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_size), ((Integer)_numberOfInheritedBaseStates));
- return _operator_plus;
+ return (_size + _numberOfInheritedBaseStates);
}
}
public String getStateId(final State s) {
- String _genStateId = CodegenHelpers.getGenStateId(s);
- return _genStateId;
+ return CodegenHelpers.getGenStateId(s);
}
public String getStatePathName(final State s) {
- String _genStatePathName = CodegenHelpers.getGenStatePathName(s);
- return _genStatePathName;
+ return CodegenHelpers.getGenStatePathName(s);
}
public String getChainId(final TransitionChain t) {
- String _genChainId = CodegenHelpers.getGenChainId(t);
- return _genChainId;
+ return CodegenHelpers.getGenChainId(t);
}
public boolean hasGuard(final Trigger tr) {
- boolean _operator_and = false;
- boolean _operator_and_1 = false;
+ boolean _and = false;
+ boolean _and_1 = false;
Guard _guard = tr.getGuard();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_guard, null);
- if (!_operator_notEquals) {
- _operator_and_1 = false;
+ boolean _notEquals = (!Objects.equal(_guard, null));
+ if (!_notEquals) {
+ _and_1 = false;
} else {
Guard _guard_1 = tr.getGuard();
DetailCode _guard_2 = _guard_1.getGuard();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_guard_2, null);
- _operator_and_1 = BooleanExtensions.operator_and(_operator_notEquals, _operator_notEquals_1);
+ boolean _notEquals_1 = (!Objects.equal(_guard_2, null));
+ _and_1 = (_notEquals && _notEquals_1);
}
- if (!_operator_and_1) {
- _operator_and = false;
+ if (!_and_1) {
+ _and = false;
} else {
Guard _guard_3 = tr.getGuard();
DetailCode _guard_4 = _guard_3.getGuard();
EList<String> _commands = _guard_4.getCommands();
int _size = _commands.size();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)0));
- _operator_and = BooleanExtensions.operator_and(_operator_and_1, _operator_greaterThan);
+ boolean _greaterThan = (_size > 0);
+ _and = (_and_1 && _greaterThan);
}
- return _operator_and;
+ return _and;
}
public boolean hasGuard(final ExpandedActorClass ac, final ActiveTrigger at) {
- boolean hasGuard = false;
- EList<TriggeredTransition> _transitions = at.getTransitions();
- for (final TriggeredTransition t : _transitions) {
- EList<Trigger> _triggers = t.getTriggers();
- final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
- public Boolean apply(final Trigger e) {
- boolean _operator_and = false;
- String _trigger = at.getTrigger();
- boolean _isMatching = ac.isMatching(e, _trigger);
- if (!_isMatching) {
- _operator_and = false;
- } else {
- boolean _hasGuard = RoomExtensions.this.hasGuard(e);
- _operator_and = BooleanExtensions.operator_and(_isMatching, _hasGuard);
- }
- return ((Boolean)_operator_and);
+ boolean hasGuard = false;
+ EList<TriggeredTransition> _transitions = at.getTransitions();
+ for (final TriggeredTransition t : _transitions) {
+ EList<Trigger> _triggers = t.getTriggers();
+ final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
+ public Boolean apply(final Trigger e) {
+ boolean _and = false;
+ String _trigger = at.getTrigger();
+ boolean _isMatching = ac.isMatching(e, _trigger);
+ if (!_isMatching) {
+ _and = false;
+ } else {
+ boolean _hasGuard = RoomExtensions.this.hasGuard(e);
+ _and = (_isMatching && _hasGuard);
}
- };
- boolean _exists = IterableExtensions.<Trigger>exists(_triggers, _function);
- if (_exists) {
- hasGuard = true;
- }
+ return Boolean.valueOf(_and);
+ }
+ };
+ boolean _exists = IterableExtensions.<Trigger>exists(_triggers, _function);
+ if (_exists) {
+ hasGuard = true;
}
- return hasGuard;
+ }
+ return hasGuard;
}
public boolean empty(final DetailCode dc) {
- boolean _operator_or = false;
- boolean _operator_equals = ObjectExtensions.operator_equals(dc, null);
- if (_operator_equals) {
- _operator_or = true;
+ boolean _or = false;
+ boolean _equals = Objects.equal(dc, null);
+ if (_equals) {
+ _or = true;
} else {
EList<String> _commands = dc.getCommands();
boolean _isEmpty = _commands.isEmpty();
- _operator_or = BooleanExtensions.operator_or(_operator_equals, _isEmpty);
+ _or = (_equals || _isEmpty);
}
- return _operator_or;
+ return _or;
}
public boolean hasEntryCode(final State s) {
DetailCode _entryCode = s.getEntryCode();
boolean _empty = this.empty(_entryCode);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- return _operator_not;
+ boolean _not = (!_empty);
+ return _not;
}
public boolean hasExitCode(final State s) {
DetailCode _exitCode = s.getExitCode();
boolean _empty = this.empty(_exitCode);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- return _operator_not;
+ boolean _not = (!_empty);
+ return _not;
}
public boolean hasDoCode(final State s) {
DetailCode _doCode = s.getDoCode();
boolean _empty = this.empty(_doCode);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- return _operator_not;
+ boolean _not = (!_empty);
+ return _not;
}
public String getEntryCode(final ExpandedActorClass ac, final State s, final DetailCodeTranslator dct) {
String _xifexpression = null;
if ((s instanceof RefinedState)) {
String _entryCodeOperationName = CodegenHelpers.getEntryCodeOperationName(s);
- String _operator_plus = StringExtensions.operator_plus("super.", _entryCodeOperationName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "();\n");
+ String _plus = ("super." + _entryCodeOperationName);
+ String _plus_1 = (_plus + "();\n");
DetailCode _entryCode = s.getEntryCode();
String _code = ac.getCode(_entryCode);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _code);
- _xifexpression = _operator_plus_2;
+ String _plus_2 = (_plus_1 + _code);
+ _xifexpression = _plus_2;
} else {
DetailCode _entryCode_1 = s.getEntryCode();
String _translateDetailCode = dct.translateDetailCode(_entryCode_1);
@@ -909,11 +855,11 @@ public class RoomExtensions {
if ((s instanceof RefinedState)) {
DetailCode _exitCode = s.getExitCode();
String _code = ac.getCode(_exitCode);
- String _operator_plus = StringExtensions.operator_plus(_code, "super.");
+ String _plus = (_code + "super.");
String _exitCodeOperationName = CodegenHelpers.getExitCodeOperationName(s);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _exitCodeOperationName);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "();\n");
- _xifexpression = _operator_plus_2;
+ String _plus_1 = (_plus + _exitCodeOperationName);
+ String _plus_2 = (_plus_1 + "();\n");
+ _xifexpression = _plus_2;
} else {
DetailCode _exitCode_1 = s.getExitCode();
String _translateDetailCode = dct.translateDetailCode(_exitCode_1);
@@ -927,11 +873,11 @@ public class RoomExtensions {
if ((s instanceof RefinedState)) {
DetailCode _doCode = s.getDoCode();
String _code = ac.getCode(_doCode);
- String _operator_plus = StringExtensions.operator_plus(_code, "super.");
+ String _plus = (_code + "super.");
String _doCodeOperationName = CodegenHelpers.getDoCodeOperationName(s);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _doCodeOperationName);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "();\n");
- _xifexpression = _operator_plus_2;
+ String _plus_1 = (_plus + _doCodeOperationName);
+ String _plus_2 = (_plus_1 + "();\n");
+ _xifexpression = _plus_2;
} else {
DetailCode _doCode_1 = s.getDoCode();
String _translateDetailCode = dct.translateDetailCode(_doCode_1);
@@ -941,19 +887,19 @@ public class RoomExtensions {
}
public boolean hasActionCode(final Transition t) {
- boolean _operator_and = false;
+ boolean _and = false;
DetailCode _action = t.getAction();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_action, null);
- if (!_operator_notEquals) {
- _operator_and = false;
+ boolean _notEquals = (!Objects.equal(_action, null));
+ if (!_notEquals) {
+ _and = false;
} else {
DetailCode _action_1 = t.getAction();
EList<String> _commands = _action_1.getCommands();
int _size = _commands.size();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)0));
- _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _operator_greaterThan);
+ boolean _greaterThan = (_size > 0);
+ _and = (_notEquals && _greaterThan);
}
- return _operator_and;
+ return _and;
}
public String getActionCode(final ExpandedActorClass ac, final Transition t, final DetailCodeTranslator dct) {
@@ -969,23 +915,23 @@ public class RoomExtensions {
}
public Transition getInitTransition(final StateGraph sg) {
- EList<Transition> _transitions = sg.getTransitions();
- for (final Transition tr : _transitions) {
- if ((tr instanceof InitialTransition)) {
- return tr;
- }
+ EList<Transition> _transitions = sg.getTransitions();
+ for (final Transition tr : _transitions) {
+ if ((tr instanceof InitialTransition)) {
+ return tr;
}
- return null;
+ }
+ return null;
}
public boolean hasInitTransition(final StateGraph sg) {
- EList<Transition> _transitions = sg.getTransitions();
- for (final Transition tr : _transitions) {
- if ((tr instanceof InitialTransition)) {
- return true;
- }
+ EList<Transition> _transitions = sg.getTransitions();
+ for (final Transition tr : _transitions) {
+ if ((tr instanceof InitialTransition)) {
+ return true;
}
- return false;
+ }
+ return false;
}
public List<Transition> getTransitionList(final State s) {
@@ -995,53 +941,56 @@ public class RoomExtensions {
return _arrayList;
} else {
StateGraph _subgraph = s.getSubgraph();
- List<Transition> _transitionList = this.getTransitionList(_subgraph);
- return _transitionList;
+ return this.getTransitionList(_subgraph);
}
}
public List<Transition> getTransitionList(final StateGraph sg) {
- EList<Transition> _transitions = sg.getTransitions();
- ArrayList<Transition> _arrayList = new ArrayList<Transition>(_transitions);
- ArrayList<Transition> res = _arrayList;
- EList<State> _states = sg.getStates();
- for (final State s : _states) {
- List<Transition> _transitionList = this.getTransitionList(s);
- res.addAll(_transitionList);
- }
- return res;
+ EList<Transition> _transitions = sg.getTransitions();
+ ArrayList<Transition> _arrayList = new ArrayList<Transition>(_transitions);
+ ArrayList<Transition> res = _arrayList;
+ EList<State> _states = sg.getStates();
+ for (final State s : _states) {
+ List<Transition> _transitionList = this.getTransitionList(s);
+ res.addAll(_transitionList);
+ }
+ return res;
}
public List<Transition> getOutgoingTransitionsHierarchical(final ExpandedActorClass ac, final State s) {
- ArrayList<Transition> _arrayList = new ArrayList<Transition>();
- ArrayList<Transition> result = _arrayList;
- EList<Transition> _outgoingTransitions = ac.getOutgoingTransitions(s);
- result.addAll(_outgoingTransitions);
- EObject _eContainer = s.eContainer();
- StateGraph sg = ((StateGraph) _eContainer);
- EList<TrPoint> _trPoints = sg.getTrPoints();
- for (final TrPoint tp : _trPoints) {
- if ((tp instanceof TransitionPoint)) {
- EList<Transition> _outgoingTransitions_1 = ac.getOutgoingTransitions(tp);
- result.addAll(_outgoingTransitions_1);
- }
+ ArrayList<Transition> _arrayList = new ArrayList<Transition>();
+ ArrayList<Transition> result = _arrayList;
+ EList<Transition> _outgoingTransitions = ac.getOutgoingTransitions(s);
+ result.addAll(_outgoingTransitions);
+ EObject _eContainer = s.eContainer();
+ StateGraph sg = ((StateGraph) _eContainer);
+ EList<TrPoint> _trPoints = sg.getTrPoints();
+ for (final TrPoint tp : _trPoints) {
+ if ((tp instanceof TransitionPoint)) {
+ EList<Transition> _outgoingTransitions_1 = ac.getOutgoingTransitions(tp);
+ result.addAll(_outgoingTransitions_1);
}
- EObject _eContainer_1 = sg.eContainer();
- if ((_eContainer_1 instanceof State)) {
- EObject _eContainer_2 = sg.eContainer();
- List<Transition> _outgoingTransitionsHierarchical = this.getOutgoingTransitionsHierarchical(ac, ((State) _eContainer_2));
- result.addAll(_outgoingTransitionsHierarchical);
- }
- return result;
+ }
+ EObject _eContainer_1 = sg.eContainer();
+ if ((_eContainer_1 instanceof State)) {
+ EObject _eContainer_2 = sg.eContainer();
+ List<Transition> _outgoingTransitionsHierarchical = this.getOutgoingTransitionsHierarchical(ac, ((State) _eContainer_2));
+ result.addAll(_outgoingTransitionsHierarchical);
+ }
+ return result;
}
- public String getPortClassName(final InterfaceItem p) {
+ public String getPortClassName(final EObject p) {
if (p instanceof Port) {
return _getPortClassName((Port)p);
} else if (p instanceof SAPRef) {
return _getPortClassName((SAPRef)p);
} else if (p instanceof SPPRef) {
return _getPortClassName((SPPRef)p);
+ } else if (p instanceof ExternalPort) {
+ return _getPortClassName((ExternalPort)p);
+ } else if (p instanceof ServiceImplementation) {
+ return _getPortClassName((ServiceImplementation)p);
} else {
throw new IllegalArgumentException("Unhandled parameter types: " +
Arrays.<Object>asList(p).toString());
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
index 977106d7c..87a7ac65a 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
@@ -9,44 +9,37 @@ import org.eclipse.etrice.core.room.PrimitiveType;
import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class TypeHelpers {
@Inject
private AbstractTransitionChainGenerator chainGenerator;
public String typeName(final DataType type) {
if ((type instanceof PrimitiveType)) {
- String _targetName = ((PrimitiveType) type).getTargetName();
- return _targetName;
+ return ((PrimitiveType) type).getTargetName();
} else {
if ((type instanceof ExternalType)) {
- String _targetName_1 = ((ExternalType) type).getTargetName();
- return _targetName_1;
+ return ((ExternalType) type).getTargetName();
} else {
- String _name = type.getName();
- return _name;
+ return type.getName();
}
}
}
public String defaultValue(final DataType dt) {
if ((dt instanceof PrimitiveType)) {
- String _defaultValueLiteral = ((PrimitiveType) dt).getDefaultValueLiteral();
- return _defaultValueLiteral;
+ return ((PrimitiveType) dt).getDefaultValueLiteral();
} else {
if ((dt instanceof ExternalType)) {
String _targetName = ((ExternalType) dt).getTargetName();
- String _operator_plus = StringExtensions.operator_plus("new ", _targetName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "()");
- return _operator_plus_1;
+ String _plus = ("new " + _targetName);
+ return (_plus + "()");
} else {
String _name = dt.getName();
- String _operator_plus_2 = StringExtensions.operator_plus("new ", _name);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "()");
- return _operator_plus_3;
+ String _plus_1 = ("new " + _name);
+ return (_plus_1 + "()");
}
}
}
@@ -54,12 +47,10 @@ public class TypeHelpers {
public String defaultValue(final VarDecl a) {
RefableType _refType = a.getRefType();
DataType _type = _refType.getType();
- String _defaultValue = this.defaultValue(_type);
- return _defaultValue;
+ return this.defaultValue(_type);
}
public String getTypedDataDefinition(final Message m) {
- String _generateTypedData = this.chainGenerator.generateTypedData(m);
- return _generateTypedData;
+ return this.chainGenerator.generateTypedData(m);
}
}
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index 72bca5203..51797e7ab 100644
--- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: eTrice Logging Fragment
Bundle-SymbolicName: org.eclipse.etrice.logging
Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: eTrice (Incubation)
-Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
+Fragment-Host: org.apache.log4j;bundle-version="1.2.15.v201012070815"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
index ea588fa4c..e1e5655e0 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
@@ -32,7 +32,7 @@
extensions="behavior"
icon="icons/Behavior.gif"
id="org.eclipse.etrice.ui.behavior.editor.BehaviorEditor"
- matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorFactory$DiagramEditorMatchingStrategy"
+ matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorMatchingStrategy"
name="ROOM Behavior Editor">
<contentTypeBinding
contentTypeId="org.eclipse.graphiti.content.diagram">
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java
index 5684262cf..47a16eba5 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java
@@ -31,7 +31,6 @@ import org.eclipse.etrice.ui.common.editor.RoomDiagramEditor;
import org.eclipse.graphiti.mm.pictograms.Diagram;
import org.eclipse.graphiti.mm.pictograms.Shape;
import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;
import org.eclipse.swt.graphics.Image;
@@ -48,7 +47,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
return Activator.getImage("icons/Behavior.gif");
}
- @SuppressWarnings("restriction")
@Override
protected void initializeGraphicalViewer() {
super.initializeGraphicalViewer();
@@ -63,7 +61,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
getEditingDomain().getCommandStack().flush();
}
- @SuppressWarnings("restriction")
public boolean showStateGraph(StateGraph sg) {
URI boUri = EcoreUtil.getURI(sg);
final StateGraph mySG = (StateGraph) getEditingDomain().getResourceSet().getEObject(boUri, true);
@@ -86,7 +83,7 @@ public class BehaviorEditor extends RoomDiagramEditor {
* @return the actor class of this editor
*/
public ActorClass getActorClass() {
- Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();
+ Diagram diagram = getDiagramTypeProvider().getDiagram();
EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram);
if (bo instanceof ActorClass)
return (ActorClass) bo;
@@ -97,7 +94,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
/* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
- @SuppressWarnings("restriction")
@Override
public void doSave(IProgressMonitor monitor) {
getEditingDomain().getCommandStack().execute(new RecordingCommand(getEditingDomain()) {
@@ -115,7 +111,7 @@ public class BehaviorEditor extends RoomDiagramEditor {
*
*/
protected void removeUnusedRefinedStates() {
- Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();
+ Diagram diagram = getDiagramTypeProvider().getDiagram();
ActorClass ac = SupportUtil.getActorClass(diagram);
if (ac.getStateMachine()!=null) {
@@ -147,7 +143,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
}
protected void removeEmptySubgraphs() {
- @SuppressWarnings("restriction")
Diagram diagram = getDiagramTypeProvider().getDiagram();
// if our current context is an empty state graph we go one level up
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java
index 6f452d387..c942cf61c 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java
@@ -594,11 +594,6 @@ public class TransitionSupport {
Color fillColor = RoomHelpers.hasDetailCode(trans.getAction())?
lineColor:manageColor(FILL_COLOR);
updateLabel(trans, conn, fillColor);
-
- if (conn.getConnectionDecorators().size()>=2) {
- ConnectionDecorator cd = conn.getConnectionDecorators().get(1);
- getDiagramEditor().refresh(cd);
- }
}
@Override
diff --git a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java
index 63f5fe7cd..5001a85fa 100644
--- a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java
+++ b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java
@@ -61,7 +61,6 @@ public class RoomDiagramEditor extends DiagramEditor {
injector.injectMembers(this);
}
- @SuppressWarnings("restriction")
@Override
protected void initializeGraphicalViewer() {
super.initializeGraphicalViewer();
@@ -76,7 +75,6 @@ public class RoomDiagramEditor extends DiagramEditor {
/* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#dispose()
*/
- @SuppressWarnings("restriction")
@Override
public void dispose() {
mte.unsetTarget(getEditingDomain());
@@ -89,7 +87,6 @@ public class RoomDiagramEditor extends DiagramEditor {
/* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
- @SuppressWarnings("restriction")
@Override
public void doSave(final IProgressMonitor monitor) {
ResourceSet rs = getEditingDomain().getResourceSet();
@@ -143,7 +140,6 @@ public class RoomDiagramEditor extends DiagramEditor {
super.doSave(monitor);
}
- @SuppressWarnings("restriction")
@Override
public void createPartControl(Composite parent) {
super.createPartControl(parent);
@@ -165,7 +161,6 @@ public class RoomDiagramEditor extends DiagramEditor {
/* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#setFocus()
*/
- @SuppressWarnings("restriction")
@Override
public void setFocus() {
boolean dirtyAlready = isDirty();
diff --git a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java
index 6480cf745..8f10654b2 100644
--- a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java
+++ b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java
@@ -58,7 +58,6 @@ public class SaveOnFocusLostListener implements IPartListener {
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
*/
- @SuppressWarnings("restriction")
@Override
public void partDeactivated(IWorkbenchPart part) {
boolean save = store.getBoolean(PreferenceConstants.SAVE_DIAG_ON_FOCUS_LOST);
diff --git a/plugins/org.eclipse.etrice.ui.structure/plugin.xml b/plugins/org.eclipse.etrice.ui.structure/plugin.xml
index 18b39d6d0..04177e711 100644
--- a/plugins/org.eclipse.etrice.ui.structure/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.structure/plugin.xml
@@ -32,7 +32,7 @@
extensions="structure"
icon="icons/Structure.gif"
id="org.eclipse.etrice.ui.structure.editor.StructureEditor"
- matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorFactory$DiagramEditorMatchingStrategy"
+ matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorMatchingStrategy"
name="ROOM Structure Editor">
<contentTypeBinding
contentTypeId="org.eclipse.graphiti.content.diagram">
diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java
index 9b3411909..da37854c3 100644
--- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java
+++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java
@@ -18,7 +18,6 @@ import org.eclipse.etrice.ui.common.editor.RoomDiagramEditor;
import org.eclipse.etrice.ui.structure.Activator;
import org.eclipse.graphiti.mm.pictograms.Diagram;
import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;
import org.eclipse.swt.graphics.Image;
@@ -39,7 +38,7 @@ public class StructureEditor extends RoomDiagramEditor {
* @return the actor class of this editor
*/
public StructureClass getStructureClass() {
- Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();
+ Diagram diagram = getDiagramTypeProvider().getDiagram();
EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram);
if (bo instanceof StructureClass)
return (StructureClass) bo;
diff --git a/tests/org.eclipse.etrice.core.config.tests/.classpath b/tests/org.eclipse.etrice.core.config.tests/.classpath
index afb9bb46e..cedf0d0d0 100644
--- a/tests/org.eclipse.etrice.core.config.tests/.classpath
+++ b/tests/org.eclipse.etrice.core.config.tests/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>

Back to the top