diff options
Diffstat (limited to 'plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org')
18 files changed, 707 insertions, 829 deletions
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java index ef704b2eba2..e9ad89175bf 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/AbstractUmlMessageRuntimeModule.java @@ -29,9 +29,8 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } public void configureFileExtensions(Binder binder) { - if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) { + if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("umlmessage"); - } } // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment @@ -45,7 +44,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - @Override public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() { return org.eclipse.papyrus.uml.textedit.message.xtext.serializer.UmlMessageSemanticSequencer.class; } @@ -56,7 +54,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - @Override public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() { return org.eclipse.xtext.serializer.impl.Serializer.class; } @@ -67,7 +64,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - @Override public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() { return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class; } @@ -94,7 +90,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - @Override public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() { return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class; } @@ -106,7 +101,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - @Override public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() { return org.eclipse.papyrus.uml.textedit.message.xtext.scoping.UmlMessageScopeProvider.class; } @@ -118,7 +112,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - @Override public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() { return org.eclipse.xtext.scoping.impl.DefaultGlobalScopeProvider.class; } @@ -129,13 +122,11 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment - @Override public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() { return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class; } // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - @Override public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() { return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class; } @@ -146,7 +137,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - @Override public void configureIResourceDescriptions(com.google.inject.Binder binder) { binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); } @@ -163,7 +153,6 @@ public abstract class AbstractUmlMessageRuntimeModule extends org.eclipse.xtext. } // contributed by org.eclipse.xtext.generator.formatting.FormatterFragment - @Override public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() { return org.eclipse.papyrus.uml.textedit.message.xtext.formatting.UmlMessageFormatter.class; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel index 6f3270c2396..2362f81b515 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/UmlMessage.genmodel @@ -5,7 +5,7 @@ modelPluginID="org.eclipse.papyrus.uml.textedit.message.xtext" forceOverwrite="true" modelName="UmlMessage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.edit" - editorPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.editor" runtimeVersion="2.10" + editorPluginID="org.eclipse.papyrus.uml.textedit.message.xtext.editor" runtimeVersion="2.14" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> <genPackages prefix="UmlMessage" basePackage="org.eclipse.papyrus.uml.textedit.message.xtext" disposableProviderFactory="true" ecorePackage="UmlMessage.ecore#/"> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g index a804dd9545f..636c6f3d2d3 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g @@ -90,7 +90,7 @@ ruleMessageRule returns [EObject current=null] $current, "sequenceTerm", lv_sequenceTerm_0_0, - "SequenceTermRule"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.SequenceTermRule"); afterParserOrEnumRuleCall(); } @@ -112,7 +112,7 @@ ruleMessageRule returns [EObject current=null] $current, "sequenceTerm", lv_sequenceTerm_2_0, - "SequenceTermRule"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.SequenceTermRule"); afterParserOrEnumRuleCall(); } @@ -135,7 +135,7 @@ ruleMessageRule returns [EObject current=null] $current, "name", lv_name_4_0, - "NAME_RULE"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.NAME_RULE"); } ) @@ -174,7 +174,7 @@ ruleSequenceTermRule returns [EObject current=null] $current, "sequencialOrder", lv_sequencialOrder_0_0, - "INT"); + "org.eclipse.papyrus.uml.alf.Common.INT"); } ) @@ -192,7 +192,7 @@ ruleSequenceTermRule returns [EObject current=null] $current, "sequenceName", lv_sequenceName_1_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } ) @@ -209,7 +209,7 @@ ruleSequenceTermRule returns [EObject current=null] $current, "recurrence", lv_recurrence_2_0, - "RecurrenceRule"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.RecurrenceRule"); afterParserOrEnumRuleCall(); } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java index 4702d572a53..ad9119337f9 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageLexer.java @@ -9,27 +9,27 @@ import org.antlr.runtime.MismatchedSetException; import org.antlr.runtime.NoViableAltException; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.RecognizerSharedState; -// Hack: Use our own Lexer superclass by means of import. +// Hack: Use our own Lexer superclass by means of import. // Currently there is no other way to specify the superclass for the lexer. import org.eclipse.xtext.parser.antlr.Lexer; @SuppressWarnings("all") public class InternalUmlMessageLexer extends Lexer { public static final int RULE_ID = 6; + public static final int RULE_WS = 11; public static final int RULE_STRING = 7; - public static final int T__16 = 16; + public static final int RULE_ANY_OTHER = 12; + public static final int RULE_SL_COMMENT = 9; public static final int T__15 = 15; + public static final int T__16 = 16; public static final int T__17 = 17; - public static final int T__14 = 14; - public static final int T__13 = 13; - public static final int RULE_ANY_OTHER = 12; public static final int RULE_INT = 5; + public static final int RULE_ML_COMMENT = 8; public static final int RULE_INTEGER_VALUE = 10; - public static final int RULE_WS = 11; - public static final int RULE_SL_COMMENT = 9; + public static final int T__13 = 13; + public static final int T__14 = 14; public static final int EOF = -1; public static final int RULE_NAME_RULE = 4; - public static final int RULE_ML_COMMENT = 8; // delegates // delegators @@ -47,9 +47,8 @@ public class InternalUmlMessageLexer extends Lexer { } - @Override public String getGrammarFileName() { - return "../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g"; + return "InternalUmlMessage.g"; } // $ANTLR start "T__13" @@ -57,8 +56,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = T__13; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:11:7: ( '.' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:11:9: '.' + // InternalUmlMessage.g:11:7: ( '.' ) + // InternalUmlMessage.g:11:9: '.' { match('.'); @@ -76,8 +75,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = T__14; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:12:7: ( ':' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:12:9: ':' + // InternalUmlMessage.g:12:7: ( ':' ) + // InternalUmlMessage.g:12:9: ':' { match(':'); @@ -95,8 +94,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = T__15; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:13:7: ( '*' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:13:9: '*' + // InternalUmlMessage.g:13:7: ( '*' ) + // InternalUmlMessage.g:13:9: '*' { match('*'); @@ -114,8 +113,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:14:7: ( '[' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:14:9: '[' + // InternalUmlMessage.g:14:7: ( '[' ) + // InternalUmlMessage.g:14:9: '[' { match('['); @@ -133,8 +132,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:15:7: ( ']' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:15:9: ']' + // InternalUmlMessage.g:15:7: ( ']' ) + // InternalUmlMessage.g:15:9: ']' { match(']'); @@ -152,10 +151,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_NAME_RULE; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:16: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | - // ')' )* ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:18: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | - // ')' )* + // InternalUmlMessage.g:290:16: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )* ) + // InternalUmlMessage.g:290:18: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )* { if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) { input.consume(); @@ -166,7 +163,7 @@ public class InternalUmlMessageLexer extends Lexer { throw mse; } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:290:38: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )* + // InternalUmlMessage.g:290:38: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' | '(' | ')' )* loop1: do { int alt1 = 2; int LA1_0 = input.LA(1); @@ -178,7 +175,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt1) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g: + // InternalUmlMessage.g: { if ((input.LA(1) >= '(' && input.LA(1) <= ')') || input.LA(1) == '-' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) { input.consume(); @@ -213,13 +210,10 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | - // '\\'' ( options {greedy=false; } : . )* '\\'' ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | - // '\\'' ( options {greedy=false; } : . )* '\\'' ) + // InternalUmlMessage.g:292:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) ) + // InternalUmlMessage.g:292:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | - // '\\'' ( options {greedy=false; } : . )* '\\'' ) + // InternalUmlMessage.g:292:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) int alt4 = 2; int LA4_0 = input.LA(1); @@ -234,7 +228,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt4) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalUmlMessage.g:292:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) { input.consume(); @@ -245,7 +239,7 @@ public class InternalUmlMessageLexer extends Lexer { throw mse; } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalUmlMessage.g:292:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2 = 2; int LA2_0 = input.LA(1); @@ -257,7 +251,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt2) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g: + // InternalUmlMessage.g: { if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) { input.consume(); @@ -281,10 +275,10 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:70: '\\'' ( options {greedy=false; } : . )* '\\'' + // InternalUmlMessage.g:292:70: '\\'' ( options {greedy=false; } : . )* '\\'' { match('\''); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:75: ( options {greedy=false; } : . )* + // InternalUmlMessage.g:292:75: ( options {greedy=false; } : . )* loop3: do { int alt3 = 2; int LA3_0 = input.LA(1); @@ -298,7 +292,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt3) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:292:103: . + // InternalUmlMessage.g:292:103: . { matchAny(); @@ -332,14 +326,11 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | - // '\"' ) ) )* '\"' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | - // '\"' ) ) )* '\"' + // InternalUmlMessage.g:294:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) + // InternalUmlMessage.g:294:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | - // '\"' ) ) )* + // InternalUmlMessage.g:294:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* loop5: do { int alt5 = 3; int LA5_0 = input.LA(1); @@ -353,7 +344,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt5) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) + // InternalUmlMessage.g:294:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) { match('\\'); if (input.LA(1) == '\"' || input.LA(1) == '\'' || input.LA(1) == '\\' || input.LA(1) == 'b' || input.LA(1) == 'f' || input.LA(1) == 'n' || input.LA(1) == 'r' || input.LA(1) == 't') { @@ -369,7 +360,7 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:294:61: ~ ( ( '\\\\' | '\"' ) ) + // InternalUmlMessage.g:294:61: ~ ( ( '\\\\' | '\"' ) ) { if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) { input.consume(); @@ -405,8 +396,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' + // InternalUmlMessage.g:296:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' ) + // InternalUmlMessage.g:296:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' { match("/*"); @@ -419,7 +410,7 @@ public class InternalUmlMessageLexer extends Lexer { throw mse; } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:31: ( options {greedy=false; } : . )* + // InternalUmlMessage.g:296:31: ( options {greedy=false; } : . )* loop6: do { int alt6 = 2; int LA6_0 = input.LA(1); @@ -441,7 +432,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt6) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:296:59: . + // InternalUmlMessage.g:296:59: . { matchAny(); @@ -470,12 +461,12 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalUmlMessage.g:298:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalUmlMessage.g:298:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )* + // InternalUmlMessage.g:298:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )* loop7: do { int alt7 = 2; int LA7_0 = input.LA(1); @@ -487,7 +478,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt7) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:24: ~ ( ( '\\n' | '\\r' | '@' ) ) + // InternalUmlMessage.g:298:24: ~ ( ( '\\n' | '\\r' | '@' ) ) { if ((input.LA(1) >= '\u0000' && input.LA(1) <= '\t') || (input.LA(1) >= '\u000B' && input.LA(1) <= '\f') || (input.LA(1) >= '\u000E' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) { input.consume(); @@ -507,7 +498,7 @@ public class InternalUmlMessageLexer extends Lexer { } } while (true); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:44: ( ( '\\r' )? '\\n' )? + // InternalUmlMessage.g:298:44: ( ( '\\r' )? '\\n' )? int alt9 = 2; int LA9_0 = input.LA(1); @@ -516,9 +507,9 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt9) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:45: ( '\\r' )? '\\n' + // InternalUmlMessage.g:298:45: ( '\\r' )? '\\n' { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:45: ( '\\r' )? + // InternalUmlMessage.g:298:45: ( '\\r' )? int alt8 = 2; int LA8_0 = input.LA(1); @@ -527,7 +518,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt8) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:298:45: '\\r' + // InternalUmlMessage.g:298:45: '\\r' { match('\r'); @@ -558,10 +549,10 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:12: ( '0' .. '9' )+ + // InternalUmlMessage.g:300:10: ( ( '0' .. '9' )+ ) + // InternalUmlMessage.g:300:12: ( '0' .. '9' )+ { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:12: ( '0' .. '9' )+ + // InternalUmlMessage.g:300:12: ( '0' .. '9' )+ int cnt10 = 0; loop10: do { int alt10 = 2; @@ -574,7 +565,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt10) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:300:13: '0' .. '9' + // InternalUmlMessage.g:300:13: '0' .. '9' { matchRange('0', '9'); @@ -582,9 +573,8 @@ public class InternalUmlMessageLexer extends Lexer { break; default: - if (cnt10 >= 1) { + if (cnt10 >= 1) break loop10; - } EarlyExitException eee = new EarlyExitException(10, input); throw eee; } @@ -606,13 +596,13 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_INTEGER_VALUE; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:20: ( ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? - // '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? - // '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) + // InternalUmlMessage.g:302:20: ( ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) + // )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) ) + // InternalUmlMessage.g:302:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* + // | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' - // )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) + // InternalUmlMessage.g:302:22: ( ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) | ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* | ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) + // )* | '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* ) int alt23 = 4; int LA23_0 = input.LA(1); @@ -653,9 +643,9 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt23) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) + // InternalUmlMessage.g:302:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) + // InternalUmlMessage.g:302:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) int alt13 = 2; int LA13_0 = input.LA(1); @@ -670,17 +660,17 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt13) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:24: '0' + // InternalUmlMessage.g:302:24: '0' { match('0'); } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:28: '1' .. '9' ( ( '_' )? '0' .. '9' )* + // InternalUmlMessage.g:302:28: '1' .. '9' ( ( '_' )? '0' .. '9' )* { matchRange('1', '9'); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:37: ( ( '_' )? '0' .. '9' )* + // InternalUmlMessage.g:302:37: ( ( '_' )? '0' .. '9' )* loop12: do { int alt12 = 2; int LA12_0 = input.LA(1); @@ -692,9 +682,9 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt12) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:38: ( '_' )? '0' .. '9' + // InternalUmlMessage.g:302:38: ( '_' )? '0' .. '9' { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:38: ( '_' )? + // InternalUmlMessage.g:302:38: ( '_' )? int alt11 = 2; int LA11_0 = input.LA(1); @@ -703,7 +693,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt11) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:38: '_' + // InternalUmlMessage.g:302:38: '_' { match('_'); @@ -732,9 +722,9 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* + // InternalUmlMessage.g:302:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:55: ( '0b' | '0B' ) + // InternalUmlMessage.g:302:55: ( '0b' | '0B' ) int alt14 = 2; int LA14_0 = input.LA(1); @@ -757,7 +747,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt14) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:56: '0b' + // InternalUmlMessage.g:302:56: '0b' { match("0b"); @@ -765,7 +755,7 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:61: '0B' + // InternalUmlMessage.g:302:61: '0B' { match("0B"); @@ -776,7 +766,7 @@ public class InternalUmlMessageLexer extends Lexer { } matchRange('0', '1'); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:76: ( ( '_' )? '0' .. '1' )* + // InternalUmlMessage.g:302:76: ( ( '_' )? '0' .. '1' )* loop16: do { int alt16 = 2; int LA16_0 = input.LA(1); @@ -788,9 +778,9 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt16) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:77: ( '_' )? '0' .. '1' + // InternalUmlMessage.g:302:77: ( '_' )? '0' .. '1' { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:77: ( '_' )? + // InternalUmlMessage.g:302:77: ( '_' )? int alt15 = 2; int LA15_0 = input.LA(1); @@ -799,7 +789,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt15) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:77: '_' + // InternalUmlMessage.g:302:77: '_' { match('_'); @@ -822,10 +812,9 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 3: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' - // | 'a' .. 'f' | 'A' .. 'F' ) )* + // InternalUmlMessage.g:302:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:93: ( '0x' | '0X' ) + // InternalUmlMessage.g:302:93: ( '0x' | '0X' ) int alt17 = 2; int LA17_0 = input.LA(1); @@ -848,7 +837,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt17) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:94: '0x' + // InternalUmlMessage.g:302:94: '0x' { match("0x"); @@ -856,7 +845,7 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:99: '0X' + // InternalUmlMessage.g:302:99: '0X' { match("0X"); @@ -875,7 +864,7 @@ public class InternalUmlMessageLexer extends Lexer { throw mse; } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* + // InternalUmlMessage.g:302:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* loop19: do { int alt19 = 2; int LA19_0 = input.LA(1); @@ -887,9 +876,9 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt19) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) + // InternalUmlMessage.g:302:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:135: ( '_' )? + // InternalUmlMessage.g:302:135: ( '_' )? int alt18 = 2; int LA18_0 = input.LA(1); @@ -898,7 +887,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt18) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:135: '_' + // InternalUmlMessage.g:302:135: '_' { match('_'); @@ -929,10 +918,10 @@ public class InternalUmlMessageLexer extends Lexer { } break; case 4: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* + // InternalUmlMessage.g:302:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* { match('0'); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:175: ( '_' )? + // InternalUmlMessage.g:302:175: ( '_' )? int alt20 = 2; int LA20_0 = input.LA(1); @@ -941,7 +930,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt20) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:175: '_' + // InternalUmlMessage.g:302:175: '_' { match('_'); @@ -951,7 +940,7 @@ public class InternalUmlMessageLexer extends Lexer { } matchRange('0', '7'); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:189: ( ( '_' )? '0' .. '7' )* + // InternalUmlMessage.g:302:189: ( ( '_' )? '0' .. '7' )* loop22: do { int alt22 = 2; int LA22_0 = input.LA(1); @@ -963,9 +952,9 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt22) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:190: ( '_' )? '0' .. '7' + // InternalUmlMessage.g:302:190: ( '_' )? '0' .. '7' { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:190: ( '_' )? + // InternalUmlMessage.g:302:190: ( '_' )? int alt21 = 2; int LA21_0 = input.LA(1); @@ -974,7 +963,7 @@ public class InternalUmlMessageLexer extends Lexer { } switch (alt21) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:302:190: '_' + // InternalUmlMessage.g:302:190: '_' { match('_'); @@ -1014,10 +1003,10 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalUmlMessage.g:304:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalUmlMessage.g:304:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt24 = 0; loop24: do { int alt24 = 2; @@ -1030,7 +1019,7 @@ public class InternalUmlMessageLexer extends Lexer { switch (alt24) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g: + // InternalUmlMessage.g: { if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') { input.consume(); @@ -1046,9 +1035,8 @@ public class InternalUmlMessageLexer extends Lexer { break; default: - if (cnt24 >= 1) { + if (cnt24 >= 1) break loop24; - } EarlyExitException eee = new EarlyExitException(24, input); throw eee; } @@ -1070,8 +1058,8 @@ public class InternalUmlMessageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:306:16: ( . ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:306:18: . + // InternalUmlMessage.g:306:16: ( . ) + // InternalUmlMessage.g:306:18: . { matchAny(); @@ -1084,106 +1072,104 @@ public class InternalUmlMessageLexer extends Lexer { } // $ANTLR end "RULE_ANY_OTHER" - @Override public void mTokens() throws RecognitionException { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING | - // RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | RULE_WS | RULE_ANY_OTHER ) + // InternalUmlMessage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | RULE_WS | RULE_ANY_OTHER ) int alt25 = 14; alt25 = dfa25.predict(input); switch (alt25) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:10: T__13 + // InternalUmlMessage.g:1:10: T__13 { mT__13(); } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:16: T__14 + // InternalUmlMessage.g:1:16: T__14 { mT__14(); } break; case 3: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:22: T__15 + // InternalUmlMessage.g:1:22: T__15 { mT__15(); } break; case 4: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:28: T__16 + // InternalUmlMessage.g:1:28: T__16 { mT__16(); } break; case 5: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:34: T__17 + // InternalUmlMessage.g:1:34: T__17 { mT__17(); } break; case 6: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAME_RULE + // InternalUmlMessage.g:1:40: RULE_NAME_RULE { mRULE_NAME_RULE(); } break; case 7: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:55: RULE_ID + // InternalUmlMessage.g:1:55: RULE_ID { mRULE_ID(); } break; case 8: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:63: RULE_STRING + // InternalUmlMessage.g:1:63: RULE_STRING { mRULE_STRING(); } break; case 9: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:75: RULE_ML_COMMENT + // InternalUmlMessage.g:1:75: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 10: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:91: RULE_SL_COMMENT + // InternalUmlMessage.g:1:91: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 11: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:107: RULE_INT + // InternalUmlMessage.g:1:107: RULE_INT { mRULE_INT(); } break; case 12: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:116: RULE_INTEGER_VALUE + // InternalUmlMessage.g:1:116: RULE_INTEGER_VALUE { mRULE_INTEGER_VALUE(); } break; case 13: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:135: RULE_WS + // InternalUmlMessage.g:1:135: RULE_WS { mRULE_WS(); } break; case 14: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:1:143: RULE_ANY_OTHER + // InternalUmlMessage.g:1:143: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1196,25 +1182,25 @@ public class InternalUmlMessageLexer extends Lexer { protected DFA25 dfa25 = new DFA25(this); - static final String DFA25_eotS = "\6\uffff\1\25\1\uffff\3\16\2\33\7\uffff\1\25\7\uffff\2\33\1\uffff" + "\1\33"; + static final String DFA25_eotS = "\6\uffff\1\24\1\uffff\3\16\2\34\10\uffff\1\24\5\uffff\1\34\1\uffff\1\34\1\uffff\1\34"; static final String DFA25_eofS = "\40\uffff"; - static final String DFA25_minS = "\1\0\5\uffff\1\60\1\uffff\2\0\1\52\2\60\7\uffff\1\60\7\uffff\2" + "\60\1\uffff\1\60"; - static final String DFA25_maxS = "\1\uffff\5\uffff\1\172\1\uffff\2\uffff\1\57\1\170\1\137\7\uffff" + "\1\172\7\uffff\2\137\1\uffff\1\137"; - static final String DFA25_acceptS = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\uffff\1\7\5\uffff\1\15\1\16\1\1" + "\1\2\1\3\1\4\1\5\1\uffff\1\6\1\7\1\10\1\11\1\12\1\14\1\13\2\uffff" + "\1\15\1\uffff"; - static final String DFA25_specialS = "\1\2\7\uffff\1\1\1\0\26\uffff}>"; + static final String DFA25_minS = "\1\0\5\uffff\1\60\1\uffff\2\0\1\52\2\60\10\uffff\1\60\5\uffff\1\60\1\uffff\1\60\1\uffff\1\60"; + static final String DFA25_maxS = "\1\uffff\5\uffff\1\172\1\uffff\2\uffff\1\57\1\170\1\137\10\uffff\1\172\5\uffff\1\137\1\uffff\1\137\1\uffff\1\137"; + static final String DFA25_acceptS = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\uffff\1\7\5\uffff\1\15\1\16\1\1\1\2\1\3\1\4\1\5\1\6\1\uffff\1\7\1\10\1\11\1\12\1\14\1\uffff\1\13\1\uffff\1\15\1\uffff"; + static final String DFA25_specialS = "\1\0\7\uffff\1\1\1\2\26\uffff}>"; static final String[] DFA25_transitionS = { - "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\11\4\16\1\10\2\16\1" + "\3\3\16\1\1\1\12\1\13\11\14\1\2\6\16\32\6\1\4\1\16\1\5\1\16" + "\1\7\1\16\32\6\uff85\16", + "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\11\4\16\1\10\2\16\1\3\3\16\1\1\1\12\1\13\11\14\1\2\6\16\32\6\1\4\1\16\1\5\1\16\1\7\1\16\32\6\uff85\16", "", "", "", "", "", - "\12\24\7\uffff\32\24\4\uffff\1\24\1\uffff\32\24", + "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", "", "\0\26", "\0\27", "\1\30\4\uffff\1\31", - "\10\34\12\uffff\1\32\25\uffff\1\32\6\uffff\1\32\2\uffff\1" + "\32\25\uffff\1\32", + "\10\33\12\uffff\1\32\25\uffff\1\32\6\uffff\1\32\2\uffff\1\32\25\uffff\1\32", "\12\35\45\uffff\1\32", "", "", @@ -1223,18 +1209,19 @@ public class InternalUmlMessageLexer extends Lexer { "", "", "", - "\12\24\7\uffff\32\24\4\uffff\1\24\1\uffff\32\24", - "", "", + "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25", "", "", "", "", "", "\10\37\47\uffff\1\32", + "", "\12\35\45\uffff\1\32", "", - "\10\37\47\uffff\1\32" }; + "\10\37\47\uffff\1\32" + }; static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS); static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS); @@ -1266,45 +1253,15 @@ public class InternalUmlMessageLexer extends Lexer { this.transition = DFA25_transition; } - @Override public String getDescription() { return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | RULE_NAME_RULE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | RULE_WS | RULE_ANY_OTHER );"; } - @Override public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; int _s = s; switch (s) { case 0: - int LA25_9 = input.LA(1); - - s = -1; - if (((LA25_9 >= '\u0000' && LA25_9 <= '\uFFFF'))) { - s = 23; - } else { - s = 14; - } - - if (s >= 0) { - return s; - } - break; - case 1: - int LA25_8 = input.LA(1); - - s = -1; - if (((LA25_8 >= '\u0000' && LA25_8 <= '\uFFFF'))) { - s = 22; - } else { - s = 14; - } - - if (s >= 0) { - return s; - } - break; - case 2: int LA25_0 = input.LA(1); s = -1; @@ -1365,9 +1322,36 @@ public class InternalUmlMessageLexer extends Lexer { s = 14; } - if (s >= 0) { + if (s >= 0) return s; + break; + case 1: + int LA25_8 = input.LA(1); + + s = -1; + if (((LA25_8 >= '\u0000' && LA25_8 <= '\uFFFF'))) { + s = 22; } + + else + s = 14; + + if (s >= 0) + return s; + break; + case 2: + int LA25_9 = input.LA(1); + + s = -1; + if (((LA25_9 >= '\u0000' && LA25_9 <= '\uFFFF'))) { + s = 23; + } + + else + s = 14; + + if (s >= 0) + return s; break; } NoViableAltException nvae = new NoViableAltException(getDescription(), 25, _s, input); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java index a80654ad0e4..62099becb98 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessageParser.java @@ -14,22 +14,23 @@ import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken; @SuppressWarnings("all") public class InternalUmlMessageParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_NAME_RULE", "RULE_INT", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_INTEGER_VALUE", "RULE_WS", "RULE_ANY_OTHER", "'.'", "':'", "'*'", "'['", "']'" }; + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_NAME_RULE", "RULE_INT", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_INTEGER_VALUE", "RULE_WS", "RULE_ANY_OTHER", "'.'", "':'", "'*'", "'['", "']'" + }; public static final int RULE_ID = 6; + public static final int RULE_WS = 11; public static final int RULE_STRING = 7; - public static final int T__16 = 16; + public static final int RULE_ANY_OTHER = 12; + public static final int RULE_SL_COMMENT = 9; public static final int T__15 = 15; + public static final int T__16 = 16; public static final int T__17 = 17; - public static final int T__14 = 14; - public static final int T__13 = 13; - public static final int RULE_ANY_OTHER = 12; public static final int RULE_INT = 5; + public static final int RULE_ML_COMMENT = 8; public static final int RULE_INTEGER_VALUE = 10; - public static final int RULE_WS = 11; - public static final int RULE_SL_COMMENT = 9; + public static final int T__13 = 13; + public static final int T__14 = 14; public static final int EOF = -1; public static final int RULE_NAME_RULE = 4; - public static final int RULE_ML_COMMENT = 8; // delegates // delegators @@ -45,12 +46,10 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } - @Override public String[] getTokenNames() { return InternalUmlMessageParser.tokenNames; } - @Override public String getGrammarFileName() { return "../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g"; } @@ -78,7 +77,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleMessageRule" - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:67:1: entryRuleMessageRule returns [EObject current=null] : iv_ruleMessageRule= ruleMessageRule EOF ; + // InternalUmlMessage.g:67:1: entryRuleMessageRule returns [EObject current=null] : iv_ruleMessageRule= ruleMessageRule EOF ; public final EObject entryRuleMessageRule() throws RecognitionException { EObject current = null; @@ -86,17 +85,17 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:68:2: (iv_ruleMessageRule= ruleMessageRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:69:2: iv_ruleMessageRule= ruleMessageRule EOF + // InternalUmlMessage.g:68:2: (iv_ruleMessageRule= ruleMessageRule EOF ) + // InternalUmlMessage.g:69:2: iv_ruleMessageRule= ruleMessageRule EOF { newCompositeNode(grammarAccess.getMessageRuleRule()); - pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule75); + pushFollow(FOLLOW_1); iv_ruleMessageRule = ruleMessageRule(); state._fsp--; current = iv_ruleMessageRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleMessageRule85); + match(input, EOF, FOLLOW_2); } @@ -113,8 +112,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleMessageRule" - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:76:1: ruleMessageRule returns [EObject current=null] : ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) - // (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) ; + // InternalUmlMessage.g:76:1: ruleMessageRule returns [EObject current=null] : ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) ; public final EObject ruleMessageRule() throws RecognitionException { EObject current = null; @@ -129,26 +127,22 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:79:28: ( ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( - // (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= - // ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) + // InternalUmlMessage.g:79:28: ( ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) ) + // InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( - // (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( - // (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) + // InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) ) + // InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAME_RULE ) ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule ) + // InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) + // InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:82:3: lv_sequenceTerm_0_0= ruleSequenceTermRule + // InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule ) + // InternalUmlMessage.g:82:3: lv_sequenceTerm_0_0= ruleSequenceTermRule { newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0()); - pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131); + pushFollow(FOLLOW_3); lv_sequenceTerm_0_0 = ruleSequenceTermRule(); state._fsp--; @@ -161,7 +155,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { current, "sequenceTerm", lv_sequenceTerm_0_0, - "SequenceTermRule"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.SequenceTermRule"); afterParserOrEnumRuleCall(); @@ -170,7 +164,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:98:2: (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* + // InternalUmlMessage.g:98:2: (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* loop1: do { int alt1 = 2; int LA1_0 = input.LA(1); @@ -182,22 +176,22 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { switch (alt1) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:98:4: otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) + // InternalUmlMessage.g:98:4: otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) { - otherlv_1 = (Token) match(input, 13, FOLLOW_13_in_ruleMessageRule144); + otherlv_1 = (Token) match(input, 13, FOLLOW_4); newLeafNode(otherlv_1, grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0()); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:102:1: ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule ) + // InternalUmlMessage.g:102:1: ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) + // InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:104:3: lv_sequenceTerm_2_0= ruleSequenceTermRule + // InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule ) + // InternalUmlMessage.g:104:3: lv_sequenceTerm_2_0= ruleSequenceTermRule { newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0()); - pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165); + pushFollow(FOLLOW_3); lv_sequenceTerm_2_0 = ruleSequenceTermRule(); state._fsp--; @@ -210,7 +204,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { current, "sequenceTerm", lv_sequenceTerm_2_0, - "SequenceTermRule"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.SequenceTermRule"); afterParserOrEnumRuleCall(); @@ -228,17 +222,17 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_3 = (Token) match(input, 14, FOLLOW_14_in_ruleMessageRule179); + otherlv_3 = (Token) match(input, 14, FOLLOW_5); newLeafNode(otherlv_3, grammarAccess.getMessageRuleAccess().getColonKeyword_2()); - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:124:1: ( (lv_name_4_0= RULE_NAME_RULE ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAME_RULE ) + // InternalUmlMessage.g:124:1: ( (lv_name_4_0= RULE_NAME_RULE ) ) + // InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAME_RULE ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAME_RULE ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:126:3: lv_name_4_0= RULE_NAME_RULE + // InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAME_RULE ) + // InternalUmlMessage.g:126:3: lv_name_4_0= RULE_NAME_RULE { - lv_name_4_0 = (Token) match(input, RULE_NAME_RULE, FOLLOW_RULE_NAME_RULE_in_ruleMessageRule196); + lv_name_4_0 = (Token) match(input, RULE_NAME_RULE, FOLLOW_2); newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNAME_RULETerminalRuleCall_3_0()); @@ -250,7 +244,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { current, "name", lv_name_4_0, - "NAME_RULE"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.NAME_RULE"); } @@ -278,8 +272,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleSequenceTermRule" - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:150:1: entryRuleSequenceTermRule returns [EObject current=null] : iv_ruleSequenceTermRule= - // ruleSequenceTermRule EOF ; + // InternalUmlMessage.g:150:1: entryRuleSequenceTermRule returns [EObject current=null] : iv_ruleSequenceTermRule= ruleSequenceTermRule EOF ; public final EObject entryRuleSequenceTermRule() throws RecognitionException { EObject current = null; @@ -287,17 +280,17 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:151:2: (iv_ruleSequenceTermRule= ruleSequenceTermRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:152:2: iv_ruleSequenceTermRule= ruleSequenceTermRule EOF + // InternalUmlMessage.g:151:2: (iv_ruleSequenceTermRule= ruleSequenceTermRule EOF ) + // InternalUmlMessage.g:152:2: iv_ruleSequenceTermRule= ruleSequenceTermRule EOF { newCompositeNode(grammarAccess.getSequenceTermRuleRule()); - pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237); + pushFollow(FOLLOW_1); iv_ruleSequenceTermRule = ruleSequenceTermRule(); state._fsp--; current = iv_ruleSequenceTermRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleSequenceTermRule247); + match(input, EOF, FOLLOW_2); } @@ -314,8 +307,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleSequenceTermRule" - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:159:1: ruleSequenceTermRule returns [EObject current=null] : ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( - // (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ; + // InternalUmlMessage.g:159:1: ruleSequenceTermRule returns [EObject current=null] : ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ; public final EObject ruleSequenceTermRule() throws RecognitionException { EObject current = null; @@ -327,23 +319,19 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:162:28: ( ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( - // (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( - // (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) + // InternalUmlMessage.g:162:28: ( ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ) + // InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( - // (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( - // (lv_recurrence_2_0= ruleRecurrenceRule ) )? + // InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) + // InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT ) + // InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) + // InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:165:3: lv_sequencialOrder_0_0= RULE_INT + // InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT ) + // InternalUmlMessage.g:165:3: lv_sequencialOrder_0_0= RULE_INT { - lv_sequencialOrder_0_0 = (Token) match(input, RULE_INT, FOLLOW_RULE_INT_in_ruleSequenceTermRule289); + lv_sequencialOrder_0_0 = (Token) match(input, RULE_INT, FOLLOW_6); newLeafNode(lv_sequencialOrder_0_0, grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0()); @@ -355,7 +343,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { current, "sequencialOrder", lv_sequencialOrder_0_0, - "INT"); + "org.eclipse.papyrus.uml.alf.Common.INT"); } @@ -363,7 +351,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:181:2: ( (lv_sequenceName_1_0= RULE_ID ) )? + // InternalUmlMessage.g:181:2: ( (lv_sequenceName_1_0= RULE_ID ) )? int alt2 = 2; int LA2_0 = input.LA(1); @@ -372,12 +360,12 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } switch (alt2) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID ) + // InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:183:3: lv_sequenceName_1_0= RULE_ID + // InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID ) + // InternalUmlMessage.g:183:3: lv_sequenceName_1_0= RULE_ID { - lv_sequenceName_1_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleSequenceTermRule311); + lv_sequenceName_1_0 = (Token) match(input, RULE_ID, FOLLOW_7); newLeafNode(lv_sequenceName_1_0, grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0()); @@ -389,7 +377,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { current, "sequenceName", lv_sequenceName_1_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } @@ -400,7 +388,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:199:3: ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? + // InternalUmlMessage.g:199:3: ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? int alt3 = 2; int LA3_0 = input.LA(1); @@ -409,15 +397,15 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } switch (alt3) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule ) + // InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:201:3: lv_recurrence_2_0= ruleRecurrenceRule + // InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule ) + // InternalUmlMessage.g:201:3: lv_recurrence_2_0= ruleRecurrenceRule { newCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0()); - pushFollow(FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338); + pushFollow(FOLLOW_2); lv_recurrence_2_0 = ruleRecurrenceRule(); state._fsp--; @@ -430,7 +418,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { current, "recurrence", lv_recurrence_2_0, - "RecurrenceRule"); + "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.RecurrenceRule"); afterParserOrEnumRuleCall(); @@ -462,8 +450,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleRecurrenceRule" - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:225:1: entryRuleRecurrenceRule returns [String current=null] : iv_ruleRecurrenceRule= ruleRecurrenceRule - // EOF ; + // InternalUmlMessage.g:225:1: entryRuleRecurrenceRule returns [String current=null] : iv_ruleRecurrenceRule= ruleRecurrenceRule EOF ; public final String entryRuleRecurrenceRule() throws RecognitionException { String current = null; @@ -471,17 +458,17 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:226:2: (iv_ruleRecurrenceRule= ruleRecurrenceRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:227:2: iv_ruleRecurrenceRule= ruleRecurrenceRule EOF + // InternalUmlMessage.g:226:2: (iv_ruleRecurrenceRule= ruleRecurrenceRule EOF ) + // InternalUmlMessage.g:227:2: iv_ruleRecurrenceRule= ruleRecurrenceRule EOF { newCompositeNode(grammarAccess.getRecurrenceRuleRule()); - pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376); + pushFollow(FOLLOW_1); iv_ruleRecurrenceRule = ruleRecurrenceRule(); state._fsp--; current = iv_ruleRecurrenceRule.getText(); - match(input, EOF, FOLLOW_EOF_in_entryRuleRecurrenceRule387); + match(input, EOF, FOLLOW_2); } @@ -498,8 +485,7 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleRecurrenceRule" - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:234:1: ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= - // '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ; + // InternalUmlMessage.g:234:1: ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ; public final AntlrDatatypeRuleToken ruleRecurrenceRule() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -510,13 +496,10 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:237:28: ( ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= - // RULE_STRING kw= ']' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= - // RULE_STRING kw= ']' ) ) + // InternalUmlMessage.g:237:28: ( ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ) + // InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= - // RULE_STRING kw= ']' ) ) + // InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) int alt4 = 2; int LA4_0 = input.LA(1); @@ -531,29 +514,29 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } switch (alt4) { case 1: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) + // InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:239:2: kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' + // InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) + // InternalUmlMessage.g:239:2: kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' { - kw = (Token) match(input, 15, FOLLOW_15_in_ruleRecurrenceRule426); + kw = (Token) match(input, 15, FOLLOW_8); current.merge(kw); newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0()); - kw = (Token) match(input, 16, FOLLOW_16_in_ruleRecurrenceRule439); + kw = (Token) match(input, 16, FOLLOW_9); current.merge(kw); newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1()); - this_STRING_2 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleRecurrenceRule454); + this_STRING_2 = (Token) match(input, RULE_STRING, FOLLOW_10); current.merge(this_STRING_2); newLeafNode(this_STRING_2, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2()); - kw = (Token) match(input, 17, FOLLOW_17_in_ruleRecurrenceRule472); + kw = (Token) match(input, 17, FOLLOW_2); current.merge(kw); newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3()); @@ -565,24 +548,24 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) + // InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) { - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) - // ../org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/parser/antlr/internal/InternalUmlMessage.g:265:2: kw= '[' this_STRING_5= RULE_STRING kw= ']' + // InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) + // InternalUmlMessage.g:265:2: kw= '[' this_STRING_5= RULE_STRING kw= ']' { - kw = (Token) match(input, 16, FOLLOW_16_in_ruleRecurrenceRule493); + kw = (Token) match(input, 16, FOLLOW_9); current.merge(kw); newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0()); - this_STRING_5 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleRecurrenceRule508); + this_STRING_5 = (Token) match(input, RULE_STRING, FOLLOW_10); current.merge(this_STRING_5); newLeafNode(this_STRING_5, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1()); - kw = (Token) match(input, 17, FOLLOW_17_in_ruleRecurrenceRule526); + kw = (Token) match(input, 17, FOLLOW_2); current.merge(kw); newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2()); @@ -616,26 +599,15 @@ public class InternalUmlMessageParser extends AbstractInternalAntlrParser { - public static final BitSet FOLLOW_ruleMessageRule_in_entryRuleMessageRule75 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleMessageRule85 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131 = new BitSet(new long[] { 0x0000000000006000L }); - public static final BitSet FOLLOW_13_in_ruleMessageRule144 = new BitSet(new long[] { 0x0000000000000020L }); - public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165 = new BitSet(new long[] { 0x0000000000006000L }); - public static final BitSet FOLLOW_14_in_ruleMessageRule179 = new BitSet(new long[] { 0x0000000000000010L }); - public static final BitSet FOLLOW_RULE_NAME_RULE_in_ruleMessageRule196 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule247 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_RULE_INT_in_ruleSequenceTermRule289 = new BitSet(new long[] { 0x0000000000018042L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleSequenceTermRule311 = new BitSet(new long[] { 0x0000000000018002L }); - public static final BitSet FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule387 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_15_in_ruleRecurrenceRule426 = new BitSet(new long[] { 0x0000000000010000L }); - public static final BitSet FOLLOW_16_in_ruleRecurrenceRule439 = new BitSet(new long[] { 0x0000000000000080L }); - public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule454 = new BitSet(new long[] { 0x0000000000020000L }); - public static final BitSet FOLLOW_17_in_ruleRecurrenceRule472 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_16_in_ruleRecurrenceRule493 = new BitSet(new long[] { 0x0000000000000080L }); - public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule508 = new BitSet(new long[] { 0x0000000000020000L }); - public static final BitSet FOLLOW_17_in_ruleRecurrenceRule526 = new BitSet(new long[] { 0x0000000000000002L }); + public static final BitSet FOLLOW_1 = new BitSet(new long[] { 0x0000000000000000L }); + public static final BitSet FOLLOW_2 = new BitSet(new long[] { 0x0000000000000002L }); + public static final BitSet FOLLOW_3 = new BitSet(new long[] { 0x0000000000006000L }); + public static final BitSet FOLLOW_4 = new BitSet(new long[] { 0x0000000000000020L }); + public static final BitSet FOLLOW_5 = new BitSet(new long[] { 0x0000000000000010L }); + public static final BitSet FOLLOW_6 = new BitSet(new long[] { 0x0000000000018042L }); + public static final BitSet FOLLOW_7 = new BitSet(new long[] { 0x0000000000018002L }); + public static final BitSet FOLLOW_8 = new BitSet(new long[] { 0x0000000000010000L }); + public static final BitSet FOLLOW_9 = new BitSet(new long[] { 0x0000000000000080L }); + public static final BitSet FOLLOW_10 = new BitSet(new long[] { 0x0000000000020000L }); }
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java index a45b2a7a83c..f7c358f4055 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSemanticSequencer.java @@ -3,11 +3,18 @@ */ package org.eclipse.papyrus.uml.textedit.message.xtext.serializer; +import java.util.Set; + import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.papyrus.uml.textedit.message.xtext.services.UmlMessageGrammarAccess; import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule; import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule; import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage; +import org.eclipse.xtext.Action; +import org.eclipse.xtext.Parameter; +import org.eclipse.xtext.ParserRule; +import org.eclipse.xtext.serializer.ISerializationContext; import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer; import com.google.inject.Inject; @@ -19,8 +26,12 @@ public class UmlMessageSemanticSequencer extends AbstractDelegatingSemanticSeque private UmlMessageGrammarAccess grammarAccess; @Override - public void createSequence(EObject context, EObject semanticObject) { - if (semanticObject.eClass().getEPackage() == UmlMessagePackage.eINSTANCE) { + public void sequence(ISerializationContext context, EObject semanticObject) { + EPackage epackage = semanticObject.eClass().getEPackage(); + ParserRule rule = context.getParserRule(); + Action action = context.getAssignedAction(); + Set<Parameter> parameters = context.getEnabledBooleanParameters(); + if (epackage == UmlMessagePackage.eINSTANCE) switch (semanticObject.eClass().getClassifierID()) { case UmlMessagePackage.MESSAGE_RULE: sequence_MessageRule(context, (MessageRule) semanticObject); @@ -29,26 +40,32 @@ public class UmlMessageSemanticSequencer extends AbstractDelegatingSemanticSeque sequence_SequenceTermRule(context, (SequenceTermRule) semanticObject); return; } - } - if (errorAcceptor != null) { + if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context)); - } } /** + * Contexts: + * MessageRule returns MessageRule + * * Constraint: * (sequenceTerm+=SequenceTermRule sequenceTerm+=SequenceTermRule* name=NAME_RULE) */ - protected void sequence_MessageRule(EObject context, MessageRule semanticObject) { + protected void sequence_MessageRule(ISerializationContext context, MessageRule semanticObject) { genericSequencer.createSequence(context, semanticObject); } /** + * Contexts: + * SequenceTermRule returns SequenceTermRule + * * Constraint: * (sequencialOrder=INT sequenceName=ID? recurrence=RecurrenceRule?) */ - protected void sequence_SequenceTermRule(EObject context, SequenceTermRule semanticObject) { + protected void sequence_SequenceTermRule(ISerializationContext context, SequenceTermRule semanticObject) { genericSequencer.createSequence(context, semanticObject); } + + } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java index 535f2d4a493..0140b8121e4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/serializer/UmlMessageSyntacticSequencer.java @@ -34,9 +34,8 @@ public class UmlMessageSyntacticSequencer extends AbstractSyntacticSequencer { @Override protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) { - if (transition.getAmbiguousSyntaxes().isEmpty()) { + if (transition.getAmbiguousSyntaxes().isEmpty()) return; - } List<INode> transitionNodes = collectNodes(fromNode, toNode); for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) { List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java index 1d21bb68b36..1657c331eaa 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/services/UmlMessageGrammarAccess.java @@ -15,6 +15,7 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; +import org.eclipse.xtext.common.services.TerminalsGrammarAccess; import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; import org.eclipse.xtext.service.GrammarProvider; @@ -26,7 +27,7 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { public class MessageRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MessageRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.MessageRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Assignment cSequenceTermAssignment_0 = (Assignment) cGroup.eContents().get(0); private final RuleCall cSequenceTermSequenceTermRuleParserRuleCall_0_0 = (RuleCall) cSequenceTermAssignment_0.eContents().get(0); @@ -39,13 +40,13 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cNameNAME_RULETerminalRuleCall_3_0 = (RuleCall) cNameAssignment_3.eContents().get(0); // MessageRule: - // sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=NAME_RULE; + // sequenceTerm+=SequenceTermRule ('.' sequenceTerm+=SequenceTermRule)* ':' name=NAME_RULE; @Override public ParserRule getRule() { return rule; } - // sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=NAME_RULE + // sequenceTerm+=SequenceTermRule ('.' sequenceTerm+=SequenceTermRule)* ':' name=NAME_RULE public Group getGroup() { return cGroup; } @@ -60,12 +61,12 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return cSequenceTermSequenceTermRuleParserRuleCall_0_0; } - // ("." sequenceTerm+=SequenceTermRule)* + // ('.' sequenceTerm+=SequenceTermRule)* public Group getGroup_1() { return cGroup_1; } - // "." + // '.' public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; } @@ -80,7 +81,7 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return cSequenceTermSequenceTermRuleParserRuleCall_1_1_0; } - // ":" + // ':' public Keyword getColonKeyword_2() { return cColonKeyword_2; } @@ -97,7 +98,7 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { } public class SequenceTermRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SequenceTermRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.SequenceTermRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Assignment cSequencialOrderAssignment_0 = (Assignment) cGroup.eContents().get(0); private final RuleCall cSequencialOrderINTTerminalRuleCall_0_0 = (RuleCall) cSequencialOrderAssignment_0.eContents().get(0); @@ -106,36 +107,42 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cRecurrenceAssignment_2 = (Assignment) cGroup.eContents().get(2); private final RuleCall cRecurrenceRecurrenceRuleParserRuleCall_2_0 = (RuleCall) cRecurrenceAssignment_2.eContents().get(0); - //// ('.' leftTerms += LeftSequenceTermRule)* // SequenceTermRule: - // sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling - // INT sequenceName=ID? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting + // sequencialOrder=INT + // //represents the sequential order of the Message within the next higher level of procedural calling + // sequenceName=ID? + // // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting + // // recurrence=RecurrenceRule? // The recurrence represents conditional or iterative execution. + // + // //('.' leftTerms += LeftSequenceTermRule)* // ; @Override public ParserRule getRule() { return rule; } - // sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling - // INT sequenceName=ID? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting - // recurrence=RecurrenceRule? // The recurrence represents conditional or iterative execution. + // sequencialOrder=INT //represents the sequential order of the Message within the next higher level of procedural calling + // + // sequenceName=ID? + //// represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting + // + // recurrence=RecurrenceRule? public Group getGroup() { return cGroup; } - // sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling - // INT + // sequencialOrder=INT public Assignment getSequencialOrderAssignment_0() { return cSequencialOrderAssignment_0; } - //// represents the sequential order of the Message within the next higher level of procedural calling // INT public RuleCall getSequencialOrderINTTerminalRuleCall_0_0() { return cSequencialOrderINTTerminalRuleCall_0_0; } + //// represents the sequential order of the Message within the next higher level of procedural calling // sequenceName=ID? public Assignment getSequenceNameAssignment_1() { return cSequenceNameAssignment_1; @@ -146,6 +153,8 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return cSequenceNameIDTerminalRuleCall_1_0; } + //// represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting + // // recurrence=RecurrenceRule? public Assignment getRecurrenceAssignment_2() { return cRecurrenceAssignment_2; @@ -158,7 +167,7 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { } public class RecurrenceRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RecurrenceRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.RecurrenceRule"); private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1); private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0); private final Keyword cAsteriskKeyword_0_0 = (Keyword) cGroup_0.eContents().get(0); @@ -170,55 +179,29 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSTRINGTerminalRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1); private final Keyword cRightSquareBracketKeyword_1_2 = (Keyword) cGroup_1.eContents().get(2); - //// terminal STRING : - //// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ; - /// * messagename= sequenceterm ('.' sequenceterm)* (':' name); - // terminal name: - // ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; - // terminal sequenceterm: - // (INT)(name)?(recurrence)?; - // terminal recurrence: - // ('*''[' STRING ']')|('[' STRING ']'); - // - // sequenceTerm1 = SequenceTermRule - // ('.' sequenceTerm2 = SequenceTermRule )* - // - // * / RecurrenceRule: - // "*" "[" STRING "]" | "[" STRING "]"; + // RecurrenceRule: + // '*' '[' STRING ']' | '[' STRING ']'; @Override public ParserRule getRule() { return rule; } - // "*" "[" STRING "]" //terminal STRING : - //// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ; - /// * messagename= sequenceterm ('.' sequenceterm)* (':' name); - // terminal name: - // ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; - // terminal sequenceterm: - // (INT)(name)?(recurrence)?; - // terminal recurrence: - // ('*''[' STRING ']')|('[' STRING ']'); - // - // sequenceTerm1 = SequenceTermRule - // ('.' sequenceTerm2 = SequenceTermRule )* - // - // * / | "[" STRING "]" + // '*' '[' STRING ']' | '[' STRING ']' public Alternatives getAlternatives() { return cAlternatives; } - // "*" "[" STRING "]" + // '*' '[' STRING ']' public Group getGroup_0() { return cGroup_0; } - // "*" + // '*' public Keyword getAsteriskKeyword_0_0() { return cAsteriskKeyword_0_0; } - // "[" + // '[' public Keyword getLeftSquareBracketKeyword_0_1() { return cLeftSquareBracketKeyword_0_1; } @@ -228,30 +211,17 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return cSTRINGTerminalRuleCall_0_2; } - // "]" + // ']' public Keyword getRightSquareBracketKeyword_0_3() { return cRightSquareBracketKeyword_0_3; } - // "[" STRING "]" //terminal STRING : - //// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ; - /// * messagename= sequenceterm ('.' sequenceterm)* (':' name); - // terminal name: - // ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; - // terminal sequenceterm: - // (INT)(name)?(recurrence)?; - // terminal recurrence: - // ('*''[' STRING ']')|('[' STRING ']'); - // - // sequenceTerm1 = SequenceTermRule - // ('.' sequenceTerm2 = SequenceTermRule )* - // - // * / + // '[' STRING ']' public Group getGroup_1() { return cGroup_1; } - // "[" + // '[' public Keyword getLeftSquareBracketKeyword_1_0() { return cLeftSquareBracketKeyword_1_0; } @@ -261,7 +231,7 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return cSTRINGTerminalRuleCall_1_1; } - // "]" + // ']' public Keyword getRightSquareBracketKeyword_1_2() { return cRightSquareBracketKeyword_1_2; } @@ -277,14 +247,18 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { private final CommonGrammarAccess gaCommon; + private final TerminalsGrammarAccess gaTerminals; + @Inject public UmlMessageGrammarAccess(GrammarProvider grammarProvider, - CommonGrammarAccess gaCommon) { + CommonGrammarAccess gaCommon, + TerminalsGrammarAccess gaTerminals) { this.grammar = internalFindGrammar(grammarProvider); this.gaCommon = gaCommon; + this.gaTerminals = gaTerminals; this.pMessageRule = new MessageRuleElements(); this.pSequenceTermRule = new SequenceTermRuleElements(); - this.tNAME_RULE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "NAME_RULE"); + this.tNAME_RULE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.message.xtext.UmlMessage.NAME_RULE"); this.pRecurrenceRule = new RecurrenceRuleElements(); } @@ -314,9 +288,13 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return gaCommon; } + public TerminalsGrammarAccess getTerminalsGrammarAccess() { + return gaTerminals; + } + // MessageRule: - // sequenceTerm+=SequenceTermRule ("." sequenceTerm+=SequenceTermRule)* ":" name=NAME_RULE; + // sequenceTerm+=SequenceTermRule ('.' sequenceTerm+=SequenceTermRule)* ':' name=NAME_RULE; public MessageRuleElements getMessageRuleAccess() { return pMessageRule; } @@ -325,11 +303,15 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { return getMessageRuleAccess().getRule(); } - //// ('.' leftTerms += LeftSequenceTermRule)* // SequenceTermRule: - // sequencialOrder= //represents the sequential order of the Message within the next higher level of procedural calling - // INT sequenceName=ID? // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting + // sequencialOrder=INT + // //represents the sequential order of the Message within the next higher level of procedural calling + // sequenceName=ID? + // // represents a concurrent thread of control. Messages that differ in the final name are concurrent at that level of nesting + // // recurrence=RecurrenceRule? // The recurrence represents conditional or iterative execution. + // + // //('.' leftTerms += LeftSequenceTermRule)* // ; public SequenceTermRuleElements getSequenceTermRuleAccess() { return pSequenceTermRule; @@ -340,26 +322,13 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { } // terminal NAME_RULE: - // ("a".."z" | "A".."Z") ("a".."z" | "A".."Z" | "_" | "-" | "0".."9" | "(" | ")")*; + // ('a'..'z' | 'A'..'Z') ('a'..'z' | 'A'..'Z' | '_' | '-' | '0'..'9' | '(' | ')')*; public TerminalRule getNAME_RULERule() { return tNAME_RULE; } - //// terminal STRING : - //// ( '\\' ('b'|'t'|'n'|'f'|'r'|'"'|"'"|'\\') | !('\\'|'"') )* ; - /// * messagename= sequenceterm ('.' sequenceterm)* (':' name); - // terminal name: - // ('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; - // terminal sequenceterm: - // (INT)(name)?(recurrence)?; - // terminal recurrence: - // ('*''[' STRING ']')|('[' STRING ']'); - // - // sequenceTerm1 = SequenceTermRule - // ('.' sequenceTerm2 = SequenceTermRule )* - // - // * / RecurrenceRule: - // "*" "[" STRING "]" | "[" STRING "]"; + // RecurrenceRule: + // '*' '[' STRING ']' | '[' STRING ']'; public RecurrenceRuleElements getRecurrenceRuleAccess() { return pRecurrenceRule; } @@ -369,61 +338,51 @@ public class UmlMessageGrammarAccess extends AbstractGrammarElementFinder { } // terminal ID: - // ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")* | "\'"->"\'"; + // ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')* | '\''->'\''; public TerminalRule getIDRule() { return gaCommon.getIDRule(); } // terminal STRING: - // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\""; + // '"' ('\\' ('b' | 't' | 'n' | 'f' | 'r' | '"' | "'" | '\\') | !('\\' | '"'))* '"'; public TerminalRule getSTRINGRule() { return gaCommon.getSTRINGRule(); } // terminal ML_COMMENT: - // "/ *" !"@"->"* /"; + // '/*' !'@'->'*/'; public TerminalRule getML_COMMENTRule() { return gaCommon.getML_COMMENTRule(); } // terminal SL_COMMENT: - // "//" !("\n" | "\r" | "@")* ("\r"? "\n")?; + // '//' !('\n' | '\r' | '@')* ('\r'? '\n')?; public TerminalRule getSL_COMMENTRule() { return gaCommon.getSL_COMMENTRule(); } // terminal INT returns ecore::EInt: - // "0".."9"+; + // '0'..'9'+; public TerminalRule getINTRule() { return gaCommon.getINTRule(); } - //// terminal DOUBLE_COLON : '::' ; - //// terminal IDENTIFIER : ID ; - //// terminal IDENTIFIER : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')* | ('\'' -> '\'') ; - //// terminal DOCUMENTATION_COMMENT : '/ *' -> '* /' ; - //// terminal ML_COMMENT : '/�' -> '�/'; - //// terminal SL_COMMENT : '��' !('\n'|'\r')* ('\r'? '\n')?; - //// terminal WS : (' '|'\t'|'\r'|'\n')+; terminal INTEGER_VALUE: - // ("0" | "1".."9" ("_"? "0".."9")*) //DECIMAL - // // BINARY - // // HEX - // // OCT - // | ("0b" | "0B") "0".."1" ("_"? "0".."1")* | ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F") ("_"? ("0".."9" | "a".."f" | - // "A".."F"))* | "0" "_"? "0".."7" ("_"? "0".."7")*; + // terminal INTEGER_VALUE: + // ('0' | '1'..'9' ('_'? '0'..'9')*) | ('0b' | '0B') '0'..'1' ('_'? '0'..'1')* | ('0x' | '0X') ('0'..'9' | 'a'..'f' | + // 'A'..'F') ('_'? ('0'..'9' | 'a'..'f' | 'A'..'F'))* | '0' '_'? '0'..'7' ('_'? '0'..'7')*; public TerminalRule getINTEGER_VALUERule() { return gaCommon.getINTEGER_VALUERule(); } // terminal WS: - // (" " | "\t" | "\r" | "\n")+; + // ' ' | '\t' | '\r' | '\n'+; public TerminalRule getWSRule() { - return gaCommon.getWSRule(); + return gaTerminals.getWSRule(); } // terminal ANY_OTHER: // .; public TerminalRule getANY_OTHERRule() { - return gaCommon.getANY_OTHERRule(); + return gaTerminals.getANY_OTHERRule(); } } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java index 5f119c8eda1..7ab4effbebb 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/MessageRule.java @@ -32,7 +32,7 @@ public interface MessageRule extends EObject { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Sequence Term</em>' containment reference list. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule_SequenceTerm() * @model containment="true" @@ -48,7 +48,7 @@ public interface MessageRule extends EObject { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getMessageRule_Name() @@ -61,7 +61,7 @@ public interface MessageRule extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Name</em>' attribute. * @see #getName() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java index f89f92ffbcb..1be15517cf8 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/SequenceTermRule.java @@ -31,7 +31,7 @@ public interface SequenceTermRule extends EObject { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Sequencial Order</em>' attribute. * @see #setSequencialOrder(int) * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_SequencialOrder() @@ -44,7 +44,7 @@ public interface SequenceTermRule extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Sequencial Order</em>' attribute. * @see #getSequencialOrder() @@ -60,7 +60,7 @@ public interface SequenceTermRule extends EObject { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Sequence Name</em>' attribute. * @see #setSequenceName(String) * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_SequenceName() @@ -73,7 +73,7 @@ public interface SequenceTermRule extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Sequence Name</em>' attribute. * @see #getSequenceName() @@ -89,7 +89,7 @@ public interface SequenceTermRule extends EObject { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Recurrence</em>' attribute. * @see #setRecurrence(String) * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#getSequenceTermRule_Recurrence() @@ -102,7 +102,7 @@ public interface SequenceTermRule extends EObject { * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Recurrence</em>' attribute. * @see #getRecurrence() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java index c674a467b5e..800faf179fb 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessageFactory.java @@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage * @generated */ @@ -18,7 +18,7 @@ public interface UmlMessageFactory extends EFactory { * The singleton instance of the factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ UmlMessageFactory eINSTANCE = org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessageFactoryImpl.init(); @@ -27,7 +27,7 @@ public interface UmlMessageFactory extends EFactory { * Returns a new object of class '<em>Message Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Message Rule</em>'. * @generated */ @@ -37,7 +37,7 @@ public interface UmlMessageFactory extends EFactory { * Returns a new object of class '<em>Sequence Term Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Sequence Term Rule</em>'. * @generated */ @@ -47,7 +47,7 @@ public interface UmlMessageFactory extends EFactory { * Returns the package supported by this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java index 5207db07e3a..5301dc0e253 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/UmlMessagePackage.java @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessageFactory * @model kind="package" * @generated @@ -28,7 +28,7 @@ public interface UmlMessagePackage extends EPackage { * The package name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNAME = "umlMessage"; @@ -37,7 +37,7 @@ public interface UmlMessagePackage extends EPackage { * The package namespace URI. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNS_URI = "http://www.eclipse.org/papyrus/uml/textedit/message/xtext/UmlMessage"; @@ -46,7 +46,7 @@ public interface UmlMessagePackage extends EPackage { * The package namespace name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNS_PREFIX = "umlMessage"; @@ -55,7 +55,7 @@ public interface UmlMessagePackage extends EPackage { * The singleton instance of the package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ UmlMessagePackage eINSTANCE = org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl.init(); @@ -64,7 +64,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl <em>Message Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getMessageRule() * @generated @@ -75,7 +75,7 @@ public interface UmlMessagePackage extends EPackage { * The feature id for the '<em><b>Sequence Term</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -85,7 +85,7 @@ public interface UmlMessagePackage extends EPackage { * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -95,7 +95,7 @@ public interface UmlMessagePackage extends EPackage { * The number of structural features of the '<em>Message Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -105,7 +105,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl <em>Sequence Term Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getSequenceTermRule() * @generated @@ -116,7 +116,7 @@ public interface UmlMessagePackage extends EPackage { * The feature id for the '<em><b>Sequencial Order</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -126,7 +126,7 @@ public interface UmlMessagePackage extends EPackage { * The feature id for the '<em><b>Sequence Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -136,7 +136,7 @@ public interface UmlMessagePackage extends EPackage { * The feature id for the '<em><b>Recurrence</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -146,7 +146,7 @@ public interface UmlMessagePackage extends EPackage { * The number of structural features of the '<em>Sequence Term Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -157,7 +157,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule <em>Message Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Message Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule * @generated @@ -168,7 +168,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm <em>Sequence Term</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference list '<em>Sequence Term</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getSequenceTerm() * @see #getMessageRule() @@ -180,7 +180,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule#getName() * @see #getMessageRule() @@ -192,7 +192,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule <em>Sequence Term Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Sequence Term Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule * @generated @@ -203,7 +203,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder <em>Sequencial Order</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Sequencial Order</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequencialOrder() * @see #getSequenceTermRule() @@ -215,7 +215,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName <em>Sequence Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Sequence Name</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getSequenceName() * @see #getSequenceTermRule() @@ -227,7 +227,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence <em>Recurrence</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Recurrence</em>'. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule#getRecurrence() * @see #getSequenceTermRule() @@ -239,7 +239,7 @@ public interface UmlMessagePackage extends EPackage { * Returns the factory that creates the instances of the model. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the factory that creates the instances of the model. * @generated */ @@ -255,7 +255,7 @@ public interface UmlMessagePackage extends EPackage { * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * + * * @generated */ interface Literals { @@ -263,7 +263,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl <em>Message Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.MessageRuleImpl * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getMessageRule() * @generated @@ -274,7 +274,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '<em><b>Sequence Term</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference MESSAGE_RULE__SEQUENCE_TERM = eINSTANCE.getMessageRule_SequenceTerm(); @@ -283,7 +283,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute MESSAGE_RULE__NAME = eINSTANCE.getMessageRule_Name(); @@ -292,7 +292,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl <em>Sequence Term Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.SequenceTermRuleImpl * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl.UmlMessagePackageImpl#getSequenceTermRule() * @generated @@ -303,7 +303,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '<em><b>Sequencial Order</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER = eINSTANCE.getSequenceTermRule_SequencialOrder(); @@ -312,7 +312,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '<em><b>Sequence Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute SEQUENCE_TERM_RULE__SEQUENCE_NAME = eINSTANCE.getSequenceTermRule_SequenceName(); @@ -321,7 +321,7 @@ public interface UmlMessagePackage extends EPackage { * The meta object literal for the '<em><b>Recurrence</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute SEQUENCE_TERM_RULE__RECURRENCE = eINSTANCE.getSequenceTermRule_Recurrence(); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java index a2d911e1254..ca364bd3b44 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/MessageRuleImpl.java @@ -36,7 +36,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes * The cached value of the '{@link #getSequenceTerm() <em>Sequence Term</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSequenceTerm() * @generated * @ordered @@ -47,7 +47,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getName() * @generated * @ordered @@ -58,7 +58,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes * The cached value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getName() * @generated * @ordered @@ -68,7 +68,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected MessageRuleImpl() { @@ -78,7 +78,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -89,10 +89,9 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public EList<SequenceTermRule> getSequenceTerm() { if (sequenceTerm == null) { sequenceTerm = new EObjectContainmentEList<SequenceTermRule>(SequenceTermRule.class, this, UmlMessagePackage.MESSAGE_RULE__SEQUENCE_TERM); @@ -103,10 +102,9 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public String getName() { return name; } @@ -114,22 +112,20 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public void setName(String newName) { String oldName = name; name = newName; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.MESSAGE_RULE__NAME, oldName, name)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -144,7 +140,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -161,7 +157,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @SuppressWarnings("unchecked") @@ -182,7 +178,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -201,7 +197,7 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -218,16 +214,15 @@ public class MessageRuleImpl extends MinimalEObjectImpl.Container implements Mes /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public String toString() { - if (eIsProxy()) { + if (eIsProxy()) return super.toString(); - } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java index d9c4f73c7e1..01902d6982e 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/SequenceTermRuleImpl.java @@ -29,7 +29,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement * The default value of the '{@link #getSequencialOrder() <em>Sequencial Order</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSequencialOrder() * @generated * @ordered @@ -40,7 +40,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement * The cached value of the '{@link #getSequencialOrder() <em>Sequencial Order</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSequencialOrder() * @generated * @ordered @@ -51,7 +51,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement * The default value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSequenceName() * @generated * @ordered @@ -62,7 +62,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement * The cached value of the '{@link #getSequenceName() <em>Sequence Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSequenceName() * @generated * @ordered @@ -73,7 +73,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement * The default value of the '{@link #getRecurrence() <em>Recurrence</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getRecurrence() * @generated * @ordered @@ -84,7 +84,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement * The cached value of the '{@link #getRecurrence() <em>Recurrence</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getRecurrence() * @generated * @ordered @@ -94,7 +94,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected SequenceTermRuleImpl() { @@ -104,7 +104,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -115,10 +115,9 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public int getSequencialOrder() { return sequencialOrder; } @@ -126,25 +125,22 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public void setSequencialOrder(int newSequencialOrder) { int oldSequencialOrder = sequencialOrder; sequencialOrder = newSequencialOrder; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER, oldSequencialOrder, sequencialOrder)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public String getSequenceName() { return sequenceName; } @@ -152,25 +148,22 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public void setSequenceName(String newSequenceName) { String oldSequenceName = sequenceName; sequenceName = newSequenceName; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__SEQUENCE_NAME, oldSequenceName, sequenceName)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public String getRecurrence() { return recurrence; } @@ -178,22 +171,20 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public void setRecurrence(String newRecurrence) { String oldRecurrence = recurrence; recurrence = newRecurrence; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlMessagePackage.SEQUENCE_TERM_RULE__RECURRENCE, oldRecurrence, recurrence)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -212,7 +203,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -234,7 +225,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -256,7 +247,7 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -275,16 +266,15 @@ public class SequenceTermRuleImpl extends MinimalEObjectImpl.Container implement /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override public String toString() { - if (eIsProxy()) { + if (eIsProxy()) return super.toString(); - } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (sequencialOrder: "); result.append(sequencialOrder); result.append(", sequenceName: "); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java index a21bbe4e859..d87f253ac05 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessageFactoryImpl.java @@ -16,7 +16,7 @@ import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePacka * <!-- begin-user-doc --> * An implementation of the model <b>Factory</b>. * <!-- end-user-doc --> - * + * * @generated */ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFactory { @@ -24,7 +24,7 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac * Creates the default factory implementation. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public static UmlMessageFactory init() { @@ -43,7 +43,7 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac * Creates an instance of the factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public UmlMessageFactoryImpl() { @@ -53,7 +53,7 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override @@ -71,10 +71,9 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public MessageRule createMessageRule() { MessageRuleImpl messageRule = new MessageRuleImpl(); return messageRule; @@ -83,10 +82,9 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public SequenceTermRule createSequenceTermRule() { SequenceTermRuleImpl sequenceTermRule = new SequenceTermRuleImpl(); return sequenceTermRule; @@ -95,10 +93,9 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override public UmlMessagePackage getUmlMessagePackage() { return (UmlMessagePackage) getEPackage(); } @@ -106,7 +103,7 @@ public class UmlMessageFactoryImpl extends EFactoryImpl implements UmlMessageFac /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @deprecated * @generated */ diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java index 0914dd66994..760e2ce2d43 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/impl/UmlMessagePackageImpl.java @@ -17,267 +17,245 @@ import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePacka * <!-- begin-user-doc --> * An implementation of the model <b>Package</b>. * <!-- end-user-doc --> - * * @generated */ -public class UmlMessagePackageImpl extends EPackageImpl implements UmlMessagePackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - private EClass messageRuleEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - private EClass sequenceTermRuleEClass = null; - - /** - * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - * <p> - * Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#eNS_URI - * @see #init() - * @generated - */ - private UmlMessagePackageImpl() { - super(eNS_URI, UmlMessageFactory.eINSTANCE); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * - * <p> - * This method is used to initialize {@link UmlMessagePackage#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static UmlMessagePackage init() { - if (isInited) { - return (UmlMessagePackage) EPackage.Registry.INSTANCE.getEPackage(UmlMessagePackage.eNS_URI); - } - - // Obtain or create and register package - UmlMessagePackageImpl theUmlMessagePackage = (UmlMessagePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlMessagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlMessagePackageImpl()); - - isInited = true; - - // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); - - // Create package meta-data objects - theUmlMessagePackage.createPackageContents(); - - // Initialize created meta-data - theUmlMessagePackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theUmlMessagePackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(UmlMessagePackage.eNS_URI, theUmlMessagePackage); - return theUmlMessagePackage; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EClass getMessageRule() { - return messageRuleEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EReference getMessageRule_SequenceTerm() { - return (EReference) messageRuleEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EAttribute getMessageRule_Name() { - return (EAttribute) messageRuleEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EClass getSequenceTermRule() { - return sequenceTermRuleEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EAttribute getSequenceTermRule_SequencialOrder() { - return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EAttribute getSequenceTermRule_SequenceName() { - return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public EAttribute getSequenceTermRule_Recurrence() { - return (EAttribute) sequenceTermRuleEClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public UmlMessageFactory getUmlMessageFactory() { - return (UmlMessageFactory) getEFactoryInstance(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - public void createPackageContents() { - if (isCreated) { - return; - } - isCreated = true; - - // Create classes and their features - messageRuleEClass = createEClass(MESSAGE_RULE); - createEReference(messageRuleEClass, MESSAGE_RULE__SEQUENCE_TERM); - createEAttribute(messageRuleEClass, MESSAGE_RULE__NAME); - - sequenceTermRuleEClass = createEClass(SEQUENCE_TERM_RULE); - createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER); - createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCE_NAME); - createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__RECURRENCE); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) { - return; - } - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); - - // Create type parameters - - // Set bounds for type parameters - - // Add supertypes to classes - - // Initialize classes and features; add operations and parameters - initEClass(messageRuleEClass, MessageRule.class, "MessageRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMessageRule_SequenceTerm(), this.getSequenceTermRule(), null, "sequenceTerm", null, 0, -1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); - initEAttribute(getMessageRule_Name(), theEcorePackage.getEString(), "name", null, 0, 1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(sequenceTermRuleEClass, SequenceTermRule.class, "SequenceTermRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getSequenceTermRule_SequencialOrder(), theEcorePackage.getEInt(), "sequencialOrder", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getSequenceTermRule_SequenceName(), theEcorePackage.getEString(), "sequenceName", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getSequenceTermRule_Recurrence(), theEcorePackage.getEString(), "recurrence", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - // Create resource - createResource(eNS_URI); - } - -} // UmlMessagePackageImpl +public class UmlMessagePackageImpl extends EPackageImpl implements UmlMessagePackage +{ + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass messageRuleEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass sequenceTermRuleEClass = null; + + /** + * Creates an instance of the model <b>Package</b>, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + * <p>Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage#eNS_URI + * @see #init() + * @generated + */ + private UmlMessagePackageImpl() + { + super(eNS_URI, UmlMessageFactory.eINSTANCE); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. + * + * <p>This method is used to initialize {@link UmlMessagePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static UmlMessagePackage init() + { + if (isInited) return (UmlMessagePackage)EPackage.Registry.INSTANCE.getEPackage(UmlMessagePackage.eNS_URI); + + // Obtain or create and register package + Object registeredUmlMessagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + UmlMessagePackageImpl theUmlMessagePackage = registeredUmlMessagePackage instanceof UmlMessagePackageImpl ? (UmlMessagePackageImpl)registeredUmlMessagePackage : new UmlMessagePackageImpl(); + + isInited = true; + + // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theUmlMessagePackage.createPackageContents(); + + // Initialize created meta-data + theUmlMessagePackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theUmlMessagePackage.freeze(); + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(UmlMessagePackage.eNS_URI, theUmlMessagePackage); + return theUmlMessagePackage; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getMessageRule() + { + return messageRuleEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getMessageRule_SequenceTerm() + { + return (EReference)messageRuleEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getMessageRule_Name() + { + return (EAttribute)messageRuleEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getSequenceTermRule() + { + return sequenceTermRuleEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getSequenceTermRule_SequencialOrder() + { + return (EAttribute)sequenceTermRuleEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getSequenceTermRule_SequenceName() + { + return (EAttribute)sequenceTermRuleEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getSequenceTermRule_Recurrence() + { + return (EAttribute)sequenceTermRuleEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public UmlMessageFactory getUmlMessageFactory() + { + return (UmlMessageFactory)getEFactoryInstance(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void createPackageContents() + { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + messageRuleEClass = createEClass(MESSAGE_RULE); + createEReference(messageRuleEClass, MESSAGE_RULE__SEQUENCE_TERM); + createEAttribute(messageRuleEClass, MESSAGE_RULE__NAME); + + sequenceTermRuleEClass = createEClass(SEQUENCE_TERM_RULE); + createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCIAL_ORDER); + createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__SEQUENCE_NAME); + createEAttribute(sequenceTermRuleEClass, SEQUENCE_TERM_RULE__RECURRENCE); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void initializePackageContents() + { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(messageRuleEClass, MessageRule.class, "MessageRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getMessageRule_SequenceTerm(), this.getSequenceTermRule(), null, "sequenceTerm", null, 0, -1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMessageRule_Name(), theEcorePackage.getEString(), "name", null, 0, 1, MessageRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(sequenceTermRuleEClass, SequenceTermRule.class, "SequenceTermRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getSequenceTermRule_SequencialOrder(), theEcorePackage.getEInt(), "sequencialOrder", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getSequenceTermRule_SequenceName(), theEcorePackage.getEString(), "sequenceName", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getSequenceTermRule_Recurrence(), theEcorePackage.getEString(), "recurrence", null, 0, 1, SequenceTermRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + } + +} //UmlMessagePackageImpl diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java index cae3208e4a4..87e7be25d3e 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageAdapterFactory.java @@ -15,7 +15,7 @@ import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePacka * The <b>Adapter Factory</b> for the model. * It provides an adapter <code>createXXX</code> method for each class of the model. * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage * @generated */ @@ -24,7 +24,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * The cached model package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected static UmlMessagePackage modelPackage; @@ -33,7 +33,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * Creates an instance of the adapter factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public UmlMessageAdapterFactory() { @@ -47,7 +47,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * <!-- begin-user-doc --> * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. * <!-- end-user-doc --> - * + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -66,7 +66,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * The switch that delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected UmlMessageSwitch<Adapter> modelSwitch = new UmlMessageSwitch<Adapter>() { @@ -90,7 +90,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * Creates an adapter for the <code>target</code>. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param target * the object to adapt. * @return the adapter for the <code>target</code>. @@ -108,7 +108,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.MessageRule * @generated @@ -123,7 +123,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.SequenceTermRule * @generated @@ -137,7 +137,7 @@ public class UmlMessageAdapterFactory extends AdapterFactoryImpl { * <!-- begin-user-doc --> * This default implementation returns null. * <!-- end-user-doc --> - * + * * @return the new adapter. * @generated */ diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java index 2a3a4ef0cf4..e9be6ad70e3 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/src-gen/org/eclipse/papyrus/uml/textedit/message/xtext/umlMessage/util/UmlMessageSwitch.java @@ -19,7 +19,7 @@ import org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePacka * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.UmlMessagePackage * @generated */ @@ -28,7 +28,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * The cached model package * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected static UmlMessagePackage modelPackage; @@ -37,7 +37,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * Creates an instance of the switch. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public UmlMessageSwitch() { @@ -50,7 +50,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param ePackage * the package in question. * @return whether this is a switch for the given package. @@ -65,7 +65,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -75,17 +75,15 @@ public class UmlMessageSwitch<T> extends Switch<T> { case UmlMessagePackage.MESSAGE_RULE: { MessageRule messageRule = (MessageRule) theEObject; T result = caseMessageRule(messageRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } case UmlMessagePackage.SEQUENCE_TERM_RULE: { SequenceTermRule sequenceTermRule = (SequenceTermRule) theEObject; T result = caseSequenceTermRule(sequenceTermRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } default: @@ -99,7 +97,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>Message Rule</em>'. @@ -116,7 +114,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>Sequence Term Rule</em>'. @@ -133,7 +131,7 @@ public class UmlMessageSwitch<T> extends Switch<T> { * This implementation returns null; * returning a non-null result will terminate the switch, but this is the last case anyway. * <!-- end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. |