Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2018-04-30 12:37:58 -0400
committerHenrik Rentz-Reichert2018-06-08 07:53:10 -0400
commit29873f1151bb915cf3044f21deca9c756d3f95e0 (patch)
treedfb65025ce0f630a188baf879d0fd27c5e412cc9 /plugins/org.eclipse.etrice.generator.java/src/org
parentd1dab866b5986c7e9ec36cdc1d9c9a6fde6d73c4 (diff)
downloadorg.eclipse.etrice-29873f1151bb915cf3044f21deca9c756d3f95e0.tar.gz
org.eclipse.etrice-29873f1151bb915cf3044f21deca9c756d3f95e0.tar.xz
org.eclipse.etrice-29873f1151bb915cf3044f21deca9c756d3f95e0.zip
Bug 534211 - unify Detail Code parsing
new scanner, parser and linker for detail code including tests * the scanner is tokenizing the text * the parser creates an AST * the linker associates Room objects to the AST nodes in a context dependent way * unit tests for scanner, parser and linker * a detail code translator is provided with a slightly changed interface to the translation provider Change-Id: I84075b6618dc0cedcec6e8da73520bf0a7bcaf90
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org')
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java
index cdfdfc660..e7591cf59 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaTranslationProvider.java
@@ -12,12 +12,12 @@
package org.eclipse.etrice.generator.java.gen;
-import java.util.ArrayList;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem;
import org.eclipse.etrice.core.fsm.fSM.DetailCode;
+import org.eclipse.etrice.core.room.Attribute;
import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
import org.eclipse.etrice.generator.base.DefaultTranslationProvider;
@@ -47,7 +47,7 @@ public class JavaTranslationProvider extends DefaultTranslationProvider {
}
@Override
- public String getInterfaceItemMessageText(AbstractInterfaceItem item, EObject abstractMsg, ArrayList<String> args, String index, String orig) {
+ public String getInterfaceItemMessageText(AbstractInterfaceItem item, EObject abstractMsg, List<String> args, String index, String orig) {
if (index==null)
return orig;

Back to the top