Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2017-03-06 14:56:04 +0000
committerJan Belle2017-03-06 14:56:04 +0000
commitce84f911687eb7a9a299ccfbd37f84afa43bef9d (patch)
treef9d4b008591f157453e8d5728bb9fbe41743239d
parent881e6359f7b07c1d6e8a27e9b81a06172819b3fd (diff)
downloadorg.eclipse.etrice-ce84f911687eb7a9a299ccfbd37f84afa43bef9d.tar.gz
org.eclipse.etrice-ce84f911687eb7a9a299ccfbd37f84afa43bef9d.tar.xz
org.eclipse.etrice-ce84f911687eb7a9a299ccfbd37f84afa43bef9d.zip
Prepared c generator and java generator for extension
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend16
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java16
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend22
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java20
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java4
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java9
7 files changed, 45 insertions, 43 deletions
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 c4d14fa5e..471b0a7c2 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
@@ -34,13 +34,13 @@ import org.eclipse.etrice.generator.generic.RoomExtensions
class ActorClassGen extends GenericActorClassGenerator {
@Inject protected extension RoomExtensions
- @Inject extension CExtensions
- @Inject extension ProcedureHelpers
- @Inject extension StateMachineGen
+ @Inject protected extension CExtensions
+ @Inject protected extension ProcedureHelpers
+ @Inject protected extension StateMachineGen
@Inject protected ILanguageExtension langExt
- @Inject IGeneratorFileIo fileIO
- @Inject ILogger logger
+ @Inject protected IGeneratorFileIo fileIO
+ @Inject protected ILogger logger
def doGenerate(Root root) {
for (xpac: root.xpActorClasses) {
@@ -66,7 +66,7 @@ class ActorClassGen extends GenericActorClassGenerator {
}
}
- def private generateHeaderFile(Root root, ExpandedActorClass xpac) {
+ def protected generateHeaderFile(Root root, ExpandedActorClass xpac) {
val ac = xpac.actorClass
val eventPorts = ac.allEndPorts.filter(p|(p.protocol as ProtocolClass).commType==CommunicationType::EVENT_DRIVEN)
val sendPorts = ac.allEndPorts.filter(p|(p.protocol as ProtocolClass).commType==CommunicationType::DATA_DRIVEN && p.conjugated)
@@ -201,7 +201,7 @@ class ActorClassGen extends GenericActorClassGenerator {
'''
}
- def private generateUtilsFile(Root root, ExpandedActorClass xpac) {
+ def protected generateUtilsFile(Root root, ExpandedActorClass xpac) {
val ac = xpac.actorClass
val eventPorts = ac.allEndPorts.filter(p|(p.protocol as ProtocolClass).commType==CommunicationType::EVENT_DRIVEN)
val replEventPorts = eventPorts.filter[multiplicity!=1]
@@ -311,7 +311,7 @@ class ActorClassGen extends GenericActorClassGenerator {
'''«FOR a : op.arguments SEPARATOR ", "»«a.name»«ENDFOR»'''
}
- def private generateSourceFile(Root root, ExpandedActorClass xpac) {
+ def protected generateSourceFile(Root root, ExpandedActorClass xpac) {
val ac = xpac.actorClass
val async = ac.commType==ComponentCommunicationType::ASYNCHRONOUS
val eventDriven = ac.commType==ComponentCommunicationType::EVENT_DRIVEN
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 252b0190a..cc4e095e3 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
@@ -64,24 +64,24 @@ public class ActorClassGen extends GenericActorClassGenerator {
@Inject
@Extension
- private CExtensions _cExtensions;
+ protected CExtensions _cExtensions;
@Inject
@Extension
- private ProcedureHelpers _procedureHelpers;
+ protected ProcedureHelpers _procedureHelpers;
@Inject
@Extension
- private StateMachineGen _stateMachineGen;
+ protected StateMachineGen _stateMachineGen;
@Inject
protected ILanguageExtension langExt;
@Inject
- private IGeneratorFileIo fileIO;
+ protected IGeneratorFileIo fileIO;
@Inject
- private ILogger logger;
+ protected ILogger logger;
public void doGenerate(final Root root) {
EList<ExpandedActorClass> _xpActorClasses = root.getXpActorClasses();
@@ -125,7 +125,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
}
}
- private CharSequence generateHeaderFile(final Root root, final ExpandedActorClass xpac) {
+ protected CharSequence generateHeaderFile(final Root root, final ExpandedActorClass xpac) {
CharSequence _xblockexpression = null;
{
final ActorClass ac = xpac.getActorClass();
@@ -513,7 +513,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
return _xblockexpression;
}
- private CharSequence generateUtilsFile(final Root root, final ExpandedActorClass xpac) {
+ protected CharSequence generateUtilsFile(final Root root, final ExpandedActorClass xpac) {
CharSequence _xblockexpression = null;
{
final ActorClass ac = xpac.getActorClass();
@@ -1082,7 +1082,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
return _builder;
}
- private CharSequence generateSourceFile(final Root root, final ExpandedActorClass xpac) {
+ protected CharSequence generateSourceFile(final Root root, final ExpandedActorClass xpac) {
CharSequence _xblockexpression = null;
{
final ActorClass ac = xpac.getActorClass();
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 459042a82..e80fded93 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
@@ -36,17 +36,17 @@ import org.eclipse.etrice.generator.java.Main
@Singleton
class ActorClassGen extends GenericActorClassGenerator {
- @Inject IGeneratorFileIo fileIO
- @Inject extension JavaExtensions
- @Inject extension RoomExtensions
- @Inject IDataConfiguration dataConfigExt
- final ConfigGenAddon configGenAddon
-
- @Inject extension ProcedureHelpers
- @Inject extension Initialization
- @Inject extension StateMachineGen
- @Inject extension TypeHelpers
- @Inject extension FileSystemHelpers
+ @Inject protected IGeneratorFileIo fileIO
+ @Inject protected extension JavaExtensions
+ @Inject protected extension RoomExtensions
+ @Inject protected IDataConfiguration dataConfigExt
+ final protected ConfigGenAddon configGenAddon
+
+ @Inject protected extension ProcedureHelpers
+ @Inject protected extension Initialization
+ @Inject protected extension StateMachineGen
+ @Inject protected extension TypeHelpers
+ @Inject protected extension FileSystemHelpers
@Inject
new (ConfigGenAddon configGenAddon) {
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
index b2259755b..5da68973e 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
@@ -65,40 +65,40 @@ import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class ActorClassGen extends GenericActorClassGenerator {
@Inject
- private IGeneratorFileIo fileIO;
+ protected IGeneratorFileIo fileIO;
@Inject
@Extension
- private JavaExtensions _javaExtensions;
+ protected JavaExtensions _javaExtensions;
@Inject
@Extension
- private RoomExtensions _roomExtensions;
+ protected RoomExtensions _roomExtensions;
@Inject
- private IDataConfiguration dataConfigExt;
+ protected IDataConfiguration dataConfigExt;
- private final ConfigGenAddon configGenAddon;
+ protected final ConfigGenAddon configGenAddon;
@Inject
@Extension
- private ProcedureHelpers _procedureHelpers;
+ protected ProcedureHelpers _procedureHelpers;
@Inject
@Extension
- private Initialization _initialization;
+ protected Initialization _initialization;
@Inject
@Extension
- private StateMachineGen _stateMachineGen;
+ protected StateMachineGen _stateMachineGen;
@Inject
@Extension
- private TypeHelpers _typeHelpers;
+ protected TypeHelpers _typeHelpers;
@Inject
@Extension
- private FileSystemHelpers _fileSystemHelpers;
+ protected FileSystemHelpers _fileSystemHelpers;
@Inject
public ActorClassGen(final ConfigGenAddon configGenAddon) {
diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
index ea01fef30..540ecfb46 100644
--- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jdt.launching,
org.eclipse.ui.dialogs
Bundle-Vendor: Eclipse eTrice
+Export-Package: org.eclipse.etrice.generator.launch.c
diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java
index 0b3b29f61..75a18e9f7 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java
@@ -45,8 +45,8 @@ public class CustomCompletionProposal implements ICompletionProposal {
this.selection = selection;
}
- public void apply(final IDocument document) {
- this.delegate.apply(document);
+ public void apply(final IDocument arg0) {
+ this.delegate.apply(arg0);
}
public String getAdditionalProposalInfo() {
diff --git a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java
index 1d525ac74..cd07fc2b3 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.etrice.ui.behavior.detailcode;
import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import java.util.List;
-import java.util.function.Consumer;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.CommunicationType;
@@ -33,7 +32,9 @@ import org.eclipse.etrice.ui.behavior.fsm.detailcode.IDetailExpressionProvider;
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
/**
* Defines expression for fsm detail code of an ActorClass
@@ -68,9 +69,9 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid
List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<Attribute, IDetailExpressionProvider.ExpressionFeature>map(_allAttributes, _function_1);
Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1);
List<InterfaceItem> _allInterfaceItems = this.roomHelpers.getAllInterfaceItems(this.actorClass);
- final Consumer<InterfaceItem> _function_2 = new Consumer<InterfaceItem>() {
+ final Procedure1<InterfaceItem> _function_2 = new Procedure1<InterfaceItem>() {
@Override
- public void accept(final InterfaceItem it) {
+ public void apply(final InterfaceItem it) {
boolean _matched = false;
if (it instanceof SPP) {
boolean _isEventDriven = ((SPP)it).isEventDriven();
@@ -114,7 +115,7 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid
}
}
};
- _allInterfaceItems.forEach(_function_2);
+ IterableExtensions.<InterfaceItem>forEach(_allInterfaceItems, _function_2);
return scope;
}

Back to the top