diff options
| author | Henrik Rentz-Reichert | 2013-04-05 12:17:20 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-04-05 12:17:20 +0000 |
| commit | 5fed141dbc4a040b686870aff11e2a79e19554ca (patch) | |
| tree | e365e0d86b86a20c572b310672e79e71e629fb88 /plugins/org.eclipse.etrice.core.etmap.ui | |
| parent | 24957af9c881a28886ca334de4c7c1e3a8bbd35c (diff) | |
| parent | d5d02973f16a8a05c79dcf42f5e1bdb2d4f23930 (diff) | |
| download | org.eclipse.etrice-5fed141dbc4a040b686870aff11e2a79e19554ca.tar.gz org.eclipse.etrice-5fed141dbc4a040b686870aff11e2a79e19554ca.tar.xz org.eclipse.etrice-5fed141dbc4a040b686870aff11e2a79e19554ca.zip | |
Merge branch 'change/11464/1'
Conflicts:
plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java
plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/commands/StateGraphContext.java
tests/org.eclipse.etrice.ui.behavior.tests/models/InheritedStateMachine.room
Diffstat (limited to 'plugins/org.eclipse.etrice.core.etmap.ui')
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java index b387734cb..ec6d50371 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java +++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java @@ -10,7 +10,7 @@ import java.util.Stack; import java.util.List;
import java.util.ArrayList;
-@SuppressWarnings("all") +@SuppressWarnings("all")
public class InternalETMapLexer extends Lexer {
public static final int RULE_ID=4;
public static final int T__22=22;
@@ -1185,4 +1185,4 @@ public class InternalETMapLexer extends Lexer { }
-}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java index abb8bb561..3e444783b 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java +++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapParser.java @@ -19,7 +19,7 @@ import java.util.Stack; import java.util.List;
import java.util.ArrayList;
-@SuppressWarnings("all") +@SuppressWarnings("all")
public class InternalETMapParser extends AbstractInternalContentAssistParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'MappingModel'", "'{'", "'}'", "'Mapping'", "'->'", "'SubSystemMapping'", "'ThreadMapping'", "'import'", "'from'", "'.*'", "'.'"
|