diff options
Diffstat (limited to 'plugins')
52 files changed, 630 insertions, 99 deletions
diff --git a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java index 15a186d3d..cc2fdff1d 100644 --- a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java +++ b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java @@ -1,3 +1,6 @@ +/**
+ * generated by Xtext
+ */
package org.eclipse.etrice.core.generator;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java b/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java index 56531d806..b0cd60688 100644 --- a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java +++ b/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.core.etmap.generator;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java b/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java index 1603368c9..797a66428 100644 --- a/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java +++ b/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.core.etphys.generator;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.DocuPostprocessor.java._trace b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.DocuPostprocessor.java._trace Binary files differnew file mode 100644 index 000000000..93aec3a66 --- /dev/null +++ b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.DocuPostprocessor.java._trace diff --git a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.ImplPostprocessor.java._trace b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.ImplPostprocessor.java._trace Binary files differnew file mode 100644 index 000000000..1db9b46fd --- /dev/null +++ b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.ImplPostprocessor.java._trace diff --git a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.PostprocessingHelpers.java._trace b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.PostprocessingHelpers.java._trace Binary files differnew file mode 100644 index 000000000..a5c40d840 --- /dev/null +++ b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/.PostprocessingHelpers.java._trace 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 3fe054f81..e514e4571 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 @@ -204,7 +204,7 @@ class ActorClassGen extends GenericActorClassGenerator { #include "debugging/etLogger.h"
#include "debugging/etMSCLogger.h"
#include "etUnit/etUnit.h"
- #include "platform/etMemory.h"
+ #include "osal/etMemory.h"
«FOR pc : root.getReferencedProtocolClasses(ac)»
#include "«pc.getCHeaderFileName»"
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend index f859b245a..403b8ba2f 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend @@ -135,7 +135,7 @@ class NodeGen { #include "debugging/etLogger.h"
#include "debugging/etMSCLogger.h"
- #include "platform/etTimer.h"
+ #include "osal/etTimer.h"
#include "etRuntimeConfig.h"
««« TODOCGENPHYS: user code?
@@ -325,7 +325,6 @@ class NodeGen { */
#include "messaging/etMessageService.h"
- #include "platform/etMemory.h"
/* include all used ActorClasses */
«FOR actorClass : root.getUsedActorClasses()»
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend index 099b075f5..a8d21701c 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend @@ -57,8 +57,8 @@ class NodeRunnerGen { #include "debugging/etLogger.h"
#include "debugging/etMSCLogger.h"
- #include "platform/etPlatform.h"
+ #include "osal/etPlatformLifecycle.h"
/**
* main function
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 f0d78acb6..e2a23e88a 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,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -32,6 +43,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -42,18 +54,23 @@ public class ActorClassGen extends GenericActorClassGenerator { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private ILanguageExtension langExt;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private StateMachineGen _stateMachineGen;
@Inject
@@ -601,7 +618,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("#include \"etUnit/etUnit.h\"");
_builder.newLine();
- _builder.append("#include \"platform/etMemory.h\"");
+ _builder.append("#include \"osal/etMemory.h\"");
_builder.newLine();
_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 c9cca287c..1d481bfc1 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 @@ -1,3 +1,14 @@ +/**
+ * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -25,6 +36,7 @@ import org.eclipse.xtend2.lib.StringConcatenation; import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
@@ -33,12 +45,13 @@ public class CExtensions implements ILanguageExtension { private IDiagnostician diagnostician;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
String[] _generateArglistAndTypedData = this.generateArglistAndTypedData(_data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
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 61236fc9c..bf4b725ab 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,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -16,6 +27,7 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
@@ -24,12 +36,15 @@ public class DataClassGen { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java index 6f42a1067..f5871bdac 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug (initial contribution)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -21,6 +31,7 @@ import org.eclipse.etrice.generator.c.gen.CExtensions; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IntegerRange;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -30,9 +41,11 @@ public class Initialization { private CExtensions languageExt;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
public CharSequence generateAttributeInit(final InstanceBase instance, final List<Attribute> attributes) {
@@ -98,7 +111,7 @@ public class Initialization { _or = (_equals || _and);
}
if (_or) {
- String _initAttribute = this.initAttribute(instance, path);
+ CharSequence _initAttribute = this.initAttribute(instance, path);
String _plus = (_initAttribute + COMMENT);
_xifexpression = _plus;
} else {
@@ -114,7 +127,7 @@ public class Initialization { } else {
_builder_1.appendImmediate(", ", "");
}
- String _initAttribute_1 = this.initAttribute(instance, path);
+ CharSequence _initAttribute_1 = this.initAttribute(instance, path);
_builder_1.append(_initAttribute_1, "");
}
}
@@ -128,8 +141,8 @@ public class Initialization { return _xblockexpression;
}
- private String initAttribute(final InstanceBase instance, final List<Attribute> path) {
- String _xblockexpression = null;
+ private CharSequence initAttribute(final InstanceBase instance, final List<Attribute> path) {
+ CharSequence _xblockexpression = null;
{
Attribute a = IterableExtensions.<Attribute>last(path);
RefableType _refType = a.getRefType();
@@ -149,7 +162,7 @@ public class Initialization { }
return _xifexpression;
}
- String _switchResult = null;
+ CharSequence _switchResult = null;
boolean _matched = false;
if (!_matched) {
if (aType instanceof DataClass) {
@@ -169,13 +182,13 @@ public class Initialization { }
_builder.append("\t");
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, subA);
- CharSequence _initAttributeArray = this.initAttributeArray(instance, _union);
+ Object _initAttributeArray = this.initAttributeArray(instance, _union);
_builder.append(_initAttributeArray, " ");
_builder.newLineIfNotEmpty();
}
}
_builder.append("}");
- _switchResult = _builder.toString();
+ _switchResult = _builder;
}
}
if (!_matched) {
@@ -199,10 +212,10 @@ public class Initialization { if (aType instanceof PrimitiveType) {
final PrimitiveType _primitiveType = (PrimitiveType)aType;
_matched=true;
- String _xblockexpression_1 = null;
+ CharSequence _xblockexpression_1 = null;
{
String value = this.getPrimitiveValue(instance, path);
- String _xifexpression_1 = null;
+ CharSequence _xifexpression_1 = null;
boolean _and = false;
boolean _and_1 = false;
int _size = a.getSize();
@@ -239,7 +252,7 @@ public class Initialization { }
}
_builder.append(" }");
- _xifexpression_1 = _builder.toString();
+ _xifexpression_1 = _builder;
} else {
_xifexpression_1 = value;
}
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 fcd44dd9a..4119a6b52 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 @@ -1,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java index 7518e9ef4..7dc3cc5b3 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java @@ -1,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -48,6 +59,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IntegerRange;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -57,15 +69,19 @@ import org.eclipse.xtext.xbase.lib.ListExtensions; @SuppressWarnings("all")
public class NodeGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
@@ -286,7 +302,7 @@ public class NodeGen { _builder.append("#include \"debugging/etMSCLogger.h\"");
_builder.newLine();
_builder.newLine();
- _builder.append("#include \"platform/etTimer.h\"");
+ _builder.append("#include \"osal/etTimer.h\"");
_builder.newLine();
_builder.append("#include \"etRuntimeConfig.h\"");
_builder.newLine();
@@ -884,8 +900,6 @@ public class NodeGen { _builder.newLine();
_builder.append("#include \"messaging/etMessageService.h\"");
_builder.newLine();
- _builder.append("#include \"platform/etMemory.h\"");
- _builder.newLine();
_builder.newLine();
_builder.append("/* include all used ActorClasses */");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java index 098b60adb..83bb5ac3b 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java @@ -1,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
@@ -14,17 +25,21 @@ import org.eclipse.etrice.generator.c.gen.CExtensions; 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.Extension;
@Singleton
@SuppressWarnings("all")
public class NodeRunnerGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public void doGenerate(final Root root) {
@@ -104,8 +119,8 @@ public class NodeRunnerGen { _builder.newLine();
_builder.append("#include \"debugging/etMSCLogger.h\"");
_builder.newLine();
- _builder.append("#include \"platform/etPlatform.h\"");
_builder.newLine();
+ _builder.append("#include \"osal/etPlatformLifecycle.h\"");
_builder.newLine();
_builder.newLine();
_builder.append("/**");
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 91dcd5e39..55c508ed0 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,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -28,6 +39,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -35,18 +47,23 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions; @SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
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 cc91d9405..fba5cf6cc 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
@@ -9,11 +19,13 @@ import org.eclipse.etrice.core.room.State; import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public CharSequence genHeaderConstants(final ExpandedActorClass xpac) {
diff --git a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java index ff2c9b4b7..11faac3fc 100644 --- a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java +++ b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 Juergen Haug
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug
+ */
package org.eclipse.etrice.generator.config;
import com.google.common.base.Objects;
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java index 65bf46776..107dd6d9f 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java @@ -33,6 +33,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
@@ -44,18 +45,23 @@ public class ActorClassGen extends GenericActorClassGenerator { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions _cppExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private StateMachineGen _stateMachineGen;
@Inject
@@ -273,8 +279,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t\t\t");
List<Port> _endPorts = this._roomExtensions.getEndPorts(ac);
- final Function1<Port,CharSequence> _function_2 = new Function1<Port,CharSequence>() {
- public CharSequence apply(final Port port) {
+ final Function1<Port,String> _function_2 = new Function1<Port,String>() {
+ public String apply(final Port port) {
StringConcatenation _builder = new StringConcatenation();
String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(port);
_builder.append(_portClassName, "");
@@ -282,10 +288,10 @@ public class ActorClassGen extends GenericActorClassGenerator { String _name = port.getName();
_builder.append(_name, "");
_builder.append(";");
- return _builder;
+ return _builder.toString();
}
};
- List<CharSequence> _map = ListExtensions.<Port, CharSequence>map(_endPorts, _function_2);
+ List<String> _map = ListExtensions.<Port, String>map(_endPorts, _function_2);
String _join = IterableExtensions.join(_map, "\n");
_builder.append(_join, " ");
_builder.newLineIfNotEmpty();
@@ -294,8 +300,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t\t\t");
EList<SAPRef> _strSAPs = ac.getStrSAPs();
- final Function1<SAPRef,CharSequence> _function_3 = new Function1<SAPRef,CharSequence>() {
- public CharSequence apply(final SAPRef sap) {
+ final Function1<SAPRef,String> _function_3 = new Function1<SAPRef,String>() {
+ public String apply(final SAPRef sap) {
StringConcatenation _builder = new StringConcatenation();
String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(sap);
_builder.append(_portClassName, "");
@@ -303,10 +309,10 @@ public class ActorClassGen extends GenericActorClassGenerator { String _name = sap.getName();
_builder.append(_name, "");
_builder.append(";");
- return _builder;
+ return _builder.toString();
}
};
- List<CharSequence> _map_1 = ListExtensions.<SAPRef, CharSequence>map(_strSAPs, _function_3);
+ List<String> _map_1 = ListExtensions.<SAPRef, String>map(_strSAPs, _function_3);
String _join_1 = IterableExtensions.join(_map_1, "\n");
_builder.append(_join_1, " ");
_builder.newLineIfNotEmpty();
@@ -315,8 +321,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t\t\t");
EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
- final Function1<ServiceImplementation,CharSequence> _function_4 = new Function1<ServiceImplementation,CharSequence>() {
- public CharSequence apply(final ServiceImplementation svc) {
+ final Function1<ServiceImplementation,String> _function_4 = new Function1<ServiceImplementation,String>() {
+ public String apply(final ServiceImplementation svc) {
StringConcatenation _builder = new StringConcatenation();
String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(svc);
_builder.append(_portClassName, "");
@@ -325,10 +331,10 @@ public class ActorClassGen extends GenericActorClassGenerator { String _name = _spp.getName();
_builder.append(_name, "");
_builder.append(";");
- return _builder;
+ return _builder.toString();
}
};
- List<CharSequence> _map_2 = ListExtensions.<ServiceImplementation, CharSequence>map(_serviceImplementations, _function_4);
+ List<String> _map_2 = ListExtensions.<ServiceImplementation, String>map(_serviceImplementations, _function_4);
String _join_2 = IterableExtensions.join(_map_2, "\n");
_builder.append(_join_2, " ");
_builder.newLineIfNotEmpty();
@@ -485,7 +491,7 @@ public class ActorClassGen extends GenericActorClassGenerator { return _xblockexpression;
}
- private CharSequence generateConstructorInitalizerList(final ActorClass ac) {
+ private String generateConstructorInitalizerList(final ActorClass ac) {
ArrayList<CharSequence> _arrayList = new ArrayList<CharSequence>();
ArrayList<CharSequence> initializerList = _arrayList;
ActorClass _base = ac.getBase();
@@ -600,7 +606,7 @@ public class ActorClassGen extends GenericActorClassGenerator { String _join = IterableExtensions.join(initializerList, ",\n");
_builder_5.append(_join, "");
_builder_5.newLineIfNotEmpty();
- return _builder_5;
+ return _builder_5.toString();
}
private CharSequence generateSourceFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
@@ -673,7 +679,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("const std::vector<std::vector<etRuntime::Address> >& peer_addr)");
_builder.newLine();
_builder.append(": ");
- CharSequence _generateConstructorInitalizerList = this.generateConstructorInitalizerList(ac);
+ String _generateConstructorInitalizerList = this.generateConstructorInitalizerList(ac);
_builder.append(_generateConstructorInitalizerList, "");
_builder.newLineIfNotEmpty();
_builder.append("{");
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java index 25db9c587..c4a6950d7 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 Juergen Haug
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -25,24 +35,29 @@ import org.eclipse.etrice.generator.generic.RoomExtensions; import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class ConfigGenAddon {
@Inject
+ @Extension
private CppExtensions stdExt;
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
private IDataConfiguration dataConfigExt;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public CharSequence genActorInstanceConfig(final ActorInstance ai, final String aiVariableName) {
@@ -152,7 +167,7 @@ public class ConfigGenAddon { }
}
_builder_2.append(" }");
- CharSequence arrayExpr = _builder_2;
+ String arrayExpr = _builder_2.toString();
StringConcatenation _builder_3 = new StringConcatenation();
_builder_3.append(invokes, "");
_builder_3.append(".");
@@ -220,7 +235,7 @@ public class ConfigGenAddon { CharSequence _invokeGetter = this.helpers.invokeGetter(_name, null);
String _plus_1 = (_plus + _invokeGetter);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
+ Object _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
_builder.append(_applyInstanceConfig, "");
_builder.newLineIfNotEmpty();
}
@@ -414,7 +429,7 @@ public class ConfigGenAddon { return _builder;
}
- public CharSequence genMinMaxConstants(final ActorClass ac) {
+ public String genMinMaxConstants(final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
{
EList<Attribute> _attributes = ac.getAttributes();
@@ -427,13 +442,13 @@ public class ConfigGenAddon { _builder.newLineIfNotEmpty();
}
}
- CharSequence result = _builder;
+ String result = _builder.toString();
int _length = result.length();
boolean _notEquals = (_length != 0);
if (_notEquals) {
StringConcatenation _builder_1 = new StringConcatenation();
_builder_1.append("//--------------------- Attribute Specifications");
- String _plus = (result + _builder_1.toString());
+ String _plus = (result + _builder_1);
result = _plus;
}
return result;
@@ -460,7 +475,7 @@ public class ConfigGenAddon { String _name = e.getName();
String _plus_1 = (_plus + _name);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
+ Object _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
_builder.append(_genMinMaxConstantsRec, "");
_builder.newLineIfNotEmpty();
}
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java index fff0cfc07..a8be5d723 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -23,6 +33,7 @@ import org.eclipse.xtend2.lib.StringConcatenation; import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
@@ -31,12 +42,13 @@ public class CppExtensions implements ILanguageExtension { private IDiagnostician diagnostician;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
String[] _generateArglistAndTypedData = this.generateArglistAndTypedData(_data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java index 8aff81f59..6c82739a6 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java @@ -25,6 +25,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -32,21 +33,27 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions; @SuppressWarnings("all")
public class DataClassGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java index 25fb48169..7ac7edeed 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -15,6 +25,7 @@ import org.eclipse.etrice.generator.generic.RoomExtensions; import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
@@ -23,9 +34,11 @@ import org.eclipse.xtext.xbase.lib.ListExtensions; @SuppressWarnings("all")
public class Initialization {
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java index f2df9e05c..4f21f4e4f 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java index f08d2faa3..575969e26 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java @@ -36,27 +36,34 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@Singleton
@SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
@@ -565,7 +572,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append(": ");
- CharSequence _generateConstructorInitalizerList = this.generateConstructorInitalizerList(pclass, "0");
+ String _generateConstructorInitalizerList = this.generateConstructorInitalizerList(pclass, "0");
_builder.append(_generateConstructorInitalizerList, " ");
_builder.newLineIfNotEmpty();
_builder.append("{");
@@ -599,7 +606,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append(": ");
- CharSequence _generateConstructorInitalizerList_1 = this.generateConstructorInitalizerList(pclass, "idx");
+ String _generateConstructorInitalizerList_1 = this.generateConstructorInitalizerList(pclass, "idx");
_builder.append(_generateConstructorInitalizerList_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("{");
@@ -855,7 +862,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- public CharSequence generateConstructorInitalizerList(final PortClass pc, final String index) {
+ public String generateConstructorInitalizerList(final PortClass pc, final String index) {
ArrayList<CharSequence> _arrayList = new ArrayList<CharSequence>();
ArrayList<CharSequence> initializerList = _arrayList;
StringConcatenation _builder = new StringConcatenation();
@@ -875,7 +882,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String _join = IterableExtensions.join(initializerList, ",\n");
_builder_1.append(_join, "");
_builder_1.newLineIfNotEmpty();
- return _builder_1;
+ return _builder_1.toString();
}
private CharSequence messageCall(final Message m) {
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java index d0ea74df4..9f0eef69c 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.inject.Inject;
@@ -16,11 +26,13 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java index 368d980b1..c6bcbee84 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java @@ -21,6 +21,7 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
@@ -29,12 +30,15 @@ public class SubSystemClassGen { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions _cppExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java index b84ba20fd..fbed8a340 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java @@ -10,17 +10,21 @@ import org.eclipse.etrice.generator.cpp.gen.CppExtensions; 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.Extension;
@Singleton
@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions _cppExtensions;
@Inject
+ @Extension
private RoomExtensions roomExt;
public void doGenerate(final Root root) {
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 ce99ce171..6664970bf 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,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Jung, Thomas Schuetz (initial contribution)
+ */
package org.eclipse.etrice.generator.doc.gen;
import com.google.common.base.Objects;
@@ -32,15 +42,18 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@Singleton
@SuppressWarnings("all")
public class DocGen implements IRoomGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
@@ -827,7 +840,7 @@ public class DocGen implements IRoomGenerator { boolean _isLeaf = this.roomExt.isLeaf(s_1);
boolean _not = (!_isLeaf);
if (_not) {
- CharSequence _generateStateDoc = this.generateStateDoc(model, ac, s_1);
+ Object _generateStateDoc = this.generateStateDoc(model, ac, s_1);
_builder.append(_generateStateDoc, "");
_builder.newLineIfNotEmpty();
}
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 ec54b2af0..65d3ed5af 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.doc.gen;
import com.google.common.base.Objects;
@@ -23,14 +33,17 @@ 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.Exceptions;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
public class InstanceDiagramGen implements IRoomGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
@@ -204,7 +217,7 @@ public class InstanceDiagramGen implements IRoomGenerator { {
EList<ActorInstance> _instances = ai.getInstances();
for(final ActorInstance sub_ai : _instances) {
- CharSequence _instance = this.instance(sub_ai);
+ Object _instance = this.instance(sub_ai);
_builder.append(_instance, "");
_builder.newLineIfNotEmpty();
}
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 28eaa6ec8..ccad381e5 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.doc.gen;
import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java index 85ec4254a..4630a0a3b 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java +++ b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java @@ -1,3 +1,6 @@ +/**
+ * generated by Xtext
+ */
package org.eclipse.etrice.generator.generator;
import org.eclipse.emf.ecore.resource.Resource;
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 d7e01dcaa..31bbe235f 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,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -31,6 +41,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -41,9 +52,11 @@ public class ActorClassGen extends GenericActorClassGenerator { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
@@ -53,12 +66,15 @@ public class ActorClassGen extends GenericActorClassGenerator { private ConfigGenAddon configGenAddon;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
+ @Extension
private StateMachineGen _stateMachineGen;
@Inject
@@ -269,7 +285,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\t");
- CharSequence _genMinMaxConstants = this.configGenAddon.genMinMaxConstants(ac);
+ String _genMinMaxConstants = this.configGenAddon.genMinMaxConstants(ac);
_builder.append(_genMinMaxConstants, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java index 6fce554f8..318efc8d0 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 Juergen Haug
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -24,24 +34,29 @@ import org.eclipse.etrice.generator.generic.TypeHelpers; import org.eclipse.etrice.generator.java.gen.Initialization;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class ConfigGenAddon {
@Inject
+ @Extension
private JavaExtensions stdExt;
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
private IDataConfiguration dataConfigExt;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
@@ -130,7 +145,7 @@ public class ConfigGenAddon { CharSequence _invokeGetter = this.helpers.invokeGetter(_name, null);
String _plus_1 = (_plus + _invokeGetter);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
+ Object _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
_builder.append(_applyInstanceConfig, "");
_builder.newLineIfNotEmpty();
}
@@ -323,7 +338,7 @@ public class ConfigGenAddon { return _builder;
}
- public CharSequence genMinMaxConstants(final ActorClass ac) {
+ public String genMinMaxConstants(final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
{
List<Attribute> _allAttributes = this._roomExtensions.getAllAttributes(ac);
@@ -336,13 +351,13 @@ public class ConfigGenAddon { _builder.newLineIfNotEmpty();
}
}
- CharSequence result = _builder;
+ String result = _builder.toString();
int _length = result.length();
boolean _notEquals = (_length != 0);
if (_notEquals) {
StringConcatenation _builder_1 = new StringConcatenation();
_builder_1.append("//--------------------- Attribute Specifications");
- String _plus = (result + _builder_1.toString());
+ String _plus = (result + _builder_1);
result = _plus;
}
return result;
@@ -368,7 +383,7 @@ public class ConfigGenAddon { String _name = e.getName();
String _plus_1 = (_plus + _name);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
+ Object _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
_builder.append(_genMinMaxConstantsRec, "");
_builder.newLineIfNotEmpty();
}
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 75104c263..16ab62063 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,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -22,6 +32,7 @@ import org.eclipse.etrice.generator.java.gen.Initialization; 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -32,15 +43,19 @@ public class DataClassGen { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java index 1e5c9d2b0..4a11b7c1b 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -18,21 +28,26 @@ 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.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@Singleton
@SuppressWarnings("all")
public class Initialization {
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private JavaExtensions languageExt;
@Inject
+ @Extension
private ProcedureHelpers procedureHelpers;
public CharSequence attributeInitialization(final List<Attribute> attribs, final EObject roomClass, final boolean useClassDefaultsOnly) {
@@ -141,37 +156,44 @@ public class Initialization { }
private CharSequence attributeInitPrimitiveRec(final List<Attribute> path, final EObject roomClass) {
- Attribute a = IterableExtensions.<Attribute>last(path);
- RefableType _refType = a.getRefType();
- DataType aType = _refType.getType();
- boolean _isDataClass = this.typeHelpers.isDataClass(aType);
- if (_isDataClass) {
- StringConcatenation _builder = new StringConcatenation();
- {
- List<Attribute> _allAttributes = this._roomExtensions.getAllAttributes(((DataClass) aType));
- for(final Attribute e : _allAttributes) {
- List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _attributeInitPrimitiveRec = this.attributeInitPrimitiveRec(_union, roomClass);
- _builder.append(_attributeInitPrimitiveRec, "");
- _builder.newLineIfNotEmpty();
+ CharSequence _xblockexpression = null;
+ {
+ Attribute a = IterableExtensions.<Attribute>last(path);
+ RefableType _refType = a.getRefType();
+ DataType aType = _refType.getType();
+ CharSequence _xifexpression = null;
+ boolean _isDataClass = this.typeHelpers.isDataClass(aType);
+ if (_isDataClass) {
+ StringConcatenation _builder = new StringConcatenation();
+ {
+ List<Attribute> _allAttributes = this._roomExtensions.getAllAttributes(((DataClass) aType));
+ for(final Attribute e : _allAttributes) {
+ List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
+ Object _attributeInitPrimitiveRec = this.attributeInitPrimitiveRec(_union, roomClass);
+ _builder.append(_attributeInitPrimitiveRec, "");
+ _builder.newLineIfNotEmpty();
+ }
}
- }
- return _builder;
- } else {
- boolean _isPrimitive = this.typeHelpers.isPrimitive(aType);
- if (_isPrimitive) {
- String value = this.getDataConfigValue(path, roomClass);
- CharSequence _xifexpression = null;
- boolean _notEquals = (!Objects.equal(value, null));
- if (_notEquals) {
- String _valueLiteral = this.languageExt.toValueLiteral(((PrimitiveType) aType), value);
- CharSequence _attributeInit = this.attributeInit(path, _valueLiteral);
- _xifexpression = _attributeInit;
+ return _builder.toString();
+ } else {
+ CharSequence _xifexpression_1 = null;
+ boolean _isPrimitive = this.typeHelpers.isPrimitive(aType);
+ if (_isPrimitive) {
+ String value = this.getDataConfigValue(path, roomClass);
+ CharSequence _xifexpression_2 = null;
+ boolean _notEquals = (!Objects.equal(value, null));
+ if (_notEquals) {
+ String _valueLiteral = this.languageExt.toValueLiteral(((PrimitiveType) aType), value);
+ CharSequence _attributeInit = this.attributeInit(path, _valueLiteral);
+ _xifexpression_2 = _attributeInit;
+ }
+ return _xifexpression_2;
}
- return _xifexpression;
+ _xifexpression = _xifexpression_1;
}
+ _xblockexpression = (_xifexpression);
}
- return null;
+ return _xblockexpression;
}
private CharSequence attributeInit(final Attribute a, final String value) {
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 a9ab1274e..834f9492f 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -29,7 +39,7 @@ public class JavaExtensions implements ILanguageExtension { public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
String[] _generateArglistAndTypedData = this.generateArglistAndTypedData(_data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
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 fba8b068e..7f6f3f678 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
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 c917da30e..dd91ed91c 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,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -30,6 +40,7 @@ import org.eclipse.etrice.generator.java.gen.Initialization; 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.Extension;
@Singleton
@SuppressWarnings("all")
@@ -38,21 +49,27 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
+ @Extension
private DataClassGen _dataClassGen;
@Inject
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 e6ac84165..354b30323 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
@@ -10,11 +20,13 @@ import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.java.gen.GlobalSettings;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public CharSequence genExtra(final ExpandedActorClass xpac) {
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 74ae81849..bfd955540 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
@@ -22,6 +32,7 @@ import org.eclipse.etrice.generator.java.gen.JavaExtensions; import org.eclipse.etrice.generator.java.gen.VariableServiceGen;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
@@ -30,9 +41,11 @@ public class SubSystemClassGen { private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
@@ -42,6 +55,7 @@ public class SubSystemClassGen { private ConfigGenAddon configGenAddon;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
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 9e07a9411..4ab792769 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
@@ -11,14 +21,17 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
public void doGenerate(final Root root) {
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java index 95defa193..89135ea52 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 Juergen Haug
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -32,6 +42,7 @@ 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.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@@ -40,21 +51,26 @@ import org.eclipse.xtext.xbase.lib.StringExtensions; @SuppressWarnings("all")
public class VariableServiceGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
private IDataConfiguration configExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
@@ -714,7 +730,7 @@ public class VariableServiceGen { List<Attribute> _allAttributes = this.roomExt.getAllAttributes(dataClass);
for(final Attribute at : _allAttributes) {
List<Attribute> _union = this.roomExt.<Attribute>union(path, at);
- CharSequence _genGetAttributeValues = this.genGetAttributeValues(_union, ai);
+ Object _genGetAttributeValues = this.genGetAttributeValues(_union, ai);
_builder_1.append(_genGetAttributeValues, "");
_builder_1.newLineIfNotEmpty();
}
@@ -864,7 +880,7 @@ public class VariableServiceGen { List<Attribute> _allAttributes = this.roomExt.getAllAttributes(dataClass);
for(final Attribute at : _allAttributes) {
List<Attribute> _union = this.roomExt.<Attribute>union(path, at);
- CharSequence _genSetAttributeValues1 = this.genSetAttributeValues1(_union, ai);
+ Object _genSetAttributeValues1 = this.genSetAttributeValues1(_union, ai);
_builder_1.append(_genSetAttributeValues1, "");
_builder_1.newLineIfNotEmpty();
}
@@ -952,7 +968,7 @@ public class VariableServiceGen { List<Attribute> _allAttributes = this.roomExt.getAllAttributes(dataClass);
for(final Attribute at : _allAttributes) {
List<Attribute> _union = this.roomExt.<Attribute>union(path, at);
- CharSequence _genSetAttributeValues2 = this.genSetAttributeValues2(_union, ai);
+ Object _genSetAttributeValues2 = this.genSetAttributeValues2(_union, ai);
_builder.append(_genSetAttributeValues2, "");
_builder.newLineIfNotEmpty();
}
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 3ca6b8f36..3e11877ec 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 @@ -227,6 +227,10 @@ class RoomExtensions { ""
}
+ def dispatch String getPortClassName(ExternalPort p){
+ return p.ifport.getPortClassName()
+ }
+
def dispatch getPortClassName(SAPRef sap) {
return sap.protocol.getPortClassName(true)
}
@@ -243,10 +247,6 @@ class RoomExtensions { p.name + (if (conj) "Conj" else "") + (if (repl) "Repl" else "") +"Port"
}
- def dispatch String getPortClassName(ExternalPort p){
- return p.ifport.getPortClassName()
- }
-
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/GenericActorClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java index fb9ff2024..f0b48ce02 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.inject.Inject;
@@ -14,13 +24,16 @@ 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.Extension;
@SuppressWarnings("all")
public class GenericActorClassGenerator {
@Inject
+ @Extension
private ILanguageExtension langExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
public String genInterfaceItemConstants(final ExpandedActorClass xpac, final ActorClass ac) {
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 66a2003d5..17194e0a1 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.inject.Inject;
@@ -15,13 +25,16 @@ 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.Extension;
@SuppressWarnings("all")
public class GenericProtocolClassGenerator {
@Inject
+ @Extension
private ILanguageExtension langExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
public String genMessageIDs(final ProtocolClass pc) {
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 8fb7879b4..308c18e95 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,3 +1,13 @@ +/**
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -34,6 +44,7 @@ import org.eclipse.etrice.generator.generic.TransitionChainGenerator; import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -43,6 +54,7 @@ public class GenericStateMachineGenerator { protected ILanguageExtension langExt;
@Inject
+ @Extension
protected RoomExtensions _roomExtensions;
@Inject
@@ -1299,7 +1311,7 @@ public class GenericStateMachineGenerator { if ((_eContainer_1 instanceof State)) {
EObject _eContainer_2 = state.eContainer();
EObject _eContainer_3 = _eContainer_2.eContainer();
- CharSequence _genDoCodes = this.genDoCodes(((State) _eContainer_3));
+ Object _genDoCodes = this.genDoCodes(((State) _eContainer_3));
_builder.append(_genDoCodes, "");
_builder.newLineIfNotEmpty();
}
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 828ac29cc..2a250144d 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.inject.Inject;
@@ -14,14 +24,17 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
public class PrepareFileSystem {
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
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 555ccdf7f..e7736759e 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,3 +1,14 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (refactoring, adapted for other target languages)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -23,6 +34,7 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension; import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@Singleton
@@ -32,6 +44,7 @@ public class ProcedureHelpers { private ILanguageExtension languageExt;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
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 9c1dd65dd..0f044be7e 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,3 +1,13 @@ +/**
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -303,6 +313,11 @@ public class RoomExtensions { return _xifexpression;
}
+ protected String _getPortClassName(final ExternalPort p) {
+ Port _ifport = p.getIfport();
+ return this.getPortClassName(_ifport);
+ }
+
protected String _getPortClassName(final SAPRef sap) {
ProtocolClass _protocol = sap.getProtocol();
return this.getPortClassName(_protocol, true);
@@ -338,11 +353,6 @@ public class RoomExtensions { return _plus_2;
}
- protected String _getPortClassName(final ExternalPort p) {
- Port _ifport = p.getIfport();
- return this.getPortClassName(_ifport);
- }
-
protected String _getPortClassName(final ServiceImplementation svc) {
SPPRef _spp = svc.getSpp();
ProtocolClass _protocol = _spp.getProtocol();
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 4a0366656..de4e556ac 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 @@ -1,3 +1,13 @@ +/**
+ * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -21,7 +31,6 @@ import org.eclipse.etrice.core.room.VarDecl; import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.xbase.lib.Conversions;
@Singleton
@SuppressWarnings("all")
@@ -52,19 +61,19 @@ public class TypeHelpers { public String getArgumentList(final VarDecl data) {
String[] _generateArglistAndTypedData = this.languageExt.generateArglistAndTypedData(data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(0);
+ String _get = _generateArglistAndTypedData[0];
return _get;
}
public String getTypedDataDefinition(final VarDecl data) {
String[] _generateArglistAndTypedData = this.languageExt.generateArglistAndTypedData(data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
public String generateTypedArgumentList(final VarDecl data) {
String[] _generateArglistAndTypedData = this.languageExt.generateArglistAndTypedData(data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(2);
+ String _get = _generateArglistAndTypedData[2];
return _get;
}
|