diff options
Diffstat (limited to 'plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext')
33 files changed, 1775 insertions, 2439 deletions
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/AbstractUmlStateRuntimeModule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/AbstractUmlStateRuntimeModule.java index 07074c0ad33..6ebf43a45dc 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/AbstractUmlStateRuntimeModule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/AbstractUmlStateRuntimeModule.java @@ -6,7 +6,6 @@ package org.eclipse.papyrus.uml.textedit.state.xtext; import java.util.Properties; import org.eclipse.xtext.Constants; -import org.eclipse.xtext.service.DefaultRuntimeModule; import com.google.inject.Binder; import com.google.inject.name.Names; @@ -15,7 +14,7 @@ import com.google.inject.name.Names; * Manual modifications go to {org.eclipse.papyrus.uml.textedit.state.xtext.UmlStateRuntimeModule} */ @SuppressWarnings("all") -public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule { +public abstract class AbstractUmlStateRuntimeModule extends org.eclipse.xtext.service.DefaultRuntimeModule { protected Properties properties = null; @@ -30,9 +29,8 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } 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("umlstate"); - } } // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment @@ -46,7 +44,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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.state.xtext.serializer.UmlStateSemanticSequencer.class; } @@ -57,7 +54,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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; } @@ -68,7 +64,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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; } @@ -95,7 +90,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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; } @@ -112,7 +106,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - @Override public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() { return org.eclipse.papyrus.uml.textedit.state.xtext.scoping.UmlStateScopeProvider.class; } @@ -124,7 +117,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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; } @@ -135,13 +127,11 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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; } @@ -152,15 +142,13 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // 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); } // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - @Override - public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)) + public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) { + binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)) .to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); } @@ -170,7 +158,6 @@ public abstract class AbstractUmlStateRuntimeModule extends DefaultRuntimeModule } // contributed by org.eclipse.xtext.generator.formatting.FormatterFragment - @Override public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() { return org.eclipse.papyrus.uml.textedit.state.xtext.formatting.UmlStateFormatter.class; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.ecore b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.ecore index 2c3f1c372fb..1ebaba6029c 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.ecore +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.ecore @@ -15,10 +15,10 @@ <eClassifiers xsi:type="ecore:EClass" name="SubmachineRule"> <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//QualifiedName" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="ecore:EClass ../../../../../../../../../org.eclipse.uml2.uml/model/UML.ecore#//StateMachine"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="ecore:EClass platform:/resource/org.eclipse.uml2.uml/model/UML.ecore#//StateMachine"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="QualifiedName"> - <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass ../../../../../../../../../org.eclipse.uml2.uml/model/UML.ecore#//Namespace"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.uml2.uml/model/UML.ecore#//Namespace"/> <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="#//QualifiedName" containment="true"/> </eClassifiers> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.genmodel b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.genmodel index 7840239026d..407a6669671 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.genmodel +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.genmodel @@ -4,11 +4,11 @@ editDirectory="/org.eclipse.papyrus.uml.textedit.state.xtext.edit/src" editorDirectory="/org.eclipse.papyrus.uml.textedit.state.xtext.editor/src" modelPluginID="org.eclipse.papyrus.uml.textedit.state.xtext" forceOverwrite="true" modelName="UmlState" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.uml.textedit.state.xtext.edit" - editorPluginID="org.eclipse.papyrus.uml.textedit.state.xtext.editor" runtimeVersion="2.9" - usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../../../../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"> + complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.uml.textedit.state.xtext.edit" + editorPluginID="org.eclipse.papyrus.uml.textedit.state.xtext.editor" runtimeVersion="2.14" + usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel#//uml"> <genPackages prefix="UmlState" basePackage="org.eclipse.papyrus.uml.textedit.state.xtext" - resource="XML" disposableProviderFactory="true" ecorePackage="UmlState.ecore#/"> + disposableProviderFactory="true" ecorePackage="UmlState.ecore#/"> <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlState.ecore#//BehaviorKind"> <genEnumLiterals ecoreEnumLiteral="UmlState.ecore#//BehaviorKind/ACTIVITY"/> <genEnumLiterals ecoreEnumLiteral="UmlState.ecore#//BehaviorKind/STATE_MACHINE"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtextbin b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtextbin Binary files differindex 11592d527e6..ac8f7e77228 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtextbin +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/UmlState.xtextbin diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g index c0ac5ebdeb6..dd9e48f328f 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g @@ -1,6 +1,6 @@ /* -* generated by Xtext -*/ + * generated by Xtext + */ grammar InternalUmlState; options { @@ -92,7 +92,7 @@ ruleStateRule returns [EObject current=null] $current, "name", lv_name_0_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } ) @@ -113,7 +113,7 @@ ruleStateRule returns [EObject current=null] $current, "submachine", lv_submachine_2_0, - "SubmachineRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.SubmachineRule"); afterParserOrEnumRuleCall(); } @@ -145,7 +145,7 @@ ruleStateRule returns [EObject current=null] $current, "entry", lv_entry_4_0, - "EntryRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.EntryRule"); afterParserOrEnumRuleCall(); } @@ -175,7 +175,7 @@ ruleStateRule returns [EObject current=null] $current, "do", lv_do_5_0, - "DoRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.DoRule"); afterParserOrEnumRuleCall(); } @@ -205,7 +205,7 @@ ruleStateRule returns [EObject current=null] $current, "exit", lv_exit_6_0, - "ExitRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.ExitRule"); afterParserOrEnumRuleCall(); } @@ -258,7 +258,7 @@ ruleSubmachineRule returns [EObject current=null] $current, "path", lv_path_0_0, - "QualifiedName"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.QualifiedName"); afterParserOrEnumRuleCall(); } @@ -327,7 +327,7 @@ ruleQualifiedName returns [EObject current=null] $current, "remaining", lv_remaining_2_0, - "QualifiedName"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.QualifiedName"); afterParserOrEnumRuleCall(); } @@ -370,7 +370,7 @@ ruleEntryRule returns [EObject current=null] $current, "kind", lv_kind_1_0, - "BehaviorKind"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); afterParserOrEnumRuleCall(); } @@ -389,7 +389,7 @@ ruleEntryRule returns [EObject current=null] $current, "behaviorName", lv_behaviorName_2_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } ) @@ -431,7 +431,7 @@ ruleDoRule returns [EObject current=null] $current, "kind", lv_kind_1_0, - "BehaviorKind"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); afterParserOrEnumRuleCall(); } @@ -450,7 +450,7 @@ ruleDoRule returns [EObject current=null] $current, "behaviorName", lv_behaviorName_2_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } ) @@ -492,7 +492,7 @@ ruleExitRule returns [EObject current=null] $current, "kind", lv_kind_1_0, - "BehaviorKind"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); afterParserOrEnumRuleCall(); } @@ -511,7 +511,7 @@ ruleExitRule returns [EObject current=null] $current, "behaviorName", lv_behaviorName_2_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } ) @@ -547,8 +547,6 @@ ruleBehaviorKind returns [Enumerator current=null] -RULE_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')*); - RULE_ID : (('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*|'\'' ( options {greedy=false;} : . )*'\''); RULE_STRING : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'; @@ -559,6 +557,8 @@ RULE_SL_COMMENT : '//' ~(('\n'|'\r'|'@'))* ('\r'? '\n')?; RULE_INT : ('0'..'9')+; +RULE_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')*); + RULE_WS : (' '|'\t'|'\r'|'\n')+; RULE_ANY_OTHER : .; diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.tokens b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.tokens index aede8f9ee7e..f761001cae4 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.tokens +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.tokens @@ -1,24 +1,24 @@ -RULE_ID=4 -RULE_ANY_OTHER=11 -RULE_INTEGER_VALUE=5 -RULE_SL_COMMENT=8 -RULE_ML_COMMENT=7 -T__19=19 -RULE_STRING=6 -T__16=16 -T__15=15 -T__18=18 -T__17=17 -T__12=12 -T__14=14 -T__13=13 -RULE_INT=9 -RULE_WS=10 ':'=12 -'OpaqueBehavior'=19 -'exit'=16 '::'=13 -'entry'=14 -'StateMachine'=18 'Activity'=17 +'OpaqueBehavior'=19 +'StateMachine'=18 'do'=15 +'entry'=14 +'exit'=16 +RULE_ANY_OTHER=11 +RULE_ID=4 +RULE_INT=8 +RULE_INTEGER_VALUE=9 +RULE_ML_COMMENT=6 +RULE_SL_COMMENT=7 +RULE_STRING=5 +RULE_WS=10 +T__12=12 +T__13=13 +T__14=14 +T__15=15 +T__16=16 +T__17=17 +T__18=18 +T__19=19 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateLexer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateLexer.java index 84dc2c442bd..41403a8815d 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateLexer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateLexer.java @@ -1,7 +1,5 @@ package org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr.internal; -// 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.antlr.runtime.BaseRecognizer; import org.antlr.runtime.CharStream; import org.antlr.runtime.DFA; @@ -11,27 +9,29 @@ 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. +// Currently there is no other way to specify the superclass for the lexer. import org.eclipse.xtext.parser.antlr.Lexer; @SuppressWarnings("all") public class InternalUmlStateLexer extends Lexer { - public static final int RULE_ID = 4; - public static final int RULE_ANY_OTHER = 11; - public static final int RULE_INTEGER_VALUE = 5; - public static final int RULE_SL_COMMENT = 8; - public static final int EOF = -1; - public static final int RULE_ML_COMMENT = 7; + public static final int RULE_STRING = 5; + public static final int RULE_SL_COMMENT = 7; public static final int T__19 = 19; - public static final int RULE_STRING = 6; - public static final int T__16 = 16; public static final int T__15 = 15; - public static final int T__18 = 18; + public static final int T__16 = 16; public static final int T__17 = 17; + public static final int T__18 = 18; public static final int T__12 = 12; - public static final int T__14 = 14; public static final int T__13 = 13; - public static final int RULE_INT = 9; + public static final int T__14 = 14; + public static final int EOF = -1; + public static final int RULE_ID = 4; public static final int RULE_WS = 10; + public static final int RULE_ANY_OTHER = 11; + public static final int RULE_INT = 8; + public static final int RULE_ML_COMMENT = 6; + public static final int RULE_INTEGER_VALUE = 9; // delegates // delegators @@ -49,9 +49,8 @@ public class InternalUmlStateLexer extends Lexer { } - @Override public String getGrammarFileName() { - return "../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g"; + return "InternalUmlState.g"; } // $ANTLR start "T__12" @@ -59,8 +58,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__12; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:11:7: ( ':' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:11:9: ':' + // InternalUmlState.g:11:7: ( ':' ) + // InternalUmlState.g:11:9: ':' { match(':'); @@ -71,7 +70,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__12" // $ANTLR start "T__13" @@ -79,8 +77,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__13; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:12:7: ( '::' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:12:9: '::' + // InternalUmlState.g:12:7: ( '::' ) + // InternalUmlState.g:12:9: '::' { match("::"); @@ -92,7 +90,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__13" // $ANTLR start "T__14" @@ -100,8 +97,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__14; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:13:7: ( 'entry' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:13:9: 'entry' + // InternalUmlState.g:13:7: ( 'entry' ) + // InternalUmlState.g:13:9: 'entry' { match("entry"); @@ -113,7 +110,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__14" // $ANTLR start "T__15" @@ -121,8 +117,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__15; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:14:7: ( 'do' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:14:9: 'do' + // InternalUmlState.g:14:7: ( 'do' ) + // InternalUmlState.g:14:9: 'do' { match("do"); @@ -134,7 +130,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__15" // $ANTLR start "T__16" @@ -142,8 +137,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:15:7: ( 'exit' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:15:9: 'exit' + // InternalUmlState.g:15:7: ( 'exit' ) + // InternalUmlState.g:15:9: 'exit' { match("exit"); @@ -155,7 +150,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__16" // $ANTLR start "T__17" @@ -163,8 +157,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:16:7: ( 'Activity' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:16:9: 'Activity' + // InternalUmlState.g:16:7: ( 'Activity' ) + // InternalUmlState.g:16:9: 'Activity' { match("Activity"); @@ -176,7 +170,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__17" // $ANTLR start "T__18" @@ -184,8 +177,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__18; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:17:7: ( 'StateMachine' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:17:9: 'StateMachine' + // InternalUmlState.g:17:7: ( 'StateMachine' ) + // InternalUmlState.g:17:9: 'StateMachine' { match("StateMachine"); @@ -197,7 +190,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__18" // $ANTLR start "T__19" @@ -205,8 +197,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = T__19; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:18:7: ( 'OpaqueBehavior' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:18:9: 'OpaqueBehavior' + // InternalUmlState.g:18:7: ( 'OpaqueBehavior' ) + // InternalUmlState.g:18:9: 'OpaqueBehavior' { match("OpaqueBehavior"); @@ -218,496 +210,60 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "T__19" - // $ANTLR start "RULE_INTEGER_VALUE" - public final void mRULE_INTEGER_VALUE() throws RecognitionException { - try { - int _type = RULE_INTEGER_VALUE; - int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550: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.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550: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.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550: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 alt13 = 4; - int LA13_0 = input.LA(1); - - if ((LA13_0 == '0')) { - switch (input.LA(2)) { - case 'B': - case 'b': { - alt13 = 2; - } - break; - case 'X': - case 'x': { - alt13 = 3; - } - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '_': { - alt13 = 4; - } - break; - default: - alt13 = 1; - } - - } - else if (((LA13_0 >= '1' && LA13_0 <= '9'))) { - alt13 = 1; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 13, 0, input); - - throw nvae; - } - switch (alt13) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) - int alt3 = 2; - int LA3_0 = input.LA(1); - - if ((LA3_0 == '0')) { - alt3 = 1; - } - else if (((LA3_0 >= '1' && LA3_0 <= '9'))) { - alt3 = 2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 3, 0, input); - - throw nvae; - } - switch (alt3) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:24: '0' - { - match('0'); - - } - break; - case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:28: '1' .. '9' ( ( '_' )? '0' .. '9' )* - { - matchRange('1', '9'); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:37: ( ( '_' )? '0' .. '9' )* - loop2: do { - int alt2 = 2; - int LA2_0 = input.LA(1); - - if (((LA2_0 >= '0' && LA2_0 <= '9') || LA2_0 == '_')) { - alt2 = 1; - } - - - switch (alt2) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:38: ( '_' )? '0' .. '9' - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:38: ( '_' )? - int alt1 = 2; - int LA1_0 = input.LA(1); - - if ((LA1_0 == '_')) { - alt1 = 1; - } - switch (alt1) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:38: '_' - { - match('_'); - - } - break; - - } - - matchRange('0', '9'); - - } - break; - - default: - break loop2; - } - } while (true); - - - } - break; - - } - - - } - break; - case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:55: ( '0b' | '0B' ) - int alt4 = 2; - int LA4_0 = input.LA(1); - - if ((LA4_0 == '0')) { - int LA4_1 = input.LA(2); - - if ((LA4_1 == 'b')) { - alt4 = 1; - } - else if ((LA4_1 == 'B')) { - alt4 = 2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 4, 1, input); - - throw nvae; - } - } - else { - NoViableAltException nvae = - new NoViableAltException("", 4, 0, input); - - throw nvae; - } - switch (alt4) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:56: '0b' - { - match("0b"); - - - } - break; - case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:61: '0B' - { - match("0B"); - - - } - break; - - } - - matchRange('0', '1'); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:76: ( ( '_' )? '0' .. '1' )* - loop6: do { - int alt6 = 2; - int LA6_0 = input.LA(1); - - if (((LA6_0 >= '0' && LA6_0 <= '1') || LA6_0 == '_')) { - alt6 = 1; - } - - - switch (alt6) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:77: ( '_' )? '0' .. '1' - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:77: ( '_' )? - int alt5 = 2; - int LA5_0 = input.LA(1); - - if ((LA5_0 == '_')) { - alt5 = 1; - } - switch (alt5) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:77: '_' - { - match('_'); - - } - break; - - } - - matchRange('0', '1'); - - } - break; - - default: - break loop6; - } - } while (true); - - - } - break; - case 3: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. - // 'f' | 'A' .. 'F' ) )* - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:93: ( '0x' | '0X' ) - int alt7 = 2; - int LA7_0 = input.LA(1); - - if ((LA7_0 == '0')) { - int LA7_1 = input.LA(2); - - if ((LA7_1 == 'x')) { - alt7 = 1; - } - else if ((LA7_1 == 'X')) { - alt7 = 2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 7, 1, input); - - throw nvae; - } - } - else { - NoViableAltException nvae = - new NoViableAltException("", 7, 0, input); - - throw nvae; - } - switch (alt7) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:94: '0x' - { - match("0x"); - - - } - break; - case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:99: '0X' - { - match("0X"); - - - } - break; - - } - - if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null, input); - recover(mse); - throw mse; - } - - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* - loop9: do { - int alt9 = 2; - int LA9_0 = input.LA(1); - - if (((LA9_0 >= '0' && LA9_0 <= '9') || (LA9_0 >= 'A' && LA9_0 <= 'F') || LA9_0 == '_' || (LA9_0 >= 'a' && LA9_0 <= 'f'))) { - alt9 = 1; - } - - - switch (alt9) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:135: ( '_' )? - int alt8 = 2; - int LA8_0 = input.LA(1); - - if ((LA8_0 == '_')) { - alt8 = 1; - } - switch (alt8) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:135: '_' - { - match('_'); - - } - break; - - } - - if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null, input); - recover(mse); - throw mse; - } - - - } - break; - - default: - break loop9; - } - } while (true); - - - } - break; - case 4: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* - { - match('0'); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:175: ( '_' )? - int alt10 = 2; - int LA10_0 = input.LA(1); - - if ((LA10_0 == '_')) { - alt10 = 1; - } - switch (alt10) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:175: '_' - { - match('_'); - - } - break; - - } - - matchRange('0', '7'); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:189: ( ( '_' )? '0' .. '7' )* - loop12: do { - int alt12 = 2; - int LA12_0 = input.LA(1); - - if (((LA12_0 >= '0' && LA12_0 <= '7') || LA12_0 == '_')) { - alt12 = 1; - } - - - switch (alt12) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:190: ( '_' )? '0' .. '7' - { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:190: ( '_' )? - int alt11 = 2; - int LA11_0 = input.LA(1); - - if ((LA11_0 == '_')) { - alt11 = 1; - } - switch (alt11) { - case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:550:190: '_' - { - match('_'); - - } - break; - - } - - matchRange('0', '7'); - - } - break; - - default: - break loop12; - } - } while (true); - - - } - break; - - } - - - } - - state.type = _type; - state.channel = _channel; - } finally { - } - } - - // $ANTLR end "RULE_INTEGER_VALUE" - // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( - // options {greedy=false; } : . )* '\\'' ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( - // options {greedy=false; } : . )* '\\'' ) + // InternalUmlState.g:550:9: ( ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) ) + // InternalUmlState.g:550:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' - // ( options {greedy=false; } : . )* '\\'' ) - int alt16 = 2; - int LA16_0 = input.LA(1); - - if (((LA16_0 >= 'A' && LA16_0 <= 'Z') || LA16_0 == '_' || (LA16_0 >= 'a' && LA16_0 <= 'z'))) { - alt16 = 1; - } - else if ((LA16_0 == '\'')) { - alt16 = 2; - } - else { - NoViableAltException nvae = - new NoViableAltException("", 16, 0, input); + // InternalUmlState.g:550:11: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* | '\\'' ( options {greedy=false; } : . )* '\\'' ) + int alt3 = 2; + int LA3_0 = input.LA(1); + + if (((LA3_0 >= 'A' && LA3_0 <= 'Z') || LA3_0 == '_' || (LA3_0 >= 'a' && LA3_0 <= 'z'))) { + alt3 = 1; + } else if ((LA3_0 == '\'')) { + alt3 = 2; + } else { + NoViableAltException nvae = new NoViableAltException("", 3, 0, input); throw nvae; } - switch (alt16) { + switch (alt3) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:12: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalUmlState.g:550: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(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* - loop14: do { - int alt14 = 2; - int LA14_0 = input.LA(1); + // InternalUmlState.g:550:36: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + loop1: do { + int alt1 = 2; + int LA1_0 = input.LA(1); - if (((LA14_0 >= '0' && LA14_0 <= '9') || (LA14_0 >= 'A' && LA14_0 <= 'Z') || LA14_0 == '_' || (LA14_0 >= 'a' && LA14_0 <= 'z'))) { - alt14 = 1; + if (((LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || LA1_0 == '_' || (LA1_0 >= 'a' && LA1_0 <= 'z'))) { + alt1 = 1; } - switch (alt14) { + switch (alt1) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g: + // InternalUmlState.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(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; @@ -718,7 +274,7 @@ public class InternalUmlStateLexer extends Lexer { break; default: - break loop14; + break loop1; } } while (true); @@ -726,25 +282,24 @@ public class InternalUmlStateLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:70: '\\'' ( options {greedy=false; } : . )* '\\'' + // InternalUmlState.g:550:70: '\\'' ( options {greedy=false; } : . )* '\\'' { match('\''); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:75: ( options {greedy=false; } : . )* - loop15: do { - int alt15 = 2; - int LA15_0 = input.LA(1); - - if ((LA15_0 == '\'')) { - alt15 = 2; - } - else if (((LA15_0 >= '\u0000' && LA15_0 <= '&') || (LA15_0 >= '(' && LA15_0 <= '\uFFFF'))) { - alt15 = 1; + // InternalUmlState.g:550:75: ( options {greedy=false; } : . )* + loop2: do { + int alt2 = 2; + int LA2_0 = input.LA(1); + + if ((LA2_0 == '\'')) { + alt2 = 2; + } else if (((LA2_0 >= '\u0000' && LA2_0 <= '&') || (LA2_0 >= '(' && LA2_0 <= '\uFFFF'))) { + alt2 = 1; } - switch (alt15) { + switch (alt2) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:552:103: . + // InternalUmlState.g:550:103: . { matchAny(); @@ -752,7 +307,7 @@ public class InternalUmlStateLexer extends Lexer { break; default: - break loop15; + break loop2; } } while (true); @@ -771,7 +326,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_ID" // $ANTLR start "RULE_STRING" @@ -779,36 +333,31 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:554:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) - // ) )* '\"' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:554:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) - // )* '\"' + // InternalUmlState.g:552:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) + // InternalUmlState.g:552:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:554:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) - // )* - loop17: do { - int alt17 = 3; - int LA17_0 = input.LA(1); - - if ((LA17_0 == '\\')) { - alt17 = 1; - } - else if (((LA17_0 >= '\u0000' && LA17_0 <= '!') || (LA17_0 >= '#' && LA17_0 <= '[') || (LA17_0 >= ']' && LA17_0 <= '\uFFFF'))) { - alt17 = 2; + // InternalUmlState.g:552:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* + loop4: do { + int alt4 = 3; + int LA4_0 = input.LA(1); + + if ((LA4_0 == '\\')) { + alt4 = 1; + } else if (((LA4_0 >= '\u0000' && LA4_0 <= '!') || (LA4_0 >= '#' && LA4_0 <= '[') || (LA4_0 >= ']' && LA4_0 <= '\uFFFF'))) { + alt4 = 2; } - switch (alt17) { + switch (alt4) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:554:20: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) + // InternalUmlState.g:552: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') { input.consume(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; @@ -818,13 +367,12 @@ public class InternalUmlStateLexer extends Lexer { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:554:61: ~ ( ( '\\\\' | '\"' ) ) + // InternalUmlState.g:552:61: ~ ( ( '\\\\' | '\"' ) ) { if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) { input.consume(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; @@ -835,7 +383,7 @@ public class InternalUmlStateLexer extends Lexer { break; default: - break loop17; + break loop4; } } while (true); @@ -848,7 +396,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_STRING" // $ANTLR start "RULE_ML_COMMENT" @@ -856,46 +403,43 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:556:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:556:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' + // InternalUmlState.g:554:17: ( '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' ) + // InternalUmlState.g:554:19: '/*' ~ ( '@' ) ( options {greedy=false; } : . )* '*/' { match("/*"); if ((input.LA(1) >= '\u0000' && input.LA(1) <= '?') || (input.LA(1) >= 'A' && input.LA(1) <= '\uFFFF')) { input.consume(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:556:31: ( options {greedy=false; } : . )* - loop18: do { - int alt18 = 2; - int LA18_0 = input.LA(1); + // InternalUmlState.g:554:31: ( options {greedy=false; } : . )* + loop5: do { + int alt5 = 2; + int LA5_0 = input.LA(1); - if ((LA18_0 == '*')) { - int LA18_1 = input.LA(2); + if ((LA5_0 == '*')) { + int LA5_1 = input.LA(2); - if ((LA18_1 == '/')) { - alt18 = 2; - } - else if (((LA18_1 >= '\u0000' && LA18_1 <= '.') || (LA18_1 >= '0' && LA18_1 <= '\uFFFF'))) { - alt18 = 1; + if ((LA5_1 == '/')) { + alt5 = 2; + } else if (((LA5_1 >= '\u0000' && LA5_1 <= '.') || (LA5_1 >= '0' && LA5_1 <= '\uFFFF'))) { + alt5 = 1; } - } - else if (((LA18_0 >= '\u0000' && LA18_0 <= ')') || (LA18_0 >= '+' && LA18_0 <= '\uFFFF'))) { - alt18 = 1; + } else if (((LA5_0 >= '\u0000' && LA5_0 <= ')') || (LA5_0 >= '+' && LA5_0 <= '\uFFFF'))) { + alt5 = 1; } - switch (alt18) { + switch (alt5) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:556:59: . + // InternalUmlState.g:554:59: . { matchAny(); @@ -903,7 +447,7 @@ public class InternalUmlStateLexer extends Lexer { break; default: - break loop18; + break loop5; } } while (true); @@ -917,7 +461,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_ML_COMMENT" // $ANTLR start "RULE_SL_COMMENT" @@ -925,30 +468,29 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalUmlState.g:556:17: ( '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalUmlState.g:556:19: '//' (~ ( ( '\\n' | '\\r' | '@' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )* - loop19: do { - int alt19 = 2; - int LA19_0 = input.LA(1); + // InternalUmlState.g:556:24: (~ ( ( '\\n' | '\\r' | '@' ) ) )* + loop6: do { + int alt6 = 2; + int LA6_0 = input.LA(1); - if (((LA19_0 >= '\u0000' && LA19_0 <= '\t') || (LA19_0 >= '\u000B' && LA19_0 <= '\f') || (LA19_0 >= '\u000E' && LA19_0 <= '?') || (LA19_0 >= 'A' && LA19_0 <= '\uFFFF'))) { - alt19 = 1; + if (((LA6_0 >= '\u0000' && LA6_0 <= '\t') || (LA6_0 >= '\u000B' && LA6_0 <= '\f') || (LA6_0 >= '\u000E' && LA6_0 <= '?') || (LA6_0 >= 'A' && LA6_0 <= '\uFFFF'))) { + alt6 = 1; } - switch (alt19) { + switch (alt6) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:24: ~ ( ( '\\n' | '\\r' | '@' ) ) + // InternalUmlState.g:556: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(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; @@ -959,31 +501,31 @@ public class InternalUmlStateLexer extends Lexer { break; default: - break loop19; + break loop6; } } while (true); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:44: ( ( '\\r' )? '\\n' )? - int alt21 = 2; - int LA21_0 = input.LA(1); + // InternalUmlState.g:556:44: ( ( '\\r' )? '\\n' )? + int alt8 = 2; + int LA8_0 = input.LA(1); - if ((LA21_0 == '\n' || LA21_0 == '\r')) { - alt21 = 1; + if ((LA8_0 == '\n' || LA8_0 == '\r')) { + alt8 = 1; } - switch (alt21) { + switch (alt8) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:45: ( '\\r' )? '\\n' + // InternalUmlState.g:556:45: ( '\\r' )? '\\n' { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:45: ( '\\r' )? - int alt20 = 2; - int LA20_0 = input.LA(1); + // InternalUmlState.g:556:45: ( '\\r' )? + int alt7 = 2; + int LA7_0 = input.LA(1); - if ((LA20_0 == '\r')) { - alt20 = 1; + if ((LA7_0 == '\r')) { + alt7 = 1; } - switch (alt20) { + switch (alt7) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:558:45: '\\r' + // InternalUmlState.g:556:45: '\\r' { match('\r'); @@ -1007,7 +549,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_SL_COMMENT" // $ANTLR start "RULE_INT" @@ -1015,23 +556,23 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:560:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:560:12: ( '0' .. '9' )+ + // InternalUmlState.g:558:10: ( ( '0' .. '9' )+ ) + // InternalUmlState.g:558:12: ( '0' .. '9' )+ { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:560:12: ( '0' .. '9' )+ - int cnt22 = 0; - loop22: do { - int alt22 = 2; - int LA22_0 = input.LA(1); - - if (((LA22_0 >= '0' && LA22_0 <= '9'))) { - alt22 = 1; + // InternalUmlState.g:558:12: ( '0' .. '9' )+ + int cnt9 = 0; + loop9: do { + int alt9 = 2; + int LA9_0 = input.LA(1); + + if (((LA9_0 >= '0' && LA9_0 <= '9'))) { + alt9 = 1; } - switch (alt22) { + switch (alt9) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:560:13: '0' .. '9' + // InternalUmlState.g:558:13: '0' .. '9' { matchRange('0', '9'); @@ -1039,14 +580,12 @@ public class InternalUmlStateLexer extends Lexer { break; default: - if (cnt22 >= 1) { - break loop22; - } - EarlyExitException eee = - new EarlyExitException(22, input); + if (cnt9 >= 1) + break loop9; + EarlyExitException eee = new EarlyExitException(9, input); throw eee; } - cnt22++; + cnt9++; } while (true); @@ -1057,18 +596,424 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_INT" + // $ANTLR start "RULE_INTEGER_VALUE" + public final void mRULE_INTEGER_VALUE() throws RecognitionException { + try { + int _type = RULE_INTEGER_VALUE; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalUmlState.g:560: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' )* ) ) + // InternalUmlState.g:560: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' )* ) + { + // InternalUmlState.g:560: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 alt22 = 4; + int LA22_0 = input.LA(1); + + if ((LA22_0 == '0')) { + switch (input.LA(2)) { + case 'B': + case 'b': { + alt22 = 2; + } + break; + case 'X': + case 'x': { + alt22 = 3; + } + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '_': { + alt22 = 4; + } + break; + default: + alt22 = 1; + } + + } else if (((LA22_0 >= '1' && LA22_0 <= '9'))) { + alt22 = 1; + } else { + NoViableAltException nvae = new NoViableAltException("", 22, 0, input); + + throw nvae; + } + switch (alt22) { + case 1: + // InternalUmlState.g:560:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) + { + // InternalUmlState.g:560:23: ( '0' | '1' .. '9' ( ( '_' )? '0' .. '9' )* ) + int alt12 = 2; + int LA12_0 = input.LA(1); + + if ((LA12_0 == '0')) { + alt12 = 1; + } else if (((LA12_0 >= '1' && LA12_0 <= '9'))) { + alt12 = 2; + } else { + NoViableAltException nvae = new NoViableAltException("", 12, 0, input); + + throw nvae; + } + switch (alt12) { + case 1: + // InternalUmlState.g:560:24: '0' + { + match('0'); + + } + break; + case 2: + // InternalUmlState.g:560:28: '1' .. '9' ( ( '_' )? '0' .. '9' )* + { + matchRange('1', '9'); + // InternalUmlState.g:560:37: ( ( '_' )? '0' .. '9' )* + loop11: do { + int alt11 = 2; + int LA11_0 = input.LA(1); + + if (((LA11_0 >= '0' && LA11_0 <= '9') || LA11_0 == '_')) { + alt11 = 1; + } + + + switch (alt11) { + case 1: + // InternalUmlState.g:560:38: ( '_' )? '0' .. '9' + { + // InternalUmlState.g:560:38: ( '_' )? + int alt10 = 2; + int LA10_0 = input.LA(1); + + if ((LA10_0 == '_')) { + alt10 = 1; + } + switch (alt10) { + case 1: + // InternalUmlState.g:560:38: '_' + { + match('_'); + + } + break; + + } + + matchRange('0', '9'); + + } + break; + + default: + break loop11; + } + } while (true); + + + } + break; + + } + + + } + break; + case 2: + // InternalUmlState.g:560:55: ( '0b' | '0B' ) '0' .. '1' ( ( '_' )? '0' .. '1' )* + { + // InternalUmlState.g:560:55: ( '0b' | '0B' ) + int alt13 = 2; + int LA13_0 = input.LA(1); + + if ((LA13_0 == '0')) { + int LA13_1 = input.LA(2); + + if ((LA13_1 == 'b')) { + alt13 = 1; + } else if ((LA13_1 == 'B')) { + alt13 = 2; + } else { + NoViableAltException nvae = new NoViableAltException("", 13, 1, input); + + throw nvae; + } + } else { + NoViableAltException nvae = new NoViableAltException("", 13, 0, input); + + throw nvae; + } + switch (alt13) { + case 1: + // InternalUmlState.g:560:56: '0b' + { + match("0b"); + + + } + break; + case 2: + // InternalUmlState.g:560:61: '0B' + { + match("0B"); + + + } + break; + + } + + matchRange('0', '1'); + // InternalUmlState.g:560:76: ( ( '_' )? '0' .. '1' )* + loop15: do { + int alt15 = 2; + int LA15_0 = input.LA(1); + + if (((LA15_0 >= '0' && LA15_0 <= '1') || LA15_0 == '_')) { + alt15 = 1; + } + + + switch (alt15) { + case 1: + // InternalUmlState.g:560:77: ( '_' )? '0' .. '1' + { + // InternalUmlState.g:560:77: ( '_' )? + int alt14 = 2; + int LA14_0 = input.LA(1); + + if ((LA14_0 == '_')) { + alt14 = 1; + } + switch (alt14) { + case 1: + // InternalUmlState.g:560:77: '_' + { + match('_'); + + } + break; + + } + + matchRange('0', '1'); + + } + break; + + default: + break loop15; + } + } while (true); + + + } + break; + case 3: + // InternalUmlState.g:560:93: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* + { + // InternalUmlState.g:560:93: ( '0x' | '0X' ) + int alt16 = 2; + int LA16_0 = input.LA(1); + + if ((LA16_0 == '0')) { + int LA16_1 = input.LA(2); + + if ((LA16_1 == 'x')) { + alt16 = 1; + } else if ((LA16_1 == 'X')) { + alt16 = 2; + } else { + NoViableAltException nvae = new NoViableAltException("", 16, 1, input); + + throw nvae; + } + } else { + NoViableAltException nvae = new NoViableAltException("", 16, 0, input); + + throw nvae; + } + switch (alt16) { + case 1: + // InternalUmlState.g:560:94: '0x' + { + match("0x"); + + + } + break; + case 2: + // InternalUmlState.g:560:99: '0X' + { + match("0X"); + + + } + break; + + } + + if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) { + input.consume(); + + } else { + MismatchedSetException mse = new MismatchedSetException(null, input); + recover(mse); + throw mse; + } + + // InternalUmlState.g:560:134: ( ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )* + loop18: do { + int alt18 = 2; + int LA18_0 = input.LA(1); + + if (((LA18_0 >= '0' && LA18_0 <= '9') || (LA18_0 >= 'A' && LA18_0 <= 'F') || LA18_0 == '_' || (LA18_0 >= 'a' && LA18_0 <= 'f'))) { + alt18 = 1; + } + + + switch (alt18) { + case 1: + // InternalUmlState.g:560:135: ( '_' )? ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) + { + // InternalUmlState.g:560:135: ( '_' )? + int alt17 = 2; + int LA17_0 = input.LA(1); + + if ((LA17_0 == '_')) { + alt17 = 1; + } + switch (alt17) { + case 1: + // InternalUmlState.g:560:135: '_' + { + match('_'); + + } + break; + + } + + if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) { + input.consume(); + + } else { + MismatchedSetException mse = new MismatchedSetException(null, input); + recover(mse); + throw mse; + } + + + } + break; + + default: + break loop18; + } + } while (true); + + + } + break; + case 4: + // InternalUmlState.g:560:171: '0' ( '_' )? '0' .. '7' ( ( '_' )? '0' .. '7' )* + { + match('0'); + // InternalUmlState.g:560:175: ( '_' )? + int alt19 = 2; + int LA19_0 = input.LA(1); + + if ((LA19_0 == '_')) { + alt19 = 1; + } + switch (alt19) { + case 1: + // InternalUmlState.g:560:175: '_' + { + match('_'); + + } + break; + + } + + matchRange('0', '7'); + // InternalUmlState.g:560:189: ( ( '_' )? '0' .. '7' )* + loop21: do { + int alt21 = 2; + int LA21_0 = input.LA(1); + + if (((LA21_0 >= '0' && LA21_0 <= '7') || LA21_0 == '_')) { + alt21 = 1; + } + + + switch (alt21) { + case 1: + // InternalUmlState.g:560:190: ( '_' )? '0' .. '7' + { + // InternalUmlState.g:560:190: ( '_' )? + int alt20 = 2; + int LA20_0 = input.LA(1); + + if ((LA20_0 == '_')) { + alt20 = 1; + } + switch (alt20) { + case 1: + // InternalUmlState.g:560:190: '_' + { + match('_'); + + } + break; + + } + + matchRange('0', '7'); + + } + break; + + default: + break loop21; + } + } while (true); + + + } + break; + + } + + + } + + state.type = _type; + state.channel = _channel; + } finally { + } + } + // $ANTLR end "RULE_INTEGER_VALUE" + // $ANTLR start "RULE_WS" public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:562:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:562:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalUmlState.g:562:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalUmlState.g:562:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:562:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalUmlState.g:562:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt23 = 0; loop23: do { int alt23 = 2; @@ -1081,13 +1026,12 @@ public class InternalUmlStateLexer extends Lexer { switch (alt23) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g: + // InternalUmlState.g: { if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') { input.consume(); - } - else { + } else { MismatchedSetException mse = new MismatchedSetException(null, input); recover(mse); throw mse; @@ -1098,11 +1042,9 @@ public class InternalUmlStateLexer extends Lexer { break; default: - if (cnt23 >= 1) { + if (cnt23 >= 1) break loop23; - } - EarlyExitException eee = - new EarlyExitException(23, input); + EarlyExitException eee = new EarlyExitException(23, input); throw eee; } cnt23++; @@ -1116,7 +1058,6 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_WS" // $ANTLR start "RULE_ANY_OTHER" @@ -1124,8 +1065,8 @@ public class InternalUmlStateLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:564:16: ( . ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:564:18: . + // InternalUmlState.g:564:16: ( . ) + // InternalUmlState.g:564:18: . { matchAny(); @@ -1136,123 +1077,120 @@ public class InternalUmlStateLexer extends Lexer { } finally { } } - // $ANTLR end "RULE_ANY_OTHER" - @Override public void mTokens() throws RecognitionException { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | RULE_INTEGER_VALUE | RULE_ID | - // RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_WS | RULE_ANY_OTHER ) + // InternalUmlState.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_INTEGER_VALUE | RULE_WS | RULE_ANY_OTHER ) int alt24 = 16; alt24 = dfa24.predict(input); switch (alt24) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:10: T__12 + // InternalUmlState.g:1:10: T__12 { mT__12(); } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:16: T__13 + // InternalUmlState.g:1:16: T__13 { mT__13(); } break; case 3: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:22: T__14 + // InternalUmlState.g:1:22: T__14 { mT__14(); } break; case 4: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:28: T__15 + // InternalUmlState.g:1:28: T__15 { mT__15(); } break; case 5: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:34: T__16 + // InternalUmlState.g:1:34: T__16 { mT__16(); } break; case 6: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:40: T__17 + // InternalUmlState.g:1:40: T__17 { mT__17(); } break; case 7: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:46: T__18 + // InternalUmlState.g:1:46: T__18 { mT__18(); } break; case 8: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:52: T__19 + // InternalUmlState.g:1:52: T__19 { mT__19(); } break; case 9: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:58: RULE_INTEGER_VALUE + // InternalUmlState.g:1:58: RULE_ID { - mRULE_INTEGER_VALUE(); + mRULE_ID(); } break; case 10: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:77: RULE_ID + // InternalUmlState.g:1:66: RULE_STRING { - mRULE_ID(); + mRULE_STRING(); } break; case 11: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:85: RULE_STRING + // InternalUmlState.g:1:78: RULE_ML_COMMENT { - mRULE_STRING(); + mRULE_ML_COMMENT(); } break; case 12: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:97: RULE_ML_COMMENT + // InternalUmlState.g:1:94: RULE_SL_COMMENT { - mRULE_ML_COMMENT(); + mRULE_SL_COMMENT(); } break; case 13: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:113: RULE_SL_COMMENT + // InternalUmlState.g:1:110: RULE_INT { - mRULE_SL_COMMENT(); + mRULE_INT(); } break; case 14: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:129: RULE_INT + // InternalUmlState.g:1:119: RULE_INTEGER_VALUE { - mRULE_INT(); + mRULE_INTEGER_VALUE(); } break; case 15: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:138: RULE_WS + // InternalUmlState.g:1:138: RULE_WS { mRULE_WS(); } break; case 16: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:1:146: RULE_ANY_OTHER + // InternalUmlState.g:1:146: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1265,50 +1203,26 @@ public class InternalUmlStateLexer extends Lexer { protected DFA24 dfa24 = new DFA24(this); - static final String DFA24_eotS = - "\1\uffff\1\20\5\23\2\30\1\uffff\3\16\4\uffff\2\23\1\uffff\1\42" + - "\3\23\1\uffff\1\30\1\uffff\1\30\4\uffff\2\23\1\uffff\3\23\1\30\1" + - "\23\1\55\3\23\1\61\1\uffff\3\23\1\uffff\6\23\1\73\2\23\1\uffff\6" + - "\23\1\104\1\23\1\uffff\1\23\1\107\1\uffff"; - static final String DFA24_eofS = - "\110\uffff"; - static final String DFA24_minS = - "\1\0\1\72\1\156\1\157\1\143\1\164\1\160\2\60\1\uffff\2\0\1\52\4" + - "\uffff\1\164\1\151\1\uffff\1\60\1\164\2\141\1\uffff\1\60\1\uffff" + - "\1\60\4\uffff\1\162\1\164\1\uffff\1\151\1\164\1\161\1\60\1\171\1" + - "\60\1\166\1\145\1\165\1\60\1\uffff\1\151\1\115\1\145\1\uffff\1\164" + - "\1\141\1\102\1\171\1\143\1\145\1\60\2\150\1\uffff\1\151\1\141\1" + - "\156\1\166\1\145\1\151\1\60\1\157\1\uffff\1\162\1\60\1\uffff"; - static final String DFA24_maxS = - "\1\uffff\1\72\1\170\1\157\1\143\1\164\1\160\2\71\1\uffff\2\uffff" + - "\1\57\4\uffff\1\164\1\151\1\uffff\1\172\1\164\2\141\1\uffff\1\71" + - "\1\uffff\1\71\4\uffff\1\162\1\164\1\uffff\1\151\1\164\1\161\1\71" + - "\1\171\1\172\1\166\1\145\1\165\1\172\1\uffff\1\151\1\115\1\145\1" + - "\uffff\1\164\1\141\1\102\1\171\1\143\1\145\1\172\2\150\1\uffff\1" + - "\151\1\141\1\156\1\166\1\145\1\151\1\172\1\157\1\uffff\1\162\1\172" + - "\1\uffff"; - static final String DFA24_acceptS = - "\11\uffff\1\12\3\uffff\1\17\1\20\1\2\1\1\2\uffff\1\12\4\uffff\1" + - "\11\1\uffff\1\16\1\uffff\1\13\1\14\1\15\1\17\2\uffff\1\4\12\uffff" + - "\1\5\3\uffff\1\3\11\uffff\1\6\10\uffff\1\7\2\uffff\1\10"; - static final String DFA24_specialS = - "\1\1\11\uffff\1\0\1\2\74\uffff}>"; + static final String DFA24_eotS = "\1\uffff\1\20\5\23\1\uffff\3\16\2\35\4\uffff\2\23\1\uffff\1\42\3\23\4\uffff\1\35\1\uffff\1\35\1\uffff\2\23\1\uffff\3\23\1\35\1\23\1\55\3\23\1\61\1\uffff\3\23\1\uffff\6\23\1\73\2\23\1\uffff\6\23\1\104\1\23\1\uffff\1\23\1\107\1\uffff"; + static final String DFA24_eofS = "\110\uffff"; + static final String DFA24_minS = "\1\0\1\72\1\156\1\157\1\143\1\164\1\160\1\uffff\2\0\1\52\2\60\4\uffff\1\164\1\151\1\uffff\1\60\1\164\2\141\4\uffff\1\60\1\uffff\1\60\1\uffff\1\162\1\164\1\uffff\1\151\1\164\1\161\1\60\1\171\1\60\1\166\1\145\1\165\1\60\1\uffff\1\151\1\115\1\145\1\uffff\1\164\1\141\1\102\1\171\1\143\1\145\1\60\2\150\1\uffff\1\151\1\141\1\156\1\166\1\145\1\151\1\60\1\157\1\uffff\1\162\1\60\1\uffff"; + static final String DFA24_maxS = "\1\uffff\1\72\1\170\1\157\1\143\1\164\1\160\1\uffff\2\uffff\1\57\1\170\1\137\4\uffff\1\164\1\151\1\uffff\1\172\1\164\2\141\4\uffff\1\137\1\uffff\1\137\1\uffff\1\162\1\164\1\uffff\1\151\1\164\1\161\1\137\1\171\1\172\1\166\1\145\1\165\1\172\1\uffff\1\151\1\115\1\145\1\uffff\1\164\1\141\1\102\1\171\1\143\1\145\1\172\2\150\1\uffff\1\151\1\141\1\156\1\166\1\145\1\151\1\172\1\157\1\uffff\1\162\1\172\1\uffff"; + static final String DFA24_acceptS = "\7\uffff\1\11\5\uffff\1\17\1\20\1\2\1\1\2\uffff\1\11\4\uffff\1\12\1\13\1\14\1\16\1\uffff\1\15\1\uffff\1\17\2\uffff\1\4\12\uffff\1\5\3\uffff\1\3\11\uffff\1\6\10\uffff\1\7\2\uffff\1\10"; + static final String DFA24_specialS = "\1\2\7\uffff\1\1\1\0\76\uffff}>"; static final String[] DFA24_transitionS = { - "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\13\4\16\1\12\7\16\1" + - "\14\1\7\11\10\1\1\6\16\1\4\15\11\1\6\3\11\1\5\7\11\4\16\1\11" + - "\1\16\3\11\1\3\1\2\25\11\uff85\16", + "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\11\4\16\1\10\7\16\1\12\1\13\11\14\1\1\6\16\1\4\15\7\1\6\3\7\1\5\7\7\4\16\1\7\1\16\3\7\1\3\1\2\25\7\uff85\16", "\1\17", "\1\21\11\uffff\1\22", "\1\24", "\1\25", "\1\26", "\1\27", - "\10\31\2\32", - "\12\33", "", "\0\23", - "\0\34", - "\1\35\4\uffff\1\36", + "\0\30", + "\1\31\4\uffff\1\32", + "\10\34\12\uffff\1\33\25\uffff\1\33\6\uffff\1\33\2\uffff\1\33\25\uffff\1\33", + "\12\36\45\uffff\1\33", "", "", "", @@ -1321,12 +1235,12 @@ public class InternalUmlStateLexer extends Lexer { "\1\44", "\1\45", "", - "\10\46\2\32", "", - "\12\33", "", "", + "\10\46\47\uffff\1\33", "", + "\12\36\45\uffff\1\33", "", "\1\47", "\1\50", @@ -1334,7 +1248,7 @@ public class InternalUmlStateLexer extends Lexer { "\1\51", "\1\52", "\1\53", - "\10\46\2\32", + "\10\46\47\uffff\1\33", "\1\54", "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23", "\1\56", @@ -1400,31 +1314,43 @@ public class InternalUmlStateLexer extends Lexer { this.transition = DFA24_transition; } - @Override public String getDescription() { - return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | RULE_INTEGER_VALUE | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_INT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | 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 LA24_10 = input.LA(1); + int LA24_9 = input.LA(1); s = -1; - if (((LA24_10 >= '\u0000' && LA24_10 <= '\uFFFF'))) { - s = 19; - } else { - s = 14; + if (((LA24_9 >= '\u0000' && LA24_9 <= '\uFFFF'))) { + s = 24; } - if (s >= 0) { + else + s = 14; + + if (s >= 0) return s; - } break; case 1: + int LA24_8 = input.LA(1); + + s = -1; + if (((LA24_8 >= '\u0000' && LA24_8 <= '\uFFFF'))) { + s = 19; + } + + else + s = 14; + + if (s >= 0) + return s; + break; + case 2: int LA24_0 = input.LA(1); s = -1; @@ -1452,27 +1378,27 @@ public class InternalUmlStateLexer extends Lexer { s = 6; } - else if ((LA24_0 == '0')) { + else if (((LA24_0 >= 'B' && LA24_0 <= 'N') || (LA24_0 >= 'P' && LA24_0 <= 'R') || (LA24_0 >= 'T' && LA24_0 <= 'Z') || LA24_0 == '_' || (LA24_0 >= 'a' && LA24_0 <= 'c') || (LA24_0 >= 'f' && LA24_0 <= 'z'))) { s = 7; } - else if (((LA24_0 >= '1' && LA24_0 <= '9'))) { + else if ((LA24_0 == '\'')) { s = 8; } - else if (((LA24_0 >= 'B' && LA24_0 <= 'N') || (LA24_0 >= 'P' && LA24_0 <= 'R') || (LA24_0 >= 'T' && LA24_0 <= 'Z') || LA24_0 == '_' || (LA24_0 >= 'a' && LA24_0 <= 'c') || (LA24_0 >= 'f' && LA24_0 <= 'z'))) { + else if ((LA24_0 == '\"')) { s = 9; } - else if ((LA24_0 == '\'')) { + else if ((LA24_0 == '/')) { s = 10; } - else if ((LA24_0 == '\"')) { + else if ((LA24_0 == '0')) { s = 11; } - else if ((LA24_0 == '/')) { + else if (((LA24_0 >= '1' && LA24_0 <= '9'))) { s = 12; } @@ -1485,27 +1411,11 @@ public class InternalUmlStateLexer extends Lexer { s = 14; } - if (s >= 0) { + if (s >= 0) return s; - } - break; - case 2: - int LA24_11 = input.LA(1); - - s = -1; - if (((LA24_11 >= '\u0000' && LA24_11 <= '\uFFFF'))) { - s = 28; - } else { - s = 14; - } - - if (s >= 0) { - return s; - } break; } - NoViableAltException nvae = - new NoViableAltException(getDescription(), 24, _s, input); + NoViableAltException nvae = new NoViableAltException(getDescription(), 24, _s, input); error(nvae); throw nvae; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateParser.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateParser.java index 5334109a256..c3fa49161da 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateParser.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlStateParser.java @@ -15,26 +15,26 @@ import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser; @SuppressWarnings("all") public class InternalUmlStateParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INTEGER_VALUE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_INT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'::'", "'entry'", "'do'", "'exit'", "'Activity'", "'StateMachine'", + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_INT", "RULE_INTEGER_VALUE", "RULE_WS", "RULE_ANY_OTHER", "':'", "'::'", "'entry'", "'do'", "'exit'", "'Activity'", "'StateMachine'", "'OpaqueBehavior'" }; - public static final int RULE_ID = 4; - public static final int RULE_ANY_OTHER = 11; - public static final int RULE_INTEGER_VALUE = 5; - public static final int EOF = -1; - public static final int RULE_SL_COMMENT = 8; - public static final int RULE_ML_COMMENT = 7; + public static final int RULE_STRING = 5; + public static final int RULE_SL_COMMENT = 7; public static final int T__19 = 19; - public static final int RULE_STRING = 6; - public static final int T__16 = 16; public static final int T__15 = 15; - public static final int T__18 = 18; + public static final int T__16 = 16; public static final int T__17 = 17; + public static final int T__18 = 18; public static final int T__12 = 12; - public static final int T__14 = 14; public static final int T__13 = 13; - public static final int RULE_INT = 9; + public static final int T__14 = 14; + public static final int EOF = -1; + public static final int RULE_ID = 4; public static final int RULE_WS = 10; + public static final int RULE_ANY_OTHER = 11; + public static final int RULE_INT = 8; + public static final int RULE_ML_COMMENT = 6; + public static final int RULE_INTEGER_VALUE = 9; // delegates // delegators @@ -50,12 +50,10 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - @Override public String[] getTokenNames() { return InternalUmlStateParser.tokenNames; } - @Override public String getGrammarFileName() { return "../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g"; } @@ -83,7 +81,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleStateRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:68:1: entryRuleStateRule returns [EObject current=null] : iv_ruleStateRule= ruleStateRule EOF ; + // InternalUmlState.g:68:1: entryRuleStateRule returns [EObject current=null] : iv_ruleStateRule= ruleStateRule EOF ; public final EObject entryRuleStateRule() throws RecognitionException { EObject current = null; @@ -91,17 +89,17 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:69:2: (iv_ruleStateRule= ruleStateRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:70:2: iv_ruleStateRule= ruleStateRule EOF + // InternalUmlState.g:69:2: (iv_ruleStateRule= ruleStateRule EOF ) + // InternalUmlState.g:70:2: iv_ruleStateRule= ruleStateRule EOF { newCompositeNode(grammarAccess.getStateRuleRule()); - pushFollow(FOLLOW_ruleStateRule_in_entryRuleStateRule75); + pushFollow(FOLLOW_1); iv_ruleStateRule = ruleStateRule(); state._fsp--; current = iv_ruleStateRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleStateRule85); + match(input, EOF, FOLLOW_2); } @@ -114,14 +112,12 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleStateRule" // $ANTLR start "ruleStateRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:77:1: ruleStateRule returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( - // (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) - // ) ; + // InternalUmlState.g:77:1: ruleStateRule returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( + // ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) ; public final EObject ruleStateRule() throws RecognitionException { EObject current = null; @@ -139,23 +135,23 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:80:28: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? - // ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( - // ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) + // InternalUmlState.g:80:28: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule + // ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) ) + // InternalUmlState.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) + // ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? - // ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:81:2: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( - // ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) + // InternalUmlState.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= + // ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) ) + // InternalUmlState.g:81:2: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule + // ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:81:2: ( (lv_name_0_0= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:82:1: (lv_name_0_0= RULE_ID ) + // InternalUmlState.g:81:2: ( (lv_name_0_0= RULE_ID ) ) + // InternalUmlState.g:82:1: (lv_name_0_0= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:82:1: (lv_name_0_0= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:83:3: lv_name_0_0= RULE_ID + // InternalUmlState.g:82:1: (lv_name_0_0= RULE_ID ) + // InternalUmlState.g:83:3: lv_name_0_0= RULE_ID { - lv_name_0_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleStateRule127); + lv_name_0_0 = (Token) match(input, RULE_ID, FOLLOW_3); newLeafNode(lv_name_0_0, grammarAccess.getStateRuleAccess().getNameIDTerminalRuleCall_0_0()); @@ -167,7 +163,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "name", lv_name_0_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } @@ -175,7 +171,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:99:2: (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? + // InternalUmlState.g:99:2: (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? int alt1 = 2; int LA1_0 = input.LA(1); @@ -184,22 +180,22 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } switch (alt1) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:99:4: otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) + // InternalUmlState.g:99:4: otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) { - otherlv_1 = (Token) match(input, 12, FOLLOW_12_in_ruleStateRule145); + otherlv_1 = (Token) match(input, 12, FOLLOW_4); newLeafNode(otherlv_1, grammarAccess.getStateRuleAccess().getColonKeyword_1_0()); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:103:1: ( (lv_submachine_2_0= ruleSubmachineRule ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:104:1: (lv_submachine_2_0= ruleSubmachineRule ) + // InternalUmlState.g:103:1: ( (lv_submachine_2_0= ruleSubmachineRule ) ) + // InternalUmlState.g:104:1: (lv_submachine_2_0= ruleSubmachineRule ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:104:1: (lv_submachine_2_0= ruleSubmachineRule ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:105:3: lv_submachine_2_0= ruleSubmachineRule + // InternalUmlState.g:104:1: (lv_submachine_2_0= ruleSubmachineRule ) + // InternalUmlState.g:105:3: lv_submachine_2_0= ruleSubmachineRule { newCompositeNode(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0()); - pushFollow(FOLLOW_ruleSubmachineRule_in_ruleStateRule166); + pushFollow(FOLLOW_5); lv_submachine_2_0 = ruleSubmachineRule(); state._fsp--; @@ -212,7 +208,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "submachine", lv_submachine_2_0, - "SubmachineRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.SubmachineRule"); afterParserOrEnumRuleCall(); @@ -227,73 +223,64 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:121:4: ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( - // ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:123:1: ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( - // ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) + // InternalUmlState.g:121:4: ( ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) ) + // InternalUmlState.g:123:1: ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:123:1: ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => - // ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:124:2: ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( - // ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) + // InternalUmlState.g:123:1: ( ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) ) + // InternalUmlState.g:124:2: ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) { getUnorderedGroupHelper().enter(grammarAccess.getStateRuleAccess().getUnorderedGroup_2()); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:127:2: ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? - // => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:128:3: ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => - // ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* + // InternalUmlState.g:127:2: ( ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* ) + // InternalUmlState.g:128:3: ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:128:3: ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? - // => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* + // InternalUmlState.g:128:3: ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )* loop2: do { int alt2 = 4; int LA2_0 = input.LA(1); if (LA2_0 == 14 && getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 0)) { alt2 = 1; - } - else if (LA2_0 == 15 && getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1)) { + } else if (LA2_0 == 15 && getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1)) { alt2 = 2; - } - else if (LA2_0 == 16 && getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2)) { + } else if (LA2_0 == 16 && getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2)) { alt2 = 3; } switch (alt2) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:130:4: ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) + // InternalUmlState.g:130:4: ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:130:4: ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:131:5: {...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) + // InternalUmlState.g:130:4: ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) + // InternalUmlState.g:131:5: {...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) { if (!getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 0)) { throw new FailedPredicateException(input, "ruleStateRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 0)"); } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:131:106: ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:132:6: ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) + // InternalUmlState.g:131:106: ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) + // InternalUmlState.g:132:6: ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) { getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 0); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:135:6: ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:135:7: {...}? => ( (lv_entry_4_0= ruleEntryRule ) ) + // InternalUmlState.g:135:6: ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) + // InternalUmlState.g:135:7: {...}? => ( (lv_entry_4_0= ruleEntryRule ) ) { if (!((true))) { throw new FailedPredicateException(input, "ruleStateRule", "true"); } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:135:16: ( (lv_entry_4_0= ruleEntryRule ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:136:1: (lv_entry_4_0= ruleEntryRule ) + // InternalUmlState.g:135:16: ( (lv_entry_4_0= ruleEntryRule ) ) + // InternalUmlState.g:136:1: (lv_entry_4_0= ruleEntryRule ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:136:1: (lv_entry_4_0= ruleEntryRule ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:137:3: lv_entry_4_0= ruleEntryRule + // InternalUmlState.g:136:1: (lv_entry_4_0= ruleEntryRule ) + // InternalUmlState.g:137:3: lv_entry_4_0= ruleEntryRule { newCompositeNode(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0()); - pushFollow(FOLLOW_ruleEntryRule_in_ruleStateRule234); + pushFollow(FOLLOW_5); lv_entry_4_0 = ruleEntryRule(); state._fsp--; @@ -306,7 +293,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "entry", lv_entry_4_0, - "EntryRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.EntryRule"); afterParserOrEnumRuleCall(); @@ -331,36 +318,36 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:160:4: ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) + // InternalUmlState.g:160:4: ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:160:4: ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:161:5: {...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) + // InternalUmlState.g:160:4: ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) + // InternalUmlState.g:161:5: {...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) { if (!getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1)) { throw new FailedPredicateException(input, "ruleStateRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1)"); } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:161:106: ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:162:6: ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) + // InternalUmlState.g:161:106: ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) + // InternalUmlState.g:162:6: ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) { getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:165:6: ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:165:7: {...}? => ( (lv_do_5_0= ruleDoRule ) ) + // InternalUmlState.g:165:6: ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) + // InternalUmlState.g:165:7: {...}? => ( (lv_do_5_0= ruleDoRule ) ) { if (!((true))) { throw new FailedPredicateException(input, "ruleStateRule", "true"); } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:165:16: ( (lv_do_5_0= ruleDoRule ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:166:1: (lv_do_5_0= ruleDoRule ) + // InternalUmlState.g:165:16: ( (lv_do_5_0= ruleDoRule ) ) + // InternalUmlState.g:166:1: (lv_do_5_0= ruleDoRule ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:166:1: (lv_do_5_0= ruleDoRule ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:167:3: lv_do_5_0= ruleDoRule + // InternalUmlState.g:166:1: (lv_do_5_0= ruleDoRule ) + // InternalUmlState.g:167:3: lv_do_5_0= ruleDoRule { newCompositeNode(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0()); - pushFollow(FOLLOW_ruleDoRule_in_ruleStateRule309); + pushFollow(FOLLOW_5); lv_do_5_0 = ruleDoRule(); state._fsp--; @@ -373,7 +360,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "do", lv_do_5_0, - "DoRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.DoRule"); afterParserOrEnumRuleCall(); @@ -398,36 +385,36 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } break; case 3: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:190:4: ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) + // InternalUmlState.g:190:4: ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:190:4: ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:191:5: {...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) + // InternalUmlState.g:190:4: ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) + // InternalUmlState.g:191:5: {...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) { if (!getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2)) { throw new FailedPredicateException(input, "ruleStateRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2)"); } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:191:106: ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:192:6: ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) + // InternalUmlState.g:191:106: ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) + // InternalUmlState.g:192:6: ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) { getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:195:6: ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:195:7: {...}? => ( (lv_exit_6_0= ruleExitRule ) ) + // InternalUmlState.g:195:6: ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) + // InternalUmlState.g:195:7: {...}? => ( (lv_exit_6_0= ruleExitRule ) ) { if (!((true))) { throw new FailedPredicateException(input, "ruleStateRule", "true"); } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:195:16: ( (lv_exit_6_0= ruleExitRule ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:196:1: (lv_exit_6_0= ruleExitRule ) + // InternalUmlState.g:195:16: ( (lv_exit_6_0= ruleExitRule ) ) + // InternalUmlState.g:196:1: (lv_exit_6_0= ruleExitRule ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:196:1: (lv_exit_6_0= ruleExitRule ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:197:3: lv_exit_6_0= ruleExitRule + // InternalUmlState.g:196:1: (lv_exit_6_0= ruleExitRule ) + // InternalUmlState.g:197:3: lv_exit_6_0= ruleExitRule { newCompositeNode(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0()); - pushFollow(FOLLOW_ruleExitRule_in_ruleStateRule384); + pushFollow(FOLLOW_5); lv_exit_6_0 = ruleExitRule(); state._fsp--; @@ -440,7 +427,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "exit", lv_exit_6_0, - "ExitRule"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.ExitRule"); afterParserOrEnumRuleCall(); @@ -498,12 +485,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleStateRule" // $ANTLR start "entryRuleSubmachineRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:235:1: entryRuleSubmachineRule returns [EObject current=null] : iv_ruleSubmachineRule= ruleSubmachineRule EOF ; + // InternalUmlState.g:235:1: entryRuleSubmachineRule returns [EObject current=null] : iv_ruleSubmachineRule= ruleSubmachineRule EOF ; public final EObject entryRuleSubmachineRule() throws RecognitionException { EObject current = null; @@ -511,17 +497,17 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:236:2: (iv_ruleSubmachineRule= ruleSubmachineRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:237:2: iv_ruleSubmachineRule= ruleSubmachineRule EOF + // InternalUmlState.g:236:2: (iv_ruleSubmachineRule= ruleSubmachineRule EOF ) + // InternalUmlState.g:237:2: iv_ruleSubmachineRule= ruleSubmachineRule EOF { newCompositeNode(grammarAccess.getSubmachineRuleRule()); - pushFollow(FOLLOW_ruleSubmachineRule_in_entryRuleSubmachineRule460); + pushFollow(FOLLOW_1); iv_ruleSubmachineRule = ruleSubmachineRule(); state._fsp--; current = iv_ruleSubmachineRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleSubmachineRule470); + match(input, EOF, FOLLOW_2); } @@ -534,13 +520,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleSubmachineRule" // $ANTLR start "ruleSubmachineRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:244:1: ruleSubmachineRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( - // (otherlv_1= RULE_ID ) ) ) ; + // InternalUmlState.g:244:1: ruleSubmachineRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) ; public final EObject ruleSubmachineRule() throws RecognitionException { EObject current = null; @@ -551,13 +535,13 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:247:28: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:248:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) + // InternalUmlState.g:247:28: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) ) + // InternalUmlState.g:248:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:248:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:248:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) + // InternalUmlState.g:248:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) + // InternalUmlState.g:248:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:248:2: ( (lv_path_0_0= ruleQualifiedName ) )? + // InternalUmlState.g:248:2: ( (lv_path_0_0= ruleQualifiedName ) )? int alt3 = 2; int LA3_0 = input.LA(1); @@ -570,15 +554,15 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } switch (alt3) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:249:1: (lv_path_0_0= ruleQualifiedName ) + // InternalUmlState.g:249:1: (lv_path_0_0= ruleQualifiedName ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:249:1: (lv_path_0_0= ruleQualifiedName ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:250:3: lv_path_0_0= ruleQualifiedName + // InternalUmlState.g:249:1: (lv_path_0_0= ruleQualifiedName ) + // InternalUmlState.g:250:3: lv_path_0_0= ruleQualifiedName { newCompositeNode(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); - pushFollow(FOLLOW_ruleQualifiedName_in_ruleSubmachineRule516); + pushFollow(FOLLOW_4); lv_path_0_0 = ruleQualifiedName(); state._fsp--; @@ -591,7 +575,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "path", lv_path_0_0, - "QualifiedName"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.QualifiedName"); afterParserOrEnumRuleCall(); @@ -603,18 +587,18 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:266:3: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:267:1: (otherlv_1= RULE_ID ) + // InternalUmlState.g:266:3: ( (otherlv_1= RULE_ID ) ) + // InternalUmlState.g:267:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:267:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:268:3: otherlv_1= RULE_ID + // InternalUmlState.g:267:1: (otherlv_1= RULE_ID ) + // InternalUmlState.g:268:3: otherlv_1= RULE_ID { if (current == null) { current = createModelElement(grammarAccess.getSubmachineRuleRule()); } - otherlv_1 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleSubmachineRule537); + otherlv_1 = (Token) match(input, RULE_ID, FOLLOW_2); newLeafNode(otherlv_1, grammarAccess.getSubmachineRuleAccess().getSubmachineStateMachineCrossReference_1_0()); @@ -640,12 +624,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleSubmachineRule" // $ANTLR start "entryRuleQualifiedName" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:287:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ; + // InternalUmlState.g:287:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ; public final EObject entryRuleQualifiedName() throws RecognitionException { EObject current = null; @@ -653,17 +636,17 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:288:2: (iv_ruleQualifiedName= ruleQualifiedName EOF ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:289:2: iv_ruleQualifiedName= ruleQualifiedName EOF + // InternalUmlState.g:288:2: (iv_ruleQualifiedName= ruleQualifiedName EOF ) + // InternalUmlState.g:289:2: iv_ruleQualifiedName= ruleQualifiedName EOF { newCompositeNode(grammarAccess.getQualifiedNameRule()); - pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName573); + pushFollow(FOLLOW_1); iv_ruleQualifiedName = ruleQualifiedName(); state._fsp--; current = iv_ruleQualifiedName; - match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName583); + match(input, EOF, FOLLOW_2); } @@ -676,13 +659,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleQualifiedName" // $ANTLR start "ruleQualifiedName" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:296:1: ruleQualifiedName returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( - // (lv_remaining_2_0= ruleQualifiedName ) )? ) ; + // InternalUmlState.g:296:1: ruleQualifiedName returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ; public final EObject ruleQualifiedName() throws RecognitionException { EObject current = null; @@ -694,24 +675,24 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:299:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:300:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) + // InternalUmlState.g:299:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ) + // InternalUmlState.g:300:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:300:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:300:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? + // InternalUmlState.g:300:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) + // InternalUmlState.g:300:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:300:2: ( (otherlv_0= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:301:1: (otherlv_0= RULE_ID ) + // InternalUmlState.g:300:2: ( (otherlv_0= RULE_ID ) ) + // InternalUmlState.g:301:1: (otherlv_0= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:301:1: (otherlv_0= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:302:3: otherlv_0= RULE_ID + // InternalUmlState.g:301:1: (otherlv_0= RULE_ID ) + // InternalUmlState.g:302:3: otherlv_0= RULE_ID { if (current == null) { current = createModelElement(grammarAccess.getQualifiedNameRule()); } - otherlv_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleQualifiedName628); + otherlv_0 = (Token) match(input, RULE_ID, FOLLOW_6); newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); @@ -721,11 +702,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - otherlv_1 = (Token) match(input, 13, FOLLOW_13_in_ruleQualifiedName640); + otherlv_1 = (Token) match(input, 13, FOLLOW_7); newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:317:1: ( (lv_remaining_2_0= ruleQualifiedName ) )? + // InternalUmlState.g:317:1: ( (lv_remaining_2_0= ruleQualifiedName ) )? int alt4 = 2; int LA4_0 = input.LA(1); @@ -738,15 +719,15 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } switch (alt4) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:318:1: (lv_remaining_2_0= ruleQualifiedName ) + // InternalUmlState.g:318:1: (lv_remaining_2_0= ruleQualifiedName ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:318:1: (lv_remaining_2_0= ruleQualifiedName ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:319:3: lv_remaining_2_0= ruleQualifiedName + // InternalUmlState.g:318:1: (lv_remaining_2_0= ruleQualifiedName ) + // InternalUmlState.g:319:3: lv_remaining_2_0= ruleQualifiedName { newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); - pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName661); + pushFollow(FOLLOW_2); lv_remaining_2_0 = ruleQualifiedName(); state._fsp--; @@ -759,7 +740,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "remaining", lv_remaining_2_0, - "QualifiedName"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.QualifiedName"); afterParserOrEnumRuleCall(); @@ -787,12 +768,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleQualifiedName" // $ANTLR start "entryRuleEntryRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:343:1: entryRuleEntryRule returns [EObject current=null] : iv_ruleEntryRule= ruleEntryRule EOF ; + // InternalUmlState.g:343:1: entryRuleEntryRule returns [EObject current=null] : iv_ruleEntryRule= ruleEntryRule EOF ; public final EObject entryRuleEntryRule() throws RecognitionException { EObject current = null; @@ -800,17 +780,17 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:344:2: (iv_ruleEntryRule= ruleEntryRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:345:2: iv_ruleEntryRule= ruleEntryRule EOF + // InternalUmlState.g:344:2: (iv_ruleEntryRule= ruleEntryRule EOF ) + // InternalUmlState.g:345:2: iv_ruleEntryRule= ruleEntryRule EOF { newCompositeNode(grammarAccess.getEntryRuleRule()); - pushFollow(FOLLOW_ruleEntryRule_in_entryRuleEntryRule698); + pushFollow(FOLLOW_1); iv_ruleEntryRule = ruleEntryRule(); state._fsp--; current = iv_ruleEntryRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleEntryRule708); + match(input, EOF, FOLLOW_2); } @@ -823,13 +803,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleEntryRule" // $ANTLR start "ruleEntryRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:352:1: ruleEntryRule returns [EObject current=null] : (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) - // ( (lv_behaviorName_2_0= RULE_ID ) ) ) ; + // InternalUmlState.g:352:1: ruleEntryRule returns [EObject current=null] : (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ; public final EObject ruleEntryRule() throws RecognitionException { EObject current = null; @@ -841,28 +819,26 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:355:28: ( (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) - // ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:356:1: (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) + // InternalUmlState.g:355:28: ( (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ) + // InternalUmlState.g:356:1: (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:356:1: (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) - // ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:356:3: otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) + // InternalUmlState.g:356:1: (otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) + // InternalUmlState.g:356:3: otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) { - otherlv_0 = (Token) match(input, 14, FOLLOW_14_in_ruleEntryRule745); + otherlv_0 = (Token) match(input, 14, FOLLOW_8); newLeafNode(otherlv_0, grammarAccess.getEntryRuleAccess().getEntryKeyword_0()); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:360:1: ( (lv_kind_1_0= ruleBehaviorKind ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:361:1: (lv_kind_1_0= ruleBehaviorKind ) + // InternalUmlState.g:360:1: ( (lv_kind_1_0= ruleBehaviorKind ) ) + // InternalUmlState.g:361:1: (lv_kind_1_0= ruleBehaviorKind ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:361:1: (lv_kind_1_0= ruleBehaviorKind ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:362:3: lv_kind_1_0= ruleBehaviorKind + // InternalUmlState.g:361:1: (lv_kind_1_0= ruleBehaviorKind ) + // InternalUmlState.g:362:3: lv_kind_1_0= ruleBehaviorKind { newCompositeNode(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); - pushFollow(FOLLOW_ruleBehaviorKind_in_ruleEntryRule766); + pushFollow(FOLLOW_4); lv_kind_1_0 = ruleBehaviorKind(); state._fsp--; @@ -875,7 +851,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "kind", lv_kind_1_0, - "BehaviorKind"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); afterParserOrEnumRuleCall(); @@ -884,13 +860,13 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:378:2: ( (lv_behaviorName_2_0= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:379:1: (lv_behaviorName_2_0= RULE_ID ) + // InternalUmlState.g:378:2: ( (lv_behaviorName_2_0= RULE_ID ) ) + // InternalUmlState.g:379:1: (lv_behaviorName_2_0= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:379:1: (lv_behaviorName_2_0= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:380:3: lv_behaviorName_2_0= RULE_ID + // InternalUmlState.g:379:1: (lv_behaviorName_2_0= RULE_ID ) + // InternalUmlState.g:380:3: lv_behaviorName_2_0= RULE_ID { - lv_behaviorName_2_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleEntryRule783); + lv_behaviorName_2_0 = (Token) match(input, RULE_ID, FOLLOW_2); newLeafNode(lv_behaviorName_2_0, grammarAccess.getEntryRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); @@ -902,7 +878,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "behaviorName", lv_behaviorName_2_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } @@ -926,12 +902,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleEntryRule" // $ANTLR start "entryRuleDoRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:404:1: entryRuleDoRule returns [EObject current=null] : iv_ruleDoRule= ruleDoRule EOF ; + // InternalUmlState.g:404:1: entryRuleDoRule returns [EObject current=null] : iv_ruleDoRule= ruleDoRule EOF ; public final EObject entryRuleDoRule() throws RecognitionException { EObject current = null; @@ -939,17 +914,17 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:405:2: (iv_ruleDoRule= ruleDoRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:406:2: iv_ruleDoRule= ruleDoRule EOF + // InternalUmlState.g:405:2: (iv_ruleDoRule= ruleDoRule EOF ) + // InternalUmlState.g:406:2: iv_ruleDoRule= ruleDoRule EOF { newCompositeNode(grammarAccess.getDoRuleRule()); - pushFollow(FOLLOW_ruleDoRule_in_entryRuleDoRule824); + pushFollow(FOLLOW_1); iv_ruleDoRule = ruleDoRule(); state._fsp--; current = iv_ruleDoRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleDoRule834); + match(input, EOF, FOLLOW_2); } @@ -962,13 +937,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleDoRule" // $ANTLR start "ruleDoRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:413:1: ruleDoRule returns [EObject current=null] : (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( - // (lv_behaviorName_2_0= RULE_ID ) ) ) ; + // InternalUmlState.g:413:1: ruleDoRule returns [EObject current=null] : (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ; public final EObject ruleDoRule() throws RecognitionException { EObject current = null; @@ -980,26 +953,26 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:416:28: ( (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:417:1: (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) + // InternalUmlState.g:416:28: ( (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ) + // InternalUmlState.g:417:1: (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:417:1: (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:417:3: otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) + // InternalUmlState.g:417:1: (otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) + // InternalUmlState.g:417:3: otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) { - otherlv_0 = (Token) match(input, 15, FOLLOW_15_in_ruleDoRule871); + otherlv_0 = (Token) match(input, 15, FOLLOW_8); newLeafNode(otherlv_0, grammarAccess.getDoRuleAccess().getDoKeyword_0()); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:421:1: ( (lv_kind_1_0= ruleBehaviorKind ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:422:1: (lv_kind_1_0= ruleBehaviorKind ) + // InternalUmlState.g:421:1: ( (lv_kind_1_0= ruleBehaviorKind ) ) + // InternalUmlState.g:422:1: (lv_kind_1_0= ruleBehaviorKind ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:422:1: (lv_kind_1_0= ruleBehaviorKind ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:423:3: lv_kind_1_0= ruleBehaviorKind + // InternalUmlState.g:422:1: (lv_kind_1_0= ruleBehaviorKind ) + // InternalUmlState.g:423:3: lv_kind_1_0= ruleBehaviorKind { newCompositeNode(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); - pushFollow(FOLLOW_ruleBehaviorKind_in_ruleDoRule892); + pushFollow(FOLLOW_4); lv_kind_1_0 = ruleBehaviorKind(); state._fsp--; @@ -1012,7 +985,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "kind", lv_kind_1_0, - "BehaviorKind"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); afterParserOrEnumRuleCall(); @@ -1021,13 +994,13 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:439:2: ( (lv_behaviorName_2_0= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:440:1: (lv_behaviorName_2_0= RULE_ID ) + // InternalUmlState.g:439:2: ( (lv_behaviorName_2_0= RULE_ID ) ) + // InternalUmlState.g:440:1: (lv_behaviorName_2_0= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:440:1: (lv_behaviorName_2_0= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:441:3: lv_behaviorName_2_0= RULE_ID + // InternalUmlState.g:440:1: (lv_behaviorName_2_0= RULE_ID ) + // InternalUmlState.g:441:3: lv_behaviorName_2_0= RULE_ID { - lv_behaviorName_2_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleDoRule909); + lv_behaviorName_2_0 = (Token) match(input, RULE_ID, FOLLOW_2); newLeafNode(lv_behaviorName_2_0, grammarAccess.getDoRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); @@ -1039,7 +1012,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "behaviorName", lv_behaviorName_2_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } @@ -1063,12 +1036,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleDoRule" // $ANTLR start "entryRuleExitRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:465:1: entryRuleExitRule returns [EObject current=null] : iv_ruleExitRule= ruleExitRule EOF ; + // InternalUmlState.g:465:1: entryRuleExitRule returns [EObject current=null] : iv_ruleExitRule= ruleExitRule EOF ; public final EObject entryRuleExitRule() throws RecognitionException { EObject current = null; @@ -1076,17 +1048,17 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:466:2: (iv_ruleExitRule= ruleExitRule EOF ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:467:2: iv_ruleExitRule= ruleExitRule EOF + // InternalUmlState.g:466:2: (iv_ruleExitRule= ruleExitRule EOF ) + // InternalUmlState.g:467:2: iv_ruleExitRule= ruleExitRule EOF { newCompositeNode(grammarAccess.getExitRuleRule()); - pushFollow(FOLLOW_ruleExitRule_in_entryRuleExitRule950); + pushFollow(FOLLOW_1); iv_ruleExitRule = ruleExitRule(); state._fsp--; current = iv_ruleExitRule; - match(input, EOF, FOLLOW_EOF_in_entryRuleExitRule960); + match(input, EOF, FOLLOW_2); } @@ -1099,13 +1071,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleExitRule" // $ANTLR start "ruleExitRule" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:474:1: ruleExitRule returns [EObject current=null] : (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( - // (lv_behaviorName_2_0= RULE_ID ) ) ) ; + // InternalUmlState.g:474:1: ruleExitRule returns [EObject current=null] : (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ; public final EObject ruleExitRule() throws RecognitionException { EObject current = null; @@ -1117,28 +1087,26 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:477:28: ( (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) - // ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:478:1: (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) + // InternalUmlState.g:477:28: ( (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ) + // InternalUmlState.g:478:1: (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:478:1: (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) - // ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:478:3: otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) + // InternalUmlState.g:478:1: (otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) + // InternalUmlState.g:478:3: otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) { - otherlv_0 = (Token) match(input, 16, FOLLOW_16_in_ruleExitRule997); + otherlv_0 = (Token) match(input, 16, FOLLOW_8); newLeafNode(otherlv_0, grammarAccess.getExitRuleAccess().getExitKeyword_0()); - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:482:1: ( (lv_kind_1_0= ruleBehaviorKind ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:483:1: (lv_kind_1_0= ruleBehaviorKind ) + // InternalUmlState.g:482:1: ( (lv_kind_1_0= ruleBehaviorKind ) ) + // InternalUmlState.g:483:1: (lv_kind_1_0= ruleBehaviorKind ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:483:1: (lv_kind_1_0= ruleBehaviorKind ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:484:3: lv_kind_1_0= ruleBehaviorKind + // InternalUmlState.g:483:1: (lv_kind_1_0= ruleBehaviorKind ) + // InternalUmlState.g:484:3: lv_kind_1_0= ruleBehaviorKind { newCompositeNode(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); - pushFollow(FOLLOW_ruleBehaviorKind_in_ruleExitRule1018); + pushFollow(FOLLOW_4); lv_kind_1_0 = ruleBehaviorKind(); state._fsp--; @@ -1151,7 +1119,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "kind", lv_kind_1_0, - "BehaviorKind"); + "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); afterParserOrEnumRuleCall(); @@ -1160,13 +1128,13 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:500:2: ( (lv_behaviorName_2_0= RULE_ID ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:501:1: (lv_behaviorName_2_0= RULE_ID ) + // InternalUmlState.g:500:2: ( (lv_behaviorName_2_0= RULE_ID ) ) + // InternalUmlState.g:501:1: (lv_behaviorName_2_0= RULE_ID ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:501:1: (lv_behaviorName_2_0= RULE_ID ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:502:3: lv_behaviorName_2_0= RULE_ID + // InternalUmlState.g:501:1: (lv_behaviorName_2_0= RULE_ID ) + // InternalUmlState.g:502:3: lv_behaviorName_2_0= RULE_ID { - lv_behaviorName_2_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleExitRule1035); + lv_behaviorName_2_0 = (Token) match(input, RULE_ID, FOLLOW_2); newLeafNode(lv_behaviorName_2_0, grammarAccess.getExitRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); @@ -1178,7 +1146,7 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { current, "behaviorName", lv_behaviorName_2_0, - "ID"); + "org.eclipse.papyrus.uml.alf.Common.ID"); } @@ -1202,13 +1170,11 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleExitRule" // $ANTLR start "ruleBehaviorKind" - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:526:1: ruleBehaviorKind returns [Enumerator current=null] : ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= - // 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) ; + // InternalUmlState.g:526:1: ruleBehaviorKind returns [Enumerator current=null] : ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) ; public final Enumerator ruleBehaviorKind() throws RecognitionException { Enumerator current = null; @@ -1218,13 +1184,10 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:528:28: ( ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= - // 'OpaqueBehavior' ) ) ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:529:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= - // 'OpaqueBehavior' ) ) + // InternalUmlState.g:528:28: ( ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) ) + // InternalUmlState.g:529:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:529:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= - // 'OpaqueBehavior' ) ) + // InternalUmlState.g:529:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) int alt5 = 3; switch (input.LA(1)) { case 17: { @@ -1240,20 +1203,19 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } break; default: - NoViableAltException nvae = - new NoViableAltException("", 5, 0, input); + NoViableAltException nvae = new NoViableAltException("", 5, 0, input); throw nvae; } switch (alt5) { case 1: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:529:2: (enumLiteral_0= 'Activity' ) + // InternalUmlState.g:529:2: (enumLiteral_0= 'Activity' ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:529:2: (enumLiteral_0= 'Activity' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:529:4: enumLiteral_0= 'Activity' + // InternalUmlState.g:529:2: (enumLiteral_0= 'Activity' ) + // InternalUmlState.g:529:4: enumLiteral_0= 'Activity' { - enumLiteral_0 = (Token) match(input, 17, FOLLOW_17_in_ruleBehaviorKind1090); + enumLiteral_0 = (Token) match(input, 17, FOLLOW_2); current = grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0()); @@ -1265,12 +1227,12 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } break; case 2: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:535:6: (enumLiteral_1= 'StateMachine' ) + // InternalUmlState.g:535:6: (enumLiteral_1= 'StateMachine' ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:535:6: (enumLiteral_1= 'StateMachine' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:535:8: enumLiteral_1= 'StateMachine' + // InternalUmlState.g:535:6: (enumLiteral_1= 'StateMachine' ) + // InternalUmlState.g:535:8: enumLiteral_1= 'StateMachine' { - enumLiteral_1 = (Token) match(input, 18, FOLLOW_18_in_ruleBehaviorKind1107); + enumLiteral_1 = (Token) match(input, 18, FOLLOW_2); current = grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1()); @@ -1282,12 +1244,12 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } break; case 3: - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:541:6: (enumLiteral_2= 'OpaqueBehavior' ) + // InternalUmlState.g:541:6: (enumLiteral_2= 'OpaqueBehavior' ) { - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:541:6: (enumLiteral_2= 'OpaqueBehavior' ) - // ../org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/parser/antlr/internal/InternalUmlState.g:541:8: enumLiteral_2= 'OpaqueBehavior' + // InternalUmlState.g:541:6: (enumLiteral_2= 'OpaqueBehavior' ) + // InternalUmlState.g:541:8: enumLiteral_2= 'OpaqueBehavior' { - enumLiteral_2 = (Token) match(input, 19, FOLLOW_19_in_ruleBehaviorKind1124); + enumLiteral_2 = (Token) match(input, 19, FOLLOW_2); current = grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2()); @@ -1314,7 +1276,6 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleBehaviorKind" // Delegated rules @@ -1322,40 +1283,13 @@ public class InternalUmlStateParser extends AbstractInternalAntlrParser { - public static final BitSet FOLLOW_ruleStateRule_in_entryRuleStateRule75 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleStateRule85 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleStateRule127 = new BitSet(new long[] { 0x000000000001D002L }); - public static final BitSet FOLLOW_12_in_ruleStateRule145 = new BitSet(new long[] { 0x0000000000000010L }); - public static final BitSet FOLLOW_ruleSubmachineRule_in_ruleStateRule166 = new BitSet(new long[] { 0x000000000001C002L }); - public static final BitSet FOLLOW_ruleEntryRule_in_ruleStateRule234 = new BitSet(new long[] { 0x000000000001C002L }); - public static final BitSet FOLLOW_ruleDoRule_in_ruleStateRule309 = new BitSet(new long[] { 0x000000000001C002L }); - public static final BitSet FOLLOW_ruleExitRule_in_ruleStateRule384 = new BitSet(new long[] { 0x000000000001C002L }); - public static final BitSet FOLLOW_ruleSubmachineRule_in_entryRuleSubmachineRule460 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleSubmachineRule470 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleQualifiedName_in_ruleSubmachineRule516 = new BitSet(new long[] { 0x0000000000000010L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleSubmachineRule537 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName573 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName583 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName628 = new BitSet(new long[] { 0x0000000000002000L }); - public static final BitSet FOLLOW_13_in_ruleQualifiedName640 = new BitSet(new long[] { 0x0000000000000012L }); - public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName661 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleEntryRule_in_entryRuleEntryRule698 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleEntryRule708 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_14_in_ruleEntryRule745 = new BitSet(new long[] { 0x00000000000E0000L }); - public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleEntryRule766 = new BitSet(new long[] { 0x0000000000000010L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleEntryRule783 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleDoRule_in_entryRuleDoRule824 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleDoRule834 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_15_in_ruleDoRule871 = new BitSet(new long[] { 0x00000000000E0000L }); - public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleDoRule892 = new BitSet(new long[] { 0x0000000000000010L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleDoRule909 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_ruleExitRule_in_entryRuleExitRule950 = new BitSet(new long[] { 0x0000000000000000L }); - public static final BitSet FOLLOW_EOF_in_entryRuleExitRule960 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_16_in_ruleExitRule997 = new BitSet(new long[] { 0x00000000000E0000L }); - public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleExitRule1018 = new BitSet(new long[] { 0x0000000000000010L }); - public static final BitSet FOLLOW_RULE_ID_in_ruleExitRule1035 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_17_in_ruleBehaviorKind1090 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_18_in_ruleBehaviorKind1107 = new BitSet(new long[] { 0x0000000000000002L }); - public static final BitSet FOLLOW_19_in_ruleBehaviorKind1124 = 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[] { 0x000000000001D002L }); + public static final BitSet FOLLOW_4 = new BitSet(new long[] { 0x0000000000000010L }); + public static final BitSet FOLLOW_5 = new BitSet(new long[] { 0x000000000001C002L }); + public static final BitSet FOLLOW_6 = new BitSet(new long[] { 0x0000000000002000L }); + public static final BitSet FOLLOW_7 = new BitSet(new long[] { 0x0000000000000012L }); + public static final BitSet FOLLOW_8 = new BitSet(new long[] { 0x00000000000E0000L }); } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSemanticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSemanticSequencer.java index da104e33035..6d6a2e283ae 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSemanticSequencer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSemanticSequencer.java @@ -1,6 +1,12 @@ +/* + * generated by Xtext + */ package org.eclipse.papyrus.uml.textedit.state.xtext.serializer; +import java.util.Set; + import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.papyrus.uml.textedit.state.xtext.services.UmlStateGrammarAccess; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule; @@ -9,9 +15,12 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; +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.acceptor.SequenceFeeder; import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer; -import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider; import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient; import com.google.inject.Inject; @@ -23,73 +32,51 @@ public class UmlStateSemanticSequencer extends AbstractDelegatingSemanticSequenc private UmlStateGrammarAccess grammarAccess; @Override - public void createSequence(EObject context, EObject semanticObject) { - if (semanticObject.eClass().getEPackage() == UmlStatePackage.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 == UmlStatePackage.eINSTANCE) switch (semanticObject.eClass().getClassifierID()) { case UmlStatePackage.DO_RULE: - if (context == grammarAccess.getDoRuleRule()) { - sequence_DoRule(context, (DoRule) semanticObject); - return; - } else { - break; - } + sequence_DoRule(context, (DoRule) semanticObject); + return; case UmlStatePackage.ENTRY_RULE: - if (context == grammarAccess.getEntryRuleRule()) { - sequence_EntryRule(context, (EntryRule) semanticObject); - return; - } else { - break; - } + sequence_EntryRule(context, (EntryRule) semanticObject); + return; case UmlStatePackage.EXIT_RULE: - if (context == grammarAccess.getExitRuleRule()) { - sequence_ExitRule(context, (ExitRule) semanticObject); - return; - } else { - break; - } + sequence_ExitRule(context, (ExitRule) semanticObject); + return; case UmlStatePackage.QUALIFIED_NAME: - if (context == grammarAccess.getQualifiedNameRule()) { - sequence_QualifiedName(context, (QualifiedName) semanticObject); - return; - } else { - break; - } + sequence_QualifiedName(context, (QualifiedName) semanticObject); + return; case UmlStatePackage.STATE_RULE: - if (context == grammarAccess.getStateRuleRule()) { - sequence_StateRule(context, (StateRule) semanticObject); - return; - } else { - break; - } + sequence_StateRule(context, (StateRule) semanticObject); + return; case UmlStatePackage.SUBMACHINE_RULE: - if (context == grammarAccess.getSubmachineRuleRule()) { - sequence_SubmachineRule(context, (SubmachineRule) semanticObject); - return; - } else { - break; - } + sequence_SubmachineRule(context, (SubmachineRule) semanticObject); + return; } - } - if (errorAcceptor != null) { + if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context)); - } } /** + * Contexts: + * DoRule returns DoRule + * * Constraint: * (kind=BehaviorKind behaviorName=ID) */ - protected void sequence_DoRule(EObject context, DoRule semanticObject) { + protected void sequence_DoRule(ISerializationContext context, DoRule semanticObject) { if (errorAcceptor != null) { - if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.DO_RULE__KIND) == ValueTransient.YES) { + if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.DO_RULE__KIND) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlStatePackage.Literals.DO_RULE__KIND)); - } - if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.DO_RULE__BEHAVIOR_NAME) == ValueTransient.YES) { + if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.DO_RULE__BEHAVIOR_NAME) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlStatePackage.Literals.DO_RULE__BEHAVIOR_NAME)); - } } - INodesForEObjectProvider nodes = createNodeProvider(semanticObject); - SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes); + SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); feeder.accept(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), semanticObject.getKind()); feeder.accept(grammarAccess.getDoRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), semanticObject.getBehaviorName()); feeder.finish(); @@ -97,20 +84,20 @@ public class UmlStateSemanticSequencer extends AbstractDelegatingSemanticSequenc /** + * Contexts: + * EntryRule returns EntryRule + * * Constraint: * (kind=BehaviorKind behaviorName=ID) */ - protected void sequence_EntryRule(EObject context, EntryRule semanticObject) { + protected void sequence_EntryRule(ISerializationContext context, EntryRule semanticObject) { if (errorAcceptor != null) { - if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.ENTRY_RULE__KIND) == ValueTransient.YES) { + if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.ENTRY_RULE__KIND) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlStatePackage.Literals.ENTRY_RULE__KIND)); - } - if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.ENTRY_RULE__BEHAVIOR_NAME) == ValueTransient.YES) { + if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.ENTRY_RULE__BEHAVIOR_NAME) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlStatePackage.Literals.ENTRY_RULE__BEHAVIOR_NAME)); - } } - INodesForEObjectProvider nodes = createNodeProvider(semanticObject); - SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes); + SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); feeder.accept(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), semanticObject.getKind()); feeder.accept(grammarAccess.getEntryRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), semanticObject.getBehaviorName()); feeder.finish(); @@ -118,20 +105,20 @@ public class UmlStateSemanticSequencer extends AbstractDelegatingSemanticSequenc /** + * Contexts: + * ExitRule returns ExitRule + * * Constraint: * (kind=BehaviorKind behaviorName=ID) */ - protected void sequence_ExitRule(EObject context, ExitRule semanticObject) { + protected void sequence_ExitRule(ISerializationContext context, ExitRule semanticObject) { if (errorAcceptor != null) { - if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.EXIT_RULE__KIND) == ValueTransient.YES) { + if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.EXIT_RULE__KIND) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlStatePackage.Literals.EXIT_RULE__KIND)); - } - if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.EXIT_RULE__BEHAVIOR_NAME) == ValueTransient.YES) { + if (transientValues.isValueTransient(semanticObject, UmlStatePackage.Literals.EXIT_RULE__BEHAVIOR_NAME) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, UmlStatePackage.Literals.EXIT_RULE__BEHAVIOR_NAME)); - } } - INodesForEObjectProvider nodes = createNodeProvider(semanticObject); - SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes); + SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); feeder.accept(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), semanticObject.getKind()); feeder.accept(grammarAccess.getExitRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), semanticObject.getBehaviorName()); feeder.finish(); @@ -139,28 +126,39 @@ public class UmlStateSemanticSequencer extends AbstractDelegatingSemanticSequenc /** + * Contexts: + * QualifiedName returns QualifiedName + * * Constraint: * (path=[Namespace|ID] remaining=QualifiedName?) */ - protected void sequence_QualifiedName(EObject context, QualifiedName semanticObject) { + protected void sequence_QualifiedName(ISerializationContext context, QualifiedName semanticObject) { genericSequencer.createSequence(context, semanticObject); } /** + * Contexts: + * StateRule returns StateRule + * * Constraint: - * (name=ID submachine=SubmachineRule? entry=EntryRule? do=DoRule? exit=ExitRule?) + * (name=ID submachine=SubmachineRule? (entry=EntryRule | do=DoRule | exit=ExitRule)*) */ - protected void sequence_StateRule(EObject context, StateRule semanticObject) { + protected void sequence_StateRule(ISerializationContext context, StateRule semanticObject) { genericSequencer.createSequence(context, semanticObject); } /** + * Contexts: + * SubmachineRule returns SubmachineRule + * * Constraint: * (path=QualifiedName? submachine=[StateMachine|ID]) */ - protected void sequence_SubmachineRule(EObject context, SubmachineRule semanticObject) { + protected void sequence_SubmachineRule(ISerializationContext context, SubmachineRule semanticObject) { genericSequencer.createSequence(context, semanticObject); } + + } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSyntacticSequencer.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSyntacticSequencer.java index 510a1a865c9..2168762ac82 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSyntacticSequencer.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/serializer/UmlStateSyntacticSequencer.java @@ -1,3 +1,6 @@ +/* + * generated by Xtext + */ package org.eclipse.papyrus.uml.textedit.state.xtext.serializer; import java.util.List; @@ -31,9 +34,8 @@ public class UmlStateSyntacticSequencer 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.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/services/UmlStateGrammarAccess.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/services/UmlStateGrammarAccess.java index 927fa0fdd55..e9f51a03311 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/services/UmlStateGrammarAccess.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/services/UmlStateGrammarAccess.java @@ -19,6 +19,7 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.UnorderedGroup; +import org.eclipse.xtext.common.services.TerminalsGrammarAccess; import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; import org.eclipse.xtext.service.GrammarProvider; @@ -30,7 +31,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { public class StateRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StateRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.StateRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Assignment cNameAssignment_0 = (Assignment) cGroup.eContents().get(0); private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall) cNameAssignment_0.eContents().get(0); @@ -47,14 +48,13 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cExitExitRuleParserRuleCall_2_2_0 = (RuleCall) cExitAssignment_2_2.eContents().get(0); // StateRule: - // - // name=ID (":" submachine=SubmachineRule)? (entry=EntryRule? & do=DoRule? & exit=ExitRule?); + // name=ID (':' submachine=SubmachineRule)? (entry=EntryRule? & do=DoRule? & exit=ExitRule?); @Override public ParserRule getRule() { return rule; } - // name=ID (":" submachine=SubmachineRule)? (entry=EntryRule? & do=DoRule? & exit=ExitRule?) + // name=ID (':' submachine=SubmachineRule)? (entry=EntryRule? & do=DoRule? & exit=ExitRule?) public Group getGroup() { return cGroup; } @@ -69,12 +69,12 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { return cNameIDTerminalRuleCall_0_0; } - // (":" submachine=SubmachineRule)? + // (':' submachine=SubmachineRule)? public Group getGroup_1() { return cGroup_1; } - // ":" + // ':' public Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; } @@ -126,7 +126,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } public class SubmachineRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubmachineRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.SubmachineRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Assignment cPathAssignment_0 = (Assignment) cGroup.eContents().get(0); private final RuleCall cPathQualifiedNameParserRuleCall_0_0 = (RuleCall) cPathAssignment_0.eContents().get(0); @@ -135,7 +135,6 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSubmachineStateMachineIDTerminalRuleCall_1_0_1 = (RuleCall) cSubmachineStateMachineCrossReference_1_0.eContents().get(1); // SubmachineRule: - // // path=QualifiedName? submachine=[uml::StateMachine]; @Override public ParserRule getRule() { @@ -174,7 +173,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } public class QualifiedNameElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedName"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.QualifiedName"); private final Group cGroup = (Group) rule.eContents().get(1); private final Assignment cPathAssignment_0 = (Assignment) cGroup.eContents().get(0); private final CrossReference cPathNamespaceCrossReference_0_0 = (CrossReference) cPathAssignment_0.eContents().get(0); @@ -184,14 +183,13 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cRemainingQualifiedNameParserRuleCall_2_0 = (RuleCall) cRemainingAssignment_2.eContents().get(0); // QualifiedName: - // - // path=[uml::Namespace] "::" remaining=QualifiedName?; + // path=[uml::Namespace] '::' remaining=QualifiedName?; @Override public ParserRule getRule() { return rule; } - // path=[uml::Namespace] "::" remaining=QualifiedName? + // path=[uml::Namespace] '::' remaining=QualifiedName? public Group getGroup() { return cGroup; } @@ -211,7 +209,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { return cPathNamespaceIDTerminalRuleCall_0_0_1; } - // "::" + // '::' public Keyword getColonColonKeyword_1() { return cColonColonKeyword_1; } @@ -228,7 +226,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } public class EntryRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EntryRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.EntryRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Keyword cEntryKeyword_0 = (Keyword) cGroup.eContents().get(0); private final Assignment cKindAssignment_1 = (Assignment) cGroup.eContents().get(1); @@ -237,7 +235,6 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cBehaviorNameIDTerminalRuleCall_2_0 = (RuleCall) cBehaviorNameAssignment_2.eContents().get(0); // EntryRule: - // // "entry" kind=BehaviorKind behaviorName=ID; @Override public ParserRule getRule() { @@ -276,7 +273,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } public class DoRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DoRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.DoRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Keyword cDoKeyword_0 = (Keyword) cGroup.eContents().get(0); private final Assignment cKindAssignment_1 = (Assignment) cGroup.eContents().get(1); @@ -285,7 +282,6 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cBehaviorNameIDTerminalRuleCall_2_0 = (RuleCall) cBehaviorNameAssignment_2.eContents().get(0); // DoRule: - // // "do" kind=BehaviorKind behaviorName=ID; @Override public ParserRule getRule() { @@ -324,7 +320,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } public class ExitRuleElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ExitRule"); + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.ExitRule"); private final Group cGroup = (Group) rule.eContents().get(1); private final Keyword cExitKeyword_0 = (Keyword) cGroup.eContents().get(0); private final Assignment cKindAssignment_1 = (Assignment) cGroup.eContents().get(1); @@ -333,7 +329,6 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cBehaviorNameIDTerminalRuleCall_2_0 = (RuleCall) cBehaviorNameAssignment_2.eContents().get(0); // ExitRule: - // // "exit" kind=BehaviorKind behaviorName=ID; @Override public ParserRule getRule() { @@ -373,7 +368,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { public class BehaviorKindElements extends AbstractEnumRuleElementFinder { - private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "BehaviorKind"); + private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.papyrus.uml.textedit.state.xtext.UmlState.BehaviorKind"); private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1); private final EnumLiteralDeclaration cACTIVITYEnumLiteralDeclaration_0 = (EnumLiteralDeclaration) cAlternatives.eContents().get(0); private final Keyword cACTIVITYActivityKeyword_0_0 = (Keyword) cACTIVITYEnumLiteralDeclaration_0.eContents().get(0); @@ -383,9 +378,7 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cOPAQUE_BEHAVIOROpaqueBehaviorKeyword_2_0 = (Keyword) cOPAQUE_BEHAVIOREnumLiteralDeclaration_2.eContents().get(0); // enum BehaviorKind: - // // ACTIVITY="Activity" | STATE_MACHINE="StateMachine" | OPAQUE_BEHAVIOR="OpaqueBehavior"; - @Override public EnumRule getRule() { return rule; } @@ -426,23 +419,34 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } } - private StateRuleElements pStateRule; - private SubmachineRuleElements pSubmachineRule; - private QualifiedNameElements pQualifiedName; - private EntryRuleElements pEntryRule; - private DoRuleElements pDoRule; - private ExitRuleElements pExitRule; - private BehaviorKindElements unknownRuleBehaviorKind; + private final StateRuleElements pStateRule; + private final SubmachineRuleElements pSubmachineRule; + private final QualifiedNameElements pQualifiedName; + private final EntryRuleElements pEntryRule; + private final DoRuleElements pDoRule; + private final ExitRuleElements pExitRule; + private final BehaviorKindElements eBehaviorKind; private final Grammar grammar; - private CommonGrammarAccess gaCommon; + private final CommonGrammarAccess gaCommon; + + private final TerminalsGrammarAccess gaTerminals; @Inject public UmlStateGrammarAccess(GrammarProvider grammarProvider, - CommonGrammarAccess gaCommon) { + CommonGrammarAccess gaCommon, + TerminalsGrammarAccess gaTerminals) { this.grammar = internalFindGrammar(grammarProvider); this.gaCommon = gaCommon; + this.gaTerminals = gaTerminals; + this.pStateRule = new StateRuleElements(); + this.pSubmachineRule = new SubmachineRuleElements(); + this.pQualifiedName = new QualifiedNameElements(); + this.pEntryRule = new EntryRuleElements(); + this.pDoRule = new DoRuleElements(); + this.pExitRule = new ExitRuleElements(); + this.eBehaviorKind = new BehaviorKindElements(); } protected Grammar internalFindGrammar(GrammarProvider grammarProvider) { @@ -461,7 +465,6 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { return grammar; } - @Override public Grammar getGrammar() { return grammar; @@ -472,12 +475,15 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { return gaCommon; } + public TerminalsGrammarAccess getTerminalsGrammarAccess() { + return gaTerminals; + } + // StateRule: - // - // name=ID (":" submachine=SubmachineRule)? (entry=EntryRule? & do=DoRule? & exit=ExitRule?); + // name=ID (':' submachine=SubmachineRule)? (entry=EntryRule? & do=DoRule? & exit=ExitRule?); public StateRuleElements getStateRuleAccess() { - return (pStateRule != null) ? pStateRule : (pStateRule = new StateRuleElements()); + return pStateRule; } public ParserRule getStateRuleRule() { @@ -485,10 +491,9 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } // SubmachineRule: - // // path=QualifiedName? submachine=[uml::StateMachine]; public SubmachineRuleElements getSubmachineRuleAccess() { - return (pSubmachineRule != null) ? pSubmachineRule : (pSubmachineRule = new SubmachineRuleElements()); + return pSubmachineRule; } public ParserRule getSubmachineRuleRule() { @@ -496,10 +501,9 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } // QualifiedName: - // - // path=[uml::Namespace] "::" remaining=QualifiedName?; + // path=[uml::Namespace] '::' remaining=QualifiedName?; public QualifiedNameElements getQualifiedNameAccess() { - return (pQualifiedName != null) ? pQualifiedName : (pQualifiedName = new QualifiedNameElements()); + return pQualifiedName; } public ParserRule getQualifiedNameRule() { @@ -507,10 +511,9 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } // EntryRule: - // // "entry" kind=BehaviorKind behaviorName=ID; public EntryRuleElements getEntryRuleAccess() { - return (pEntryRule != null) ? pEntryRule : (pEntryRule = new EntryRuleElements()); + return pEntryRule; } public ParserRule getEntryRuleRule() { @@ -518,10 +521,9 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } // DoRule: - // // "do" kind=BehaviorKind behaviorName=ID; public DoRuleElements getDoRuleAccess() { - return (pDoRule != null) ? pDoRule : (pDoRule = new DoRuleElements()); + return pDoRule; } public ParserRule getDoRuleRule() { @@ -529,10 +531,9 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } // ExitRule: - // // "exit" kind=BehaviorKind behaviorName=ID; public ExitRuleElements getExitRuleAccess() { - return (pExitRule != null) ? pExitRule : (pExitRule = new ExitRuleElements()); + return pExitRule; } public ParserRule getExitRuleRule() { @@ -540,91 +541,61 @@ public class UmlStateGrammarAccess extends AbstractGrammarElementFinder { } // enum BehaviorKind: - // // ACTIVITY="Activity" | STATE_MACHINE="StateMachine" | OPAQUE_BEHAVIOR="OpaqueBehavior"; public BehaviorKindElements getBehaviorKindAccess() { - return (unknownRuleBehaviorKind != null) ? unknownRuleBehaviorKind : (unknownRuleBehaviorKind = new BehaviorKindElements()); + return eBehaviorKind; } public EnumRule getBehaviorKindRule() { return getBehaviorKindAccess().getRule(); } - // 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")*; - public TerminalRule getINTEGER_VALUERule() { - return gaCommon.getINTEGER_VALUERule(); - } - // 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 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 SL_COMMENT: - // - // "//" !("\n" | "\r" | "@")* ("\r"? "\n")?; + // terminal SL_COMMENT: + // '//' !('\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 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.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/BehaviorKind.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/BehaviorKind.java index 14efa851f21..1a1f8816991 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/BehaviorKind.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/BehaviorKind.java @@ -13,18 +13,17 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Behavior Kind</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getBehaviorKind() * @model * @generated */ -public enum BehaviorKind implements Enumerator -{ +public enum BehaviorKind implements Enumerator { /** * The '<em><b>ACTIVITY</b></em>' literal object. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #ACTIVITY_VALUE * @generated * @ordered @@ -35,7 +34,7 @@ public enum BehaviorKind implements Enumerator * The '<em><b>STATE MACHINE</b></em>' literal object. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #STATE_MACHINE_VALUE * @generated * @ordered @@ -46,7 +45,7 @@ public enum BehaviorKind implements Enumerator * The '<em><b>OPAQUE BEHAVIOR</b></em>' literal object. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #OPAQUE_BEHAVIOR_VALUE * @generated * @ordered @@ -57,10 +56,11 @@ public enum BehaviorKind implements Enumerator * The '<em><b>ACTIVITY</b></em>' literal value. * <!-- begin-user-doc --> * <p> - * If the meaning of '<em><b>ACTIVITY</b></em>' literal object isn't clear, there really should be more of a description here... + * If the meaning of '<em><b>ACTIVITY</b></em>' literal object isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @see #ACTIVITY * @model literal="Activity" * @generated @@ -72,10 +72,11 @@ public enum BehaviorKind implements Enumerator * The '<em><b>STATE MACHINE</b></em>' literal value. * <!-- begin-user-doc --> * <p> - * If the meaning of '<em><b>STATE MACHINE</b></em>' literal object isn't clear, there really should be more of a description here... + * If the meaning of '<em><b>STATE MACHINE</b></em>' literal object isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @see #STATE_MACHINE * @model literal="StateMachine" * @generated @@ -87,10 +88,11 @@ public enum BehaviorKind implements Enumerator * The '<em><b>OPAQUE BEHAVIOR</b></em>' literal value. * <!-- begin-user-doc --> * <p> - * If the meaning of '<em><b>OPAQUE BEHAVIOR</b></em>' literal object isn't clear, there really should be more of a description here... + * If the meaning of '<em><b>OPAQUE BEHAVIOR</b></em>' literal object isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @see #OPAQUE_BEHAVIOR * @model literal="OpaqueBehavior" * @generated @@ -102,22 +104,20 @@ public enum BehaviorKind implements Enumerator * An array of all the '<em><b>Behavior Kind</b></em>' enumerators. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - private static final BehaviorKind[] VALUES_ARRAY = - new BehaviorKind[] - { - ACTIVITY, - STATE_MACHINE, - OPAQUE_BEHAVIOR, - }; + private static final BehaviorKind[] VALUES_ARRAY = new BehaviorKind[] { + ACTIVITY, + STATE_MACHINE, + OPAQUE_BEHAVIOR, + }; /** * A public read-only list of all the '<em><b>Behavior Kind</b></em>' enumerators. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ public static final List<BehaviorKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); @@ -126,16 +126,16 @@ public enum BehaviorKind implements Enumerator * Returns the '<em><b>Behavior Kind</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * + * @param literal + * the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ - public static BehaviorKind get(String literal) - { - for (int i = 0; i < VALUES_ARRAY.length; ++i) - { + public static BehaviorKind get(String literal) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { BehaviorKind result = VALUES_ARRAY[i]; - if (result.toString().equals(literal)) - { + if (result.toString().equals(literal)) { return result; } } @@ -146,16 +146,16 @@ public enum BehaviorKind implements Enumerator * Returns the '<em><b>Behavior Kind</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * + * @param name + * the name. + * @return the matching enumerator or <code>null</code>. * @generated */ - public static BehaviorKind getByName(String name) - { - for (int i = 0; i < VALUES_ARRAY.length; ++i) - { + public static BehaviorKind getByName(String name) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { BehaviorKind result = VALUES_ARRAY[i]; - if (result.getName().equals(name)) - { + if (result.getName().equals(name)) { return result; } } @@ -166,13 +166,14 @@ public enum BehaviorKind implements Enumerator * Returns the '<em><b>Behavior Kind</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * + * @param value + * the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ - public static BehaviorKind get(int value) - { - switch (value) - { + public static BehaviorKind get(int value) { + switch (value) { case ACTIVITY_VALUE: return ACTIVITY; case STATE_MACHINE_VALUE: @@ -186,7 +187,7 @@ public enum BehaviorKind implements Enumerator /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private final int value; @@ -194,7 +195,7 @@ public enum BehaviorKind implements Enumerator /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private final String name; @@ -202,7 +203,7 @@ public enum BehaviorKind implements Enumerator /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private final String literal; @@ -211,11 +212,10 @@ public enum BehaviorKind implements Enumerator * Only this class can construct instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - private BehaviorKind(int value, String name, String literal) - { + private BehaviorKind(int value, String name, String literal) { this.value = value; this.name = name; this.literal = literal; @@ -224,36 +224,30 @@ public enum BehaviorKind implements Enumerator /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public int getValue() - { + public int getValue() { return value; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public String getName() - { + public String getName() { return name; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public String getLiteral() - { + public String getLiteral() { return literal; } @@ -261,12 +255,11 @@ public enum BehaviorKind implements Enumerator * Returns the literal value of the enumerator, which is its string representation. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public String toString() - { + public String toString() { return literal; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/DoRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/DoRule.java index bbc25c03555..d735e2477bb 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/DoRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/DoRule.java @@ -11,27 +11,27 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getBehaviorName <em>Behavior Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getDoRule() * @model * @generated */ -public interface DoRule extends EObject -{ +public interface DoRule extends EObject { /** * Returns the value of the '<em><b>Kind</b></em>' attribute. * The literals are from the enumeration {@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Kind</em>' attribute isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Kind</em>' attribute. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind * @see #setKind(BehaviorKind) @@ -45,7 +45,7 @@ public interface DoRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getKind <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Kind</em>' attribute. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind @@ -58,10 +58,11 @@ public interface DoRule extends EObject * Returns the value of the '<em><b>Behavior Name</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Behavior Name</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Behavior Name</em>' attribute isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Behavior Name</em>' attribute. * @see #setBehaviorName(String) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getDoRule_BehaviorName() @@ -74,7 +75,7 @@ public interface DoRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getBehaviorName <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Behavior Name</em>' attribute. * @see #getBehaviorName() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/EntryRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/EntryRule.java index 36c778feb3e..640dbe955cd 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/EntryRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/EntryRule.java @@ -11,27 +11,27 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getBehaviorName <em>Behavior Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getEntryRule() * @model * @generated */ -public interface EntryRule extends EObject -{ +public interface EntryRule extends EObject { /** * Returns the value of the '<em><b>Kind</b></em>' attribute. * The literals are from the enumeration {@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Kind</em>' attribute isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Kind</em>' attribute. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind * @see #setKind(BehaviorKind) @@ -45,7 +45,7 @@ public interface EntryRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getKind <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Kind</em>' attribute. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind @@ -58,10 +58,11 @@ public interface EntryRule extends EObject * Returns the value of the '<em><b>Behavior Name</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Behavior Name</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Behavior Name</em>' attribute isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Behavior Name</em>' attribute. * @see #setBehaviorName(String) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getEntryRule_BehaviorName() @@ -74,7 +75,7 @@ public interface EntryRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getBehaviorName <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Behavior Name</em>' attribute. * @see #getBehaviorName() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/ExitRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/ExitRule.java index 67fabb4d2bd..44b243ff717 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/ExitRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/ExitRule.java @@ -11,27 +11,27 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getBehaviorName <em>Behavior Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getExitRule() * @model * @generated */ -public interface ExitRule extends EObject -{ +public interface ExitRule extends EObject { /** * Returns the value of the '<em><b>Kind</b></em>' attribute. * The literals are from the enumeration {@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Kind</em>' attribute isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Kind</em>' attribute. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind * @see #setKind(BehaviorKind) @@ -45,7 +45,7 @@ public interface ExitRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getKind <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Kind</em>' attribute. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind @@ -58,10 +58,11 @@ public interface ExitRule extends EObject * Returns the value of the '<em><b>Behavior Name</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Behavior Name</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Behavior Name</em>' attribute isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Behavior Name</em>' attribute. * @see #setBehaviorName(String) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getExitRule_BehaviorName() @@ -74,7 +75,7 @@ public interface ExitRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getBehaviorName <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Behavior Name</em>' attribute. * @see #getBehaviorName() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/QualifiedName.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/QualifiedName.java index 8f6caf310b8..2d124386bf0 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/QualifiedName.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/QualifiedName.java @@ -12,26 +12,26 @@ import org.eclipse.uml2.uml.Namespace; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getRemaining <em>Remaining</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getQualifiedName() * @model * @generated */ -public interface QualifiedName extends EObject -{ +public interface QualifiedName extends EObject { /** * Returns the value of the '<em><b>Path</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Path</em>' reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Path</em>' reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Path</em>' reference. * @see #setPath(Namespace) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getQualifiedName_Path() @@ -44,7 +44,7 @@ public interface QualifiedName extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getPath <em>Path</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Path</em>' reference. * @see #getPath() @@ -56,10 +56,11 @@ public interface QualifiedName extends EObject * Returns the value of the '<em><b>Remaining</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Remaining</em>' containment reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Remaining</em>' containment reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Remaining</em>' containment reference. * @see #setRemaining(QualifiedName) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getQualifiedName_Remaining() @@ -72,7 +73,7 @@ public interface QualifiedName extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getRemaining <em>Remaining</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Remaining</em>' containment reference. * @see #getRemaining() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/StateRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/StateRule.java index fef57b2a79b..77a760c1d4c 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/StateRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/StateRule.java @@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getName <em>Name</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getSubmachine <em>Submachine</em>}</li> @@ -18,22 +19,21 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getDo <em>Do</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getExit <em>Exit</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getStateRule() * @model * @generated */ -public interface StateRule extends EObject -{ +public interface StateRule extends EObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Name</em>' attribute isn't clear, + * 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.state.xtext.umlState.UmlStatePackage#getStateRule_Name() @@ -46,7 +46,7 @@ public interface StateRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Name</em>' attribute. * @see #getName() @@ -58,10 +58,11 @@ public interface StateRule extends EObject * Returns the value of the '<em><b>Submachine</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Submachine</em>' containment reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Submachine</em>' containment reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Submachine</em>' containment reference. * @see #setSubmachine(SubmachineRule) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getStateRule_Submachine() @@ -74,7 +75,7 @@ public interface StateRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getSubmachine <em>Submachine</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Submachine</em>' containment reference. * @see #getSubmachine() @@ -86,10 +87,11 @@ public interface StateRule extends EObject * Returns the value of the '<em><b>Entry</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Entry</em>' containment reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Entry</em>' containment reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Entry</em>' containment reference. * @see #setEntry(EntryRule) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getStateRule_Entry() @@ -102,7 +104,7 @@ public interface StateRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getEntry <em>Entry</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Entry</em>' containment reference. * @see #getEntry() @@ -114,10 +116,11 @@ public interface StateRule extends EObject * Returns the value of the '<em><b>Do</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Do</em>' containment reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Do</em>' containment reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Do</em>' containment reference. * @see #setDo(DoRule) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getStateRule_Do() @@ -130,7 +133,7 @@ public interface StateRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getDo <em>Do</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Do</em>' containment reference. * @see #getDo() @@ -142,10 +145,11 @@ public interface StateRule extends EObject * Returns the value of the '<em><b>Exit</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Exit</em>' containment reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Exit</em>' containment reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Exit</em>' containment reference. * @see #setExit(ExitRule) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getStateRule_Exit() @@ -158,7 +162,7 @@ public interface StateRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getExit <em>Exit</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Exit</em>' containment reference. * @see #getExit() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/SubmachineRule.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/SubmachineRule.java index b0415863028..2cde1950585 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/SubmachineRule.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/SubmachineRule.java @@ -12,26 +12,26 @@ import org.eclipse.uml2.uml.StateMachine; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getSubmachine <em>Submachine</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getSubmachineRule() * @model * @generated */ -public interface SubmachineRule extends EObject -{ +public interface SubmachineRule extends EObject { /** * Returns the value of the '<em><b>Path</b></em>' containment reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Path</em>' containment reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Path</em>' containment reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Path</em>' containment reference. * @see #setPath(QualifiedName) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getSubmachineRule_Path() @@ -44,7 +44,7 @@ public interface SubmachineRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getPath <em>Path</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Path</em>' containment reference. * @see #getPath() @@ -56,10 +56,11 @@ public interface SubmachineRule extends EObject * Returns the value of the '<em><b>Submachine</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Submachine</em>' reference isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Submachine</em>' reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Submachine</em>' reference. * @see #setSubmachine(StateMachine) * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage#getSubmachineRule_Submachine() @@ -72,7 +73,7 @@ public interface SubmachineRule extends EObject * Sets the value of the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getSubmachine <em>Submachine</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Submachine</em>' reference. * @see #getSubmachine() diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStateFactory.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStateFactory.java index bf2e1efba85..dccedb66669 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStateFactory.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStateFactory.java @@ -9,17 +9,16 @@ 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.state.xtext.umlState.UmlStatePackage * @generated */ -public interface UmlStateFactory extends EFactory -{ +public interface UmlStateFactory extends EFactory { /** * The singleton instance of the factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ UmlStateFactory eINSTANCE = org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStateFactoryImpl.init(); @@ -28,7 +27,7 @@ public interface UmlStateFactory extends EFactory * Returns a new object of class '<em>State Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>State Rule</em>'. * @generated */ @@ -38,7 +37,7 @@ public interface UmlStateFactory extends EFactory * Returns a new object of class '<em>Submachine Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Submachine Rule</em>'. * @generated */ @@ -48,7 +47,7 @@ public interface UmlStateFactory extends EFactory * Returns a new object of class '<em>Qualified Name</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Qualified Name</em>'. * @generated */ @@ -58,7 +57,7 @@ public interface UmlStateFactory extends EFactory * Returns a new object of class '<em>Entry Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Entry Rule</em>'. * @generated */ @@ -68,7 +67,7 @@ public interface UmlStateFactory extends EFactory * Returns a new object of class '<em>Do Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Do Rule</em>'. * @generated */ @@ -78,7 +77,7 @@ public interface UmlStateFactory extends EFactory * Returns a new object of class '<em>Exit Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return a new object of class '<em>Exit Rule</em>'. * @generated */ @@ -88,7 +87,7 @@ public interface UmlStateFactory 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.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStatePackage.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStatePackage.java index cbaed6d397a..c09d40d177f 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStatePackage.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/UmlStatePackage.java @@ -19,18 +19,17 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStateFactory * @model kind="package" * @generated */ -public interface UmlStatePackage extends EPackage -{ +public interface UmlStatePackage extends EPackage { /** * The package name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNAME = "umlState"; @@ -39,7 +38,7 @@ public interface UmlStatePackage extends EPackage * The package namespace URI. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNS_URI = "http://www.eclipse.org/papyrus/uml/textedit/state/xtext/UmlState"; @@ -48,7 +47,7 @@ public interface UmlStatePackage extends EPackage * The package namespace name. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ String eNS_PREFIX = "umlState"; @@ -57,7 +56,7 @@ public interface UmlStatePackage extends EPackage * The singleton instance of the package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ UmlStatePackage eINSTANCE = org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl.init(); @@ -66,7 +65,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl <em>State Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getStateRule() * @generated @@ -77,7 +76,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -87,7 +86,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Submachine</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -97,7 +96,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Entry</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -107,7 +106,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Do</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -117,7 +116,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Exit</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -127,7 +126,7 @@ public interface UmlStatePackage extends EPackage * The number of structural features of the '<em>State Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -137,7 +136,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.SubmachineRuleImpl <em>Submachine Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.SubmachineRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getSubmachineRule() * @generated @@ -148,7 +147,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Path</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -158,7 +157,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Submachine</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -168,7 +167,7 @@ public interface UmlStatePackage extends EPackage * The number of structural features of the '<em>Submachine Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -178,7 +177,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.QualifiedNameImpl <em>Qualified Name</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.QualifiedNameImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getQualifiedName() * @generated @@ -189,7 +188,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Path</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -199,7 +198,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Remaining</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -209,7 +208,7 @@ public interface UmlStatePackage extends EPackage * The number of structural features of the '<em>Qualified Name</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -219,7 +218,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.EntryRuleImpl <em>Entry Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.EntryRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getEntryRule() * @generated @@ -230,7 +229,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Kind</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -240,7 +239,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Behavior Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -250,7 +249,7 @@ public interface UmlStatePackage extends EPackage * The number of structural features of the '<em>Entry Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -260,7 +259,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.DoRuleImpl <em>Do Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.DoRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getDoRule() * @generated @@ -271,7 +270,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Kind</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -281,7 +280,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Behavior Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -291,7 +290,7 @@ public interface UmlStatePackage extends EPackage * The number of structural features of the '<em>Do Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -301,7 +300,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.ExitRuleImpl <em>Exit Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.ExitRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getExitRule() * @generated @@ -312,7 +311,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Kind</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -322,7 +321,7 @@ public interface UmlStatePackage extends EPackage * The feature id for the '<em><b>Behavior Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -332,7 +331,7 @@ public interface UmlStatePackage extends EPackage * The number of structural features of the '<em>Exit Rule</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -342,7 +341,7 @@ public interface UmlStatePackage extends EPackage * The meta object id for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind <em>Behavior Kind</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getBehaviorKind() * @generated @@ -354,7 +353,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule <em>State Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>State Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule * @generated @@ -365,7 +364,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#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.state.xtext.umlState.StateRule#getName() * @see #getStateRule() @@ -377,7 +376,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getSubmachine <em>Submachine</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Submachine</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getSubmachine() * @see #getStateRule() @@ -389,7 +388,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getEntry <em>Entry</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Entry</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getEntry() * @see #getStateRule() @@ -401,7 +400,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getDo <em>Do</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Do</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getDo() * @see #getStateRule() @@ -413,7 +412,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getExit <em>Exit</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Exit</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule#getExit() * @see #getStateRule() @@ -425,7 +424,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule <em>Submachine Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Submachine Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule * @generated @@ -436,7 +435,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getPath <em>Path</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Path</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getPath() * @see #getSubmachineRule() @@ -448,7 +447,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getSubmachine <em>Submachine</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>Submachine</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule#getSubmachine() * @see #getSubmachineRule() @@ -460,7 +459,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName <em>Qualified Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Qualified Name</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName * @generated @@ -471,7 +470,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getPath <em>Path</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>Path</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getPath() * @see #getQualifiedName() @@ -483,7 +482,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getRemaining <em>Remaining</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Remaining</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.QualifiedName#getRemaining() * @see #getQualifiedName() @@ -495,7 +494,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule <em>Entry Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Entry Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule * @generated @@ -506,7 +505,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getKind <em>Kind</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Kind</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getKind() * @see #getEntryRule() @@ -518,7 +517,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getBehaviorName <em>Behavior Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Behavior Name</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.EntryRule#getBehaviorName() * @see #getEntryRule() @@ -530,7 +529,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule <em>Do Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Do Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule * @generated @@ -541,7 +540,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getKind <em>Kind</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Kind</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getKind() * @see #getDoRule() @@ -553,7 +552,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getBehaviorName <em>Behavior Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Behavior Name</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.DoRule#getBehaviorName() * @see #getDoRule() @@ -565,7 +564,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for class '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule <em>Exit Rule</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Exit Rule</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule * @generated @@ -576,7 +575,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getKind <em>Kind</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Kind</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getKind() * @see #getExitRule() @@ -588,7 +587,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getBehaviorName <em>Behavior Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Behavior Name</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.ExitRule#getBehaviorName() * @see #getExitRule() @@ -600,7 +599,7 @@ public interface UmlStatePackage extends EPackage * Returns the meta object for enum '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind <em>Behavior Kind</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @return the meta object for enum '<em>Behavior Kind</em>'. * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind * @generated @@ -611,7 +610,7 @@ public interface UmlStatePackage 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 */ @@ -627,16 +626,15 @@ public interface UmlStatePackage extends EPackage * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * + * * @generated */ - interface Literals - { + interface Literals { /** * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl <em>State Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getStateRule() * @generated @@ -647,7 +645,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute STATE_RULE__NAME = eINSTANCE.getStateRule_Name(); @@ -656,7 +654,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Submachine</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference STATE_RULE__SUBMACHINE = eINSTANCE.getStateRule_Submachine(); @@ -665,7 +663,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Entry</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference STATE_RULE__ENTRY = eINSTANCE.getStateRule_Entry(); @@ -674,7 +672,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Do</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference STATE_RULE__DO = eINSTANCE.getStateRule_Do(); @@ -683,7 +681,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Exit</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference STATE_RULE__EXIT = eINSTANCE.getStateRule_Exit(); @@ -692,7 +690,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.SubmachineRuleImpl <em>Submachine Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.SubmachineRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getSubmachineRule() * @generated @@ -703,7 +701,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Path</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference SUBMACHINE_RULE__PATH = eINSTANCE.getSubmachineRule_Path(); @@ -712,7 +710,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Submachine</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference SUBMACHINE_RULE__SUBMACHINE = eINSTANCE.getSubmachineRule_Submachine(); @@ -721,7 +719,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.QualifiedNameImpl <em>Qualified Name</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.QualifiedNameImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getQualifiedName() * @generated @@ -732,7 +730,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Path</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference QUALIFIED_NAME__PATH = eINSTANCE.getQualifiedName_Path(); @@ -741,7 +739,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Remaining</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EReference QUALIFIED_NAME__REMAINING = eINSTANCE.getQualifiedName_Remaining(); @@ -750,7 +748,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.EntryRuleImpl <em>Entry Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.EntryRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getEntryRule() * @generated @@ -761,7 +759,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute ENTRY_RULE__KIND = eINSTANCE.getEntryRule_Kind(); @@ -770,7 +768,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Behavior Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute ENTRY_RULE__BEHAVIOR_NAME = eINSTANCE.getEntryRule_BehaviorName(); @@ -779,7 +777,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.DoRuleImpl <em>Do Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.DoRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getDoRule() * @generated @@ -790,7 +788,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute DO_RULE__KIND = eINSTANCE.getDoRule_Kind(); @@ -799,7 +797,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Behavior Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute DO_RULE__BEHAVIOR_NAME = eINSTANCE.getDoRule_BehaviorName(); @@ -808,7 +806,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.ExitRuleImpl <em>Exit Rule</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.ExitRuleImpl * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getExitRule() * @generated @@ -819,7 +817,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute EXIT_RULE__KIND = eINSTANCE.getExitRule_Kind(); @@ -828,7 +826,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '<em><b>Behavior Name</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ EAttribute EXIT_RULE__BEHAVIOR_NAME = eINSTANCE.getExitRule_BehaviorName(); @@ -837,7 +835,7 @@ public interface UmlStatePackage extends EPackage * The meta object literal for the '{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind <em>Behavior Kind</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.BehaviorKind * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.UmlStatePackageImpl#getBehaviorKind() * @generated diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/DoRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/DoRuleImpl.java index 6ac2a3e9a79..656f79d357f 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/DoRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/DoRuleImpl.java @@ -16,21 +16,20 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.DoRuleImpl#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.DoRuleImpl#getBehaviorName <em>Behavior Name</em>}</li> * </ul> - * </p> * * @generated */ -public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule -{ +public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule { /** * The default value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getKind() * @generated * @ordered @@ -41,7 +40,7 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getKind() * @generated * @ordered @@ -52,7 +51,7 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule * The default value of the '{@link #getBehaviorName() <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getBehaviorName() * @generated * @ordered @@ -63,7 +62,7 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule * The cached value of the '{@link #getBehaviorName() <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getBehaviorName() * @generated * @ordered @@ -73,93 +72,79 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected DoRuleImpl() - { + protected DoRuleImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UmlStatePackage.Literals.DO_RULE; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public BehaviorKind getKind() - { + public BehaviorKind getKind() { return kind; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setKind(BehaviorKind newKind) - { + public void setKind(BehaviorKind newKind) { BehaviorKind oldKind = kind; kind = newKind == null ? KIND_EDEFAULT : newKind; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.DO_RULE__KIND, oldKind, kind)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public String getBehaviorName() - { + public String getBehaviorName() { return behaviorName; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setBehaviorName(String newBehaviorName) - { + public void setBehaviorName(String newBehaviorName) { String oldBehaviorName = behaviorName; behaviorName = newBehaviorName; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.DO_RULE__BEHAVIOR_NAME, oldBehaviorName, behaviorName)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UmlStatePackage.DO_RULE__KIND: return getKind(); case UmlStatePackage.DO_RULE__BEHAVIOR_NAME: @@ -171,14 +156,12 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UmlStatePackage.DO_RULE__KIND: setKind((BehaviorKind) newValue); return; @@ -192,14 +175,12 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UmlStatePackage.DO_RULE__KIND: setKind(KIND_EDEFAULT); return; @@ -213,14 +194,12 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UmlStatePackage.DO_RULE__KIND: return kind != KIND_EDEFAULT; case UmlStatePackage.DO_RULE__BEHAVIOR_NAME: @@ -232,17 +211,15 @@ public class DoRuleImpl extends MinimalEObjectImpl.Container implements DoRule /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public String toString() - { - if (eIsProxy()) { + public String toString() { + if (eIsProxy()) return super.toString(); - } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (kind: "); result.append(kind); result.append(", behaviorName: "); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/EntryRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/EntryRuleImpl.java index 34bf3be55e1..fc3a191138b 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/EntryRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/EntryRuleImpl.java @@ -16,21 +16,20 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.EntryRuleImpl#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.EntryRuleImpl#getBehaviorName <em>Behavior Name</em>}</li> * </ul> - * </p> * * @generated */ -public class EntryRuleImpl extends MinimalEObjectImpl.Container implements EntryRule -{ +public class EntryRuleImpl extends MinimalEObjectImpl.Container implements EntryRule { /** * The default value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getKind() * @generated * @ordered @@ -41,7 +40,7 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getKind() * @generated * @ordered @@ -52,7 +51,7 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry * The default value of the '{@link #getBehaviorName() <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getBehaviorName() * @generated * @ordered @@ -63,7 +62,7 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry * The cached value of the '{@link #getBehaviorName() <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getBehaviorName() * @generated * @ordered @@ -73,93 +72,79 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected EntryRuleImpl() - { + protected EntryRuleImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UmlStatePackage.Literals.ENTRY_RULE; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public BehaviorKind getKind() - { + public BehaviorKind getKind() { return kind; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setKind(BehaviorKind newKind) - { + public void setKind(BehaviorKind newKind) { BehaviorKind oldKind = kind; kind = newKind == null ? KIND_EDEFAULT : newKind; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.ENTRY_RULE__KIND, oldKind, kind)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public String getBehaviorName() - { + public String getBehaviorName() { return behaviorName; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setBehaviorName(String newBehaviorName) - { + public void setBehaviorName(String newBehaviorName) { String oldBehaviorName = behaviorName; behaviorName = newBehaviorName; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.ENTRY_RULE__BEHAVIOR_NAME, oldBehaviorName, behaviorName)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UmlStatePackage.ENTRY_RULE__KIND: return getKind(); case UmlStatePackage.ENTRY_RULE__BEHAVIOR_NAME: @@ -171,14 +156,12 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UmlStatePackage.ENTRY_RULE__KIND: setKind((BehaviorKind) newValue); return; @@ -192,14 +175,12 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UmlStatePackage.ENTRY_RULE__KIND: setKind(KIND_EDEFAULT); return; @@ -213,14 +194,12 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UmlStatePackage.ENTRY_RULE__KIND: return kind != KIND_EDEFAULT; case UmlStatePackage.ENTRY_RULE__BEHAVIOR_NAME: @@ -232,17 +211,15 @@ public class EntryRuleImpl extends MinimalEObjectImpl.Container implements Entry /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public String toString() - { - if (eIsProxy()) { + public String toString() { + if (eIsProxy()) return super.toString(); - } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (kind: "); result.append(kind); result.append(", behaviorName: "); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/ExitRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/ExitRuleImpl.java index 224347465ad..8198710189c 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/ExitRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/ExitRuleImpl.java @@ -16,21 +16,20 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.ExitRuleImpl#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.ExitRuleImpl#getBehaviorName <em>Behavior Name</em>}</li> * </ul> - * </p> * * @generated */ -public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRule -{ +public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRule { /** * The default value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getKind() * @generated * @ordered @@ -41,7 +40,7 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getKind() * @generated * @ordered @@ -52,7 +51,7 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu * The default value of the '{@link #getBehaviorName() <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getBehaviorName() * @generated * @ordered @@ -63,7 +62,7 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu * The cached value of the '{@link #getBehaviorName() <em>Behavior Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getBehaviorName() * @generated * @ordered @@ -73,93 +72,79 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected ExitRuleImpl() - { + protected ExitRuleImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UmlStatePackage.Literals.EXIT_RULE; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public BehaviorKind getKind() - { + public BehaviorKind getKind() { return kind; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setKind(BehaviorKind newKind) - { + public void setKind(BehaviorKind newKind) { BehaviorKind oldKind = kind; kind = newKind == null ? KIND_EDEFAULT : newKind; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.EXIT_RULE__KIND, oldKind, kind)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public String getBehaviorName() - { + public String getBehaviorName() { return behaviorName; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setBehaviorName(String newBehaviorName) - { + public void setBehaviorName(String newBehaviorName) { String oldBehaviorName = behaviorName; behaviorName = newBehaviorName; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.EXIT_RULE__BEHAVIOR_NAME, oldBehaviorName, behaviorName)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UmlStatePackage.EXIT_RULE__KIND: return getKind(); case UmlStatePackage.EXIT_RULE__BEHAVIOR_NAME: @@ -171,14 +156,12 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UmlStatePackage.EXIT_RULE__KIND: setKind((BehaviorKind) newValue); return; @@ -192,14 +175,12 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UmlStatePackage.EXIT_RULE__KIND: setKind(KIND_EDEFAULT); return; @@ -213,14 +194,12 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UmlStatePackage.EXIT_RULE__KIND: return kind != KIND_EDEFAULT; case UmlStatePackage.EXIT_RULE__BEHAVIOR_NAME: @@ -232,17 +211,15 @@ public class ExitRuleImpl extends MinimalEObjectImpl.Container implements ExitRu /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public String toString() - { - if (eIsProxy()) { + public String toString() { + if (eIsProxy()) return super.toString(); - } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (kind: "); result.append(kind); result.append(", behaviorName: "); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/QualifiedNameImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/QualifiedNameImpl.java index a66c23e0b10..01625a8d068 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/QualifiedNameImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/QualifiedNameImpl.java @@ -18,21 +18,20 @@ import org.eclipse.uml2.uml.Namespace; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.QualifiedNameImpl#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.QualifiedNameImpl#getRemaining <em>Remaining</em>}</li> * </ul> - * </p> * * @generated */ -public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements QualifiedName -{ +public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements QualifiedName { /** * The cached value of the '{@link #getPath() <em>Path</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getPath() * @generated * @ordered @@ -43,7 +42,7 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q * The cached value of the '{@link #getRemaining() <em>Remaining</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getRemaining() * @generated * @ordered @@ -53,44 +52,37 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected QualifiedNameImpl() - { + protected QualifiedNameImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UmlStatePackage.Literals.QUALIFIED_NAME; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public Namespace getPath() - { - if (path != null && path.eIsProxy()) - { + public Namespace getPath() { + if (path != null && path.eIsProxy()) { InternalEObject oldPath = (InternalEObject) path; path = (Namespace) eResolveProxy(oldPath); - if (path != oldPath) - { - if (eNotificationRequired()) { + if (path != oldPath) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlStatePackage.QUALIFIED_NAME__PATH, oldPath, path)); - } } } return path; @@ -99,60 +91,51 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public Namespace basicGetPath() - { + public Namespace basicGetPath() { return path; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setPath(Namespace newPath) - { + public void setPath(Namespace newPath) { Namespace oldPath = path; path = newPath; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.QUALIFIED_NAME__PATH, oldPath, path)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public QualifiedName getRemaining() - { + public QualifiedName getRemaining() { return remaining; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public NotificationChain basicSetRemaining(QualifiedName newRemaining, NotificationChain msgs) - { + public NotificationChain basicSetRemaining(QualifiedName newRemaining, NotificationChain msgs) { QualifiedName oldRemaining = remaining; remaining = newRemaining; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlStatePackage.QUALIFIED_NAME__REMAINING, oldRemaining, newRemaining); - if (msgs == null) { + if (msgs == null) msgs = notification; - } else { + else msgs.add(notification); - } } return msgs; } @@ -160,42 +143,32 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setRemaining(QualifiedName newRemaining) - { - if (newRemaining != remaining) - { + public void setRemaining(QualifiedName newRemaining) { + if (newRemaining != remaining) { NotificationChain msgs = null; - if (remaining != null) { + if (remaining != null) msgs = ((InternalEObject) remaining).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.QUALIFIED_NAME__REMAINING, null, msgs); - } - if (newRemaining != null) { + if (newRemaining != null) msgs = ((InternalEObject) newRemaining).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.QUALIFIED_NAME__REMAINING, null, msgs); - } msgs = basicSetRemaining(newRemaining, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.QUALIFIED_NAME__REMAINING, newRemaining, newRemaining)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case UmlStatePackage.QUALIFIED_NAME__REMAINING: return basicSetRemaining(null, msgs); } @@ -205,18 +178,15 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UmlStatePackage.QUALIFIED_NAME__PATH: - if (resolve) { + if (resolve) return getPath(); - } return basicGetPath(); case UmlStatePackage.QUALIFIED_NAME__REMAINING: return getRemaining(); @@ -227,14 +197,12 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UmlStatePackage.QUALIFIED_NAME__PATH: setPath((Namespace) newValue); return; @@ -248,14 +216,12 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UmlStatePackage.QUALIFIED_NAME__PATH: setPath((Namespace) null); return; @@ -269,14 +235,12 @@ public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements Q /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UmlStatePackage.QUALIFIED_NAME__PATH: return path != null; case UmlStatePackage.QUALIFIED_NAME__REMAINING: diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/StateRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/StateRuleImpl.java index f48111932b1..01d6d4f7f08 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/StateRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/StateRuleImpl.java @@ -21,6 +21,7 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl#getSubmachine <em>Submachine</em>}</li> @@ -28,17 +29,15 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl#getDo <em>Do</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.StateRuleImpl#getExit <em>Exit</em>}</li> * </ul> - * </p> * * @generated */ -public class StateRuleImpl extends MinimalEObjectImpl.Container implements StateRule -{ +public class StateRuleImpl extends MinimalEObjectImpl.Container implements StateRule { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getName() * @generated * @ordered @@ -49,7 +48,7 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State * The cached value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getName() * @generated * @ordered @@ -60,7 +59,7 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State * The cached value of the '{@link #getSubmachine() <em>Submachine</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSubmachine() * @generated * @ordered @@ -71,7 +70,7 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State * The cached value of the '{@link #getEntry() <em>Entry</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getEntry() * @generated * @ordered @@ -82,7 +81,7 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State * The cached value of the '{@link #getDo() <em>Do</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getDo() * @generated * @ordered @@ -93,7 +92,7 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State * The cached value of the '{@link #getExit() <em>Exit</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getExit() * @generated * @ordered @@ -103,84 +102,72 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected StateRuleImpl() - { + protected StateRuleImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UmlStatePackage.Literals.STATE_RULE; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public String getName() - { + public String getName() { return name; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setName(String newName) - { + public void setName(String newName) { String oldName = name; name = newName; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__NAME, oldName, name)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public SubmachineRule getSubmachine() - { + public SubmachineRule getSubmachine() { return submachine; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public NotificationChain basicSetSubmachine(SubmachineRule newSubmachine, NotificationChain msgs) - { + public NotificationChain basicSetSubmachine(SubmachineRule newSubmachine, NotificationChain msgs) { SubmachineRule oldSubmachine = submachine; submachine = newSubmachine; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__SUBMACHINE, oldSubmachine, newSubmachine); - if (msgs == null) { + if (msgs == null) msgs = notification; - } else { + else msgs.add(notification); - } } return msgs; } @@ -188,61 +175,48 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setSubmachine(SubmachineRule newSubmachine) - { - if (newSubmachine != submachine) - { + public void setSubmachine(SubmachineRule newSubmachine) { + if (newSubmachine != submachine) { NotificationChain msgs = null; - if (submachine != null) { + if (submachine != null) msgs = ((InternalEObject) submachine).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__SUBMACHINE, null, msgs); - } - if (newSubmachine != null) { + if (newSubmachine != null) msgs = ((InternalEObject) newSubmachine).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__SUBMACHINE, null, msgs); - } msgs = basicSetSubmachine(newSubmachine, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__SUBMACHINE, newSubmachine, newSubmachine)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EntryRule getEntry() - { + public EntryRule getEntry() { return entry; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public NotificationChain basicSetEntry(EntryRule newEntry, NotificationChain msgs) - { + public NotificationChain basicSetEntry(EntryRule newEntry, NotificationChain msgs) { EntryRule oldEntry = entry; entry = newEntry; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__ENTRY, oldEntry, newEntry); - if (msgs == null) { + if (msgs == null) msgs = notification; - } else { + else msgs.add(notification); - } } return msgs; } @@ -250,61 +224,48 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setEntry(EntryRule newEntry) - { - if (newEntry != entry) - { + public void setEntry(EntryRule newEntry) { + if (newEntry != entry) { NotificationChain msgs = null; - if (entry != null) { + if (entry != null) msgs = ((InternalEObject) entry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__ENTRY, null, msgs); - } - if (newEntry != null) { + if (newEntry != null) msgs = ((InternalEObject) newEntry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__ENTRY, null, msgs); - } msgs = basicSetEntry(newEntry, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__ENTRY, newEntry, newEntry)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public DoRule getDo() - { + public DoRule getDo() { return do_; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public NotificationChain basicSetDo(DoRule newDo, NotificationChain msgs) - { + public NotificationChain basicSetDo(DoRule newDo, NotificationChain msgs) { DoRule oldDo = do_; do_ = newDo; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__DO, oldDo, newDo); - if (msgs == null) { + if (msgs == null) msgs = notification; - } else { + else msgs.add(notification); - } } return msgs; } @@ -312,61 +273,48 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setDo(DoRule newDo) - { - if (newDo != do_) - { + public void setDo(DoRule newDo) { + if (newDo != do_) { NotificationChain msgs = null; - if (do_ != null) { + if (do_ != null) msgs = ((InternalEObject) do_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__DO, null, msgs); - } - if (newDo != null) { + if (newDo != null) msgs = ((InternalEObject) newDo).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__DO, null, msgs); - } msgs = basicSetDo(newDo, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__DO, newDo, newDo)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public ExitRule getExit() - { + public ExitRule getExit() { return exit; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public NotificationChain basicSetExit(ExitRule newExit, NotificationChain msgs) - { + public NotificationChain basicSetExit(ExitRule newExit, NotificationChain msgs) { ExitRule oldExit = exit; exit = newExit; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__EXIT, oldExit, newExit); - if (msgs == null) { + if (msgs == null) msgs = notification; - } else { + else msgs.add(notification); - } } return msgs; } @@ -374,42 +322,32 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setExit(ExitRule newExit) - { - if (newExit != exit) - { + public void setExit(ExitRule newExit) { + if (newExit != exit) { NotificationChain msgs = null; - if (exit != null) { + if (exit != null) msgs = ((InternalEObject) exit).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__EXIT, null, msgs); - } - if (newExit != null) { + if (newExit != null) msgs = ((InternalEObject) newExit).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.STATE_RULE__EXIT, null, msgs); - } msgs = basicSetExit(newExit, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.STATE_RULE__EXIT, newExit, newExit)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case UmlStatePackage.STATE_RULE__SUBMACHINE: return basicSetSubmachine(null, msgs); case UmlStatePackage.STATE_RULE__ENTRY: @@ -425,14 +363,12 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UmlStatePackage.STATE_RULE__NAME: return getName(); case UmlStatePackage.STATE_RULE__SUBMACHINE: @@ -450,14 +386,12 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UmlStatePackage.STATE_RULE__NAME: setName((String) newValue); return; @@ -480,14 +414,12 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UmlStatePackage.STATE_RULE__NAME: setName(NAME_EDEFAULT); return; @@ -510,14 +442,12 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UmlStatePackage.STATE_RULE__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case UmlStatePackage.STATE_RULE__SUBMACHINE: @@ -535,17 +465,15 @@ public class StateRuleImpl extends MinimalEObjectImpl.Container implements State /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public String toString() - { - if (eIsProxy()) { + public String toString() { + 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.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/SubmachineRuleImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/SubmachineRuleImpl.java index 97ee8c1c09f..1258ca21be8 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/SubmachineRuleImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/SubmachineRuleImpl.java @@ -19,21 +19,20 @@ import org.eclipse.uml2.uml.StateMachine; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.SubmachineRuleImpl#getPath <em>Path</em>}</li> * <li>{@link org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl.SubmachineRuleImpl#getSubmachine <em>Submachine</em>}</li> * </ul> - * </p> * * @generated */ -public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements SubmachineRule -{ +public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements SubmachineRule { /** * The cached value of the '{@link #getPath() <em>Path</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getPath() * @generated * @ordered @@ -44,7 +43,7 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements * The cached value of the '{@link #getSubmachine() <em>Submachine</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @see #getSubmachine() * @generated * @ordered @@ -54,56 +53,49 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected SubmachineRuleImpl() - { + protected SubmachineRuleImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UmlStatePackage.Literals.SUBMACHINE_RULE; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public QualifiedName getPath() - { + public QualifiedName getPath() { return path; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public NotificationChain basicSetPath(QualifiedName newPath, NotificationChain msgs) - { + public NotificationChain basicSetPath(QualifiedName newPath, NotificationChain msgs) { QualifiedName oldPath = path; path = newPath; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlStatePackage.SUBMACHINE_RULE__PATH, oldPath, newPath); - if (msgs == null) { + if (msgs == null) msgs = notification; - } else { + else msgs.add(notification); - } } return msgs; } @@ -111,49 +103,36 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setPath(QualifiedName newPath) - { - if (newPath != path) - { + public void setPath(QualifiedName newPath) { + if (newPath != path) { NotificationChain msgs = null; - if (path != null) { + if (path != null) msgs = ((InternalEObject) path).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.SUBMACHINE_RULE__PATH, null, msgs); - } - if (newPath != null) { + if (newPath != null) msgs = ((InternalEObject) newPath).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlStatePackage.SUBMACHINE_RULE__PATH, null, msgs); - } msgs = basicSetPath(newPath, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.SUBMACHINE_RULE__PATH, newPath, newPath)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public StateMachine getSubmachine() - { - if (submachine != null && submachine.eIsProxy()) - { + public StateMachine getSubmachine() { + if (submachine != null && submachine.eIsProxy()) { InternalEObject oldSubmachine = (InternalEObject) submachine; submachine = (StateMachine) eResolveProxy(oldSubmachine); - if (submachine != oldSubmachine) - { - if (eNotificationRequired()) { + if (submachine != oldSubmachine) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlStatePackage.SUBMACHINE_RULE__SUBMACHINE, oldSubmachine, submachine)); - } } } return submachine; @@ -162,41 +141,35 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public StateMachine basicGetSubmachine() - { + public StateMachine basicGetSubmachine() { return submachine; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public void setSubmachine(StateMachine newSubmachine) - { + public void setSubmachine(StateMachine newSubmachine) { StateMachine oldSubmachine = submachine; submachine = newSubmachine; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, UmlStatePackage.SUBMACHINE_RULE__SUBMACHINE, oldSubmachine, submachine)); - } } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case UmlStatePackage.SUBMACHINE_RULE__PATH: return basicSetPath(null, msgs); } @@ -206,20 +179,17 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UmlStatePackage.SUBMACHINE_RULE__PATH: return getPath(); case UmlStatePackage.SUBMACHINE_RULE__SUBMACHINE: - if (resolve) { + if (resolve) return getSubmachine(); - } return basicGetSubmachine(); } return super.eGet(featureID, resolve, coreType); @@ -228,14 +198,12 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UmlStatePackage.SUBMACHINE_RULE__PATH: setPath((QualifiedName) newValue); return; @@ -249,14 +217,12 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UmlStatePackage.SUBMACHINE_RULE__PATH: setPath((QualifiedName) null); return; @@ -270,14 +236,12 @@ public class SubmachineRuleImpl extends MinimalEObjectImpl.Container implements /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UmlStatePackage.SUBMACHINE_RULE__PATH: return path != null; case UmlStatePackage.SUBMACHINE_RULE__SUBMACHINE: diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStateFactoryImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStateFactoryImpl.java index dcbe6d1f26f..68500654709 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStateFactoryImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStateFactoryImpl.java @@ -22,29 +22,24 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * <!-- begin-user-doc --> * An implementation of the model <b>Factory</b>. * <!-- end-user-doc --> - * + * * @generated */ -public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory -{ +public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory { /** * Creates the default factory implementation. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public static UmlStateFactory init() - { - try - { + public static UmlStateFactory init() { + try { UmlStateFactory theUmlStateFactory = (UmlStateFactory) EPackage.Registry.INSTANCE.getEFactory(UmlStatePackage.eNS_URI); - if (theUmlStateFactory != null) - { + if (theUmlStateFactory != null) { return theUmlStateFactory; } - } catch (Exception exception) - { + } catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } return new UmlStateFactoryImpl(); @@ -54,25 +49,22 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory * Creates an instance of the factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public UmlStateFactoryImpl() - { + public UmlStateFactoryImpl() { super(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public EObject create(EClass eClass) - { - switch (eClass.getClassifierID()) - { + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { case UmlStatePackage.STATE_RULE: return createStateRule(); case UmlStatePackage.SUBMACHINE_RULE: @@ -93,14 +85,12 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public Object createFromString(EDataType eDataType, String initialValue) - { - switch (eDataType.getClassifierID()) - { + public Object createFromString(EDataType eDataType, String initialValue) { + switch (eDataType.getClassifierID()) { case UmlStatePackage.BEHAVIOR_KIND: return createBehaviorKindFromString(eDataType, initialValue); default: @@ -111,14 +101,12 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ @Override - public String convertToString(EDataType eDataType, Object instanceValue) - { - switch (eDataType.getClassifierID()) - { + public String convertToString(EDataType eDataType, Object instanceValue) { + switch (eDataType.getClassifierID()) { case UmlStatePackage.BEHAVIOR_KIND: return convertBehaviorKindToString(eDataType, instanceValue); default: @@ -129,12 +117,10 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public StateRule createStateRule() - { + public StateRule createStateRule() { StateRuleImpl stateRule = new StateRuleImpl(); return stateRule; } @@ -142,12 +128,10 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public SubmachineRule createSubmachineRule() - { + public SubmachineRule createSubmachineRule() { SubmachineRuleImpl submachineRule = new SubmachineRuleImpl(); return submachineRule; } @@ -155,12 +139,10 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public QualifiedName createQualifiedName() - { + public QualifiedName createQualifiedName() { QualifiedNameImpl qualifiedName = new QualifiedNameImpl(); return qualifiedName; } @@ -168,12 +150,10 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EntryRule createEntryRule() - { + public EntryRule createEntryRule() { EntryRuleImpl entryRule = new EntryRuleImpl(); return entryRule; } @@ -181,12 +161,10 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public DoRule createDoRule() - { + public DoRule createDoRule() { DoRuleImpl doRule = new DoRuleImpl(); return doRule; } @@ -194,12 +172,10 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public ExitRule createExitRule() - { + public ExitRule createExitRule() { ExitRuleImpl exitRule = new ExitRuleImpl(); return exitRule; } @@ -207,51 +183,45 @@ public class UmlStateFactoryImpl extends EFactoryImpl implements UmlStateFactory /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public BehaviorKind createBehaviorKindFromString(EDataType eDataType, String initialValue) - { + public BehaviorKind createBehaviorKindFromString(EDataType eDataType, String initialValue) { BehaviorKind result = BehaviorKind.get(initialValue); - if (result == null) { + if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public String convertBehaviorKindToString(EDataType eDataType, Object instanceValue) - { + public String convertBehaviorKindToString(EDataType eDataType, Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public UmlStatePackage getUmlStatePackage() - { + public UmlStatePackage getUmlStatePackage() { return (UmlStatePackage) getEPackage(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @deprecated * @generated */ @Deprecated - public static UmlStatePackage getPackage() - { + public static UmlStatePackage getPackage() { return UmlStatePackage.eINSTANCE; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStatePackageImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStatePackageImpl.java index cfdcf1fafef..1046f9bef48 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStatePackageImpl.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/impl/UmlStatePackageImpl.java @@ -18,21 +18,21 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.StateRule; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.SubmachineRule; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStateFactory; import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; +import org.eclipse.uml2.types.TypesPackage; import org.eclipse.uml2.uml.UMLPackage; /** * <!-- begin-user-doc --> * An implementation of the model <b>Package</b>. * <!-- end-user-doc --> - * + * * @generated */ -public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage -{ +public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass stateRuleEClass = null; @@ -40,7 +40,7 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass submachineRuleEClass = null; @@ -48,7 +48,7 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass qualifiedNameEClass = null; @@ -56,7 +56,7 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass entryRuleEClass = null; @@ -64,7 +64,7 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass doRuleEClass = null; @@ -72,7 +72,7 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EClass exitRuleEClass = null; @@ -80,31 +80,36 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private EEnum behaviorKindEEnum = null; /** - * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * 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 --> - * + * 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.state.xtext.umlState.UmlStatePackage#eNS_URI * @see #init() * @generated */ - private UmlStatePackageImpl() - { + private UmlStatePackageImpl() { super(eNS_URI, UmlStateFactory.eINSTANCE); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private static boolean isInited = false; @@ -113,26 +118,30 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage * 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 UmlStatePackage#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 --> - * + * This method is used to initialize {@link UmlStatePackage#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 UmlStatePackage init() - { - if (isInited) { + public static UmlStatePackage init() { + if (isInited) return (UmlStatePackage) EPackage.Registry.INSTANCE.getEPackage(UmlStatePackage.eNS_URI); - } // Obtain or create and register package - UmlStatePackageImpl theUmlStatePackage = (UmlStatePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlStatePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlStatePackageImpl()); + Object registeredUmlStatePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + UmlStatePackageImpl theUmlStatePackage = registeredUmlStatePackage instanceof UmlStatePackageImpl ? (UmlStatePackageImpl) registeredUmlStatePackage : new UmlStatePackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); UMLPackage.eINSTANCE.eClass(); + TypesPackage.eINSTANCE.eClass(); // Create package meta-data objects theUmlStatePackage.createPackageContents(); @@ -143,7 +152,6 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage // Mark meta-data to indicate it can't be changed theUmlStatePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(UmlStatePackage.eNS_URI, theUmlStatePackage); return theUmlStatePackage; @@ -152,283 +160,237 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EClass getStateRule() - { + public EClass getStateRule() { return stateRuleEClass; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getStateRule_Name() - { + public EAttribute getStateRule_Name() { return (EAttribute) stateRuleEClass.getEStructuralFeatures().get(0); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getStateRule_Submachine() - { + public EReference getStateRule_Submachine() { return (EReference) stateRuleEClass.getEStructuralFeatures().get(1); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getStateRule_Entry() - { + public EReference getStateRule_Entry() { return (EReference) stateRuleEClass.getEStructuralFeatures().get(2); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getStateRule_Do() - { + public EReference getStateRule_Do() { return (EReference) stateRuleEClass.getEStructuralFeatures().get(3); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getStateRule_Exit() - { + public EReference getStateRule_Exit() { return (EReference) stateRuleEClass.getEStructuralFeatures().get(4); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EClass getSubmachineRule() - { + public EClass getSubmachineRule() { return submachineRuleEClass; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getSubmachineRule_Path() - { + public EReference getSubmachineRule_Path() { return (EReference) submachineRuleEClass.getEStructuralFeatures().get(0); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getSubmachineRule_Submachine() - { + public EReference getSubmachineRule_Submachine() { return (EReference) submachineRuleEClass.getEStructuralFeatures().get(1); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EClass getQualifiedName() - { + public EClass getQualifiedName() { return qualifiedNameEClass; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getQualifiedName_Path() - { + public EReference getQualifiedName_Path() { return (EReference) qualifiedNameEClass.getEStructuralFeatures().get(0); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EReference getQualifiedName_Remaining() - { + public EReference getQualifiedName_Remaining() { return (EReference) qualifiedNameEClass.getEStructuralFeatures().get(1); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EClass getEntryRule() - { + public EClass getEntryRule() { return entryRuleEClass; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getEntryRule_Kind() - { + public EAttribute getEntryRule_Kind() { return (EAttribute) entryRuleEClass.getEStructuralFeatures().get(0); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getEntryRule_BehaviorName() - { + public EAttribute getEntryRule_BehaviorName() { return (EAttribute) entryRuleEClass.getEStructuralFeatures().get(1); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EClass getDoRule() - { + public EClass getDoRule() { return doRuleEClass; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getDoRule_Kind() - { + public EAttribute getDoRule_Kind() { return (EAttribute) doRuleEClass.getEStructuralFeatures().get(0); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getDoRule_BehaviorName() - { + public EAttribute getDoRule_BehaviorName() { return (EAttribute) doRuleEClass.getEStructuralFeatures().get(1); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EClass getExitRule() - { + public EClass getExitRule() { return exitRuleEClass; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getExitRule_Kind() - { + public EAttribute getExitRule_Kind() { return (EAttribute) exitRuleEClass.getEStructuralFeatures().get(0); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EAttribute getExitRule_BehaviorName() - { + public EAttribute getExitRule_BehaviorName() { return (EAttribute) exitRuleEClass.getEStructuralFeatures().get(1); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public EEnum getBehaviorKind() - { + public EEnum getBehaviorKind() { return behaviorKindEEnum; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - @Override - public UmlStateFactory getUmlStateFactory() - { + public UmlStateFactory getUmlStateFactory() { return (UmlStateFactory) getEFactoryInstance(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private boolean isCreated = false; @@ -438,14 +400,12 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage * guarded to have no affect on any invocation but its first. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public void createPackageContents() - { - if (isCreated) { + public void createPackageContents() { + if (isCreated) return; - } isCreated = true; // Create classes and their features @@ -483,7 +443,7 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ private boolean isInitialized = false; @@ -493,14 +453,12 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage * 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) { + public void initializePackageContents() { + if (isInitialized) return; - } isInitialized = true; // Initialize package @@ -528,12 +486,13 @@ public class UmlStatePackageImpl extends EPackageImpl implements UmlStatePackage initEClass(submachineRuleEClass, SubmachineRule.class, "SubmachineRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getSubmachineRule_Path(), this.getQualifiedName(), null, "path", null, 0, 1, SubmachineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSubmachineRule_Submachine(), theUMLPackage.getStateMachine(), null, "submachine", null, 0, 1, SubmachineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getSubmachineRule_Submachine(), theUMLPackage.getStateMachine(), null, "submachine", null, 0, 1, SubmachineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(qualifiedNameEClass, QualifiedName.class, "QualifiedName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getQualifiedName_Path(), theUMLPackage.getNamespace(), null, "path", null, 0, 1, QualifiedName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getQualifiedName_Remaining(), this.getQualifiedName(), null, "remaining", null, 0, 1, QualifiedName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getQualifiedName_Remaining(), this.getQualifiedName(), null, "remaining", null, 0, 1, QualifiedName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(entryRuleEClass, EntryRule.class, "EntryRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getEntryRule_Kind(), this.getBehaviorKind(), "kind", null, 0, 1, EntryRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateAdapterFactory.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateAdapterFactory.java index 141ddb3512f..4bcf121fd29 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateAdapterFactory.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateAdapterFactory.java @@ -19,17 +19,16 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; * 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.state.xtext.umlState.UmlStatePackage * @generated */ -public class UmlStateAdapterFactory extends AdapterFactoryImpl -{ +public class UmlStateAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected static UmlStatePackage modelPackage; @@ -38,13 +37,11 @@ public class UmlStateAdapterFactory extends AdapterFactoryImpl * Creates an instance of the adapter factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public UmlStateAdapterFactory() - { - if (modelPackage == null) - { + public UmlStateAdapterFactory() { + if (modelPackage == null) { modelPackage = UmlStatePackage.eINSTANCE; } } @@ -54,19 +51,16 @@ public class UmlStateAdapterFactory 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 */ @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { return true; } - if (object instanceof EObject) - { + if (object instanceof EObject) { return ((EObject) object).eClass().getEPackage() == modelPackage; } return false; @@ -76,68 +70,58 @@ public class UmlStateAdapterFactory extends AdapterFactoryImpl * The switch that delegates to the <code>createXXX</code> methods. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - protected UmlStateSwitch<Adapter> modelSwitch = - new UmlStateSwitch<Adapter>() - { - @Override - public Adapter caseStateRule(StateRule object) - { - return createStateRuleAdapter(); - } - - @Override - public Adapter caseSubmachineRule(SubmachineRule object) - { - return createSubmachineRuleAdapter(); - } - - @Override - public Adapter caseQualifiedName(QualifiedName object) - { - return createQualifiedNameAdapter(); - } - - @Override - public Adapter caseEntryRule(EntryRule object) - { - return createEntryRuleAdapter(); - } - - @Override - public Adapter caseDoRule(DoRule object) - { - return createDoRuleAdapter(); - } - - @Override - public Adapter caseExitRule(ExitRule object) - { - return createExitRuleAdapter(); - } - - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; + protected UmlStateSwitch<Adapter> modelSwitch = new UmlStateSwitch<Adapter>() { + @Override + public Adapter caseStateRule(StateRule object) { + return createStateRuleAdapter(); + } + + @Override + public Adapter caseSubmachineRule(SubmachineRule object) { + return createSubmachineRuleAdapter(); + } + + @Override + public Adapter caseQualifiedName(QualifiedName object) { + return createQualifiedNameAdapter(); + } + + @Override + public Adapter caseEntryRule(EntryRule object) { + return createEntryRuleAdapter(); + } + + @Override + public Adapter caseDoRule(DoRule object) { + return createDoRuleAdapter(); + } + + @Override + public Adapter caseExitRule(ExitRule object) { + return createExitRuleAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * 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>. * @generated */ @Override - public Adapter createAdapter(Notifier target) - { + public Adapter createAdapter(Notifier target) { return modelSwitch.doSwitch((EObject) target); } @@ -148,13 +132,12 @@ public class UmlStateAdapterFactory 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.state.xtext.umlState.StateRule * @generated */ - public Adapter createStateRuleAdapter() - { + public Adapter createStateRuleAdapter() { return null; } @@ -164,13 +147,12 @@ public class UmlStateAdapterFactory 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.state.xtext.umlState.SubmachineRule * @generated */ - public Adapter createSubmachineRuleAdapter() - { + public Adapter createSubmachineRuleAdapter() { return null; } @@ -180,13 +162,12 @@ public class UmlStateAdapterFactory 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.state.xtext.umlState.QualifiedName * @generated */ - public Adapter createQualifiedNameAdapter() - { + public Adapter createQualifiedNameAdapter() { return null; } @@ -196,13 +177,12 @@ public class UmlStateAdapterFactory 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.state.xtext.umlState.EntryRule * @generated */ - public Adapter createEntryRuleAdapter() - { + public Adapter createEntryRuleAdapter() { return null; } @@ -212,13 +192,12 @@ public class UmlStateAdapterFactory 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.state.xtext.umlState.DoRule * @generated */ - public Adapter createDoRuleAdapter() - { + public Adapter createDoRuleAdapter() { return null; } @@ -228,13 +207,12 @@ public class UmlStateAdapterFactory 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.state.xtext.umlState.ExitRule * @generated */ - public Adapter createExitRuleAdapter() - { + public Adapter createExitRuleAdapter() { return null; } @@ -243,12 +221,11 @@ public class UmlStateAdapterFactory extends AdapterFactoryImpl * <!-- begin-user-doc --> * This default implementation returns null. * <!-- end-user-doc --> - * + * * @return the new adapter. * @generated */ - public Adapter createEObjectAdapter() - { + public Adapter createEObjectAdapter() { return null; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateResourceFactoryImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateResourceFactoryImpl.java deleted file mode 100644 index e1d37a87b6d..00000000000 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateResourceFactoryImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - */ -package org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; -import org.eclipse.emf.ecore.xmi.XMLResource; - -/** - * <!-- begin-user-doc --> - * The <b>Resource Factory</b> associated with the package. - * <!-- end-user-doc --> - * - * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util.UmlStateResourceImpl - * @generated - */ -public class UmlStateResourceFactoryImpl extends ResourceFactoryImpl -{ - /** - * Creates an instance of the resource factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - public UmlStateResourceFactoryImpl() - { - super(); - } - - /** - * Creates an instance of the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - public Resource createResource(URI uri) - { - XMLResource result = new UmlStateResourceImpl(uri); - result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); - result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); - - result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); - - result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); - result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); - - result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); - return result; - } - -} // UmlStateResourceFactoryImpl diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateResourceImpl.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateResourceImpl.java deleted file mode 100644 index e05f8c552f6..00000000000 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateResourceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - */ -package org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; - -/** - * <!-- begin-user-doc --> - * The <b>Resource </b> associated with the package. - * <!-- end-user-doc --> - * - * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util.UmlStateResourceFactoryImpl - * @generated - */ -public class UmlStateResourceImpl extends XMLResourceImpl -{ - /** - * Creates an instance of the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @param uri - * the URI of the new resource. - * @generated - */ - public UmlStateResourceImpl(URI uri) - { - super(uri); - } - -} // UmlStateResourceImpl diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateSwitch.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateSwitch.java index 9037d7c87a9..45718dceb14 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateSwitch.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateSwitch.java @@ -16,23 +16,23 @@ import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; /** * <!-- begin-user-doc --> * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object * and proceeding up the inheritance hierarchy * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * + * * @see org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage * @generated */ -public class UmlStateSwitch<T> extends Switch<T> -{ +public class UmlStateSwitch<T> extends Switch<T> { /** * The cached model package * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected static UmlStatePackage modelPackage; @@ -41,13 +41,11 @@ public class UmlStateSwitch<T> extends Switch<T> * Creates an instance of the switch. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ - public UmlStateSwitch() - { - if (modelPackage == null) - { + public UmlStateSwitch() { + if (modelPackage == null) { modelPackage = UmlStatePackage.eINSTANCE; } } @@ -56,14 +54,14 @@ public class UmlStateSwitch<T> extends Switch<T> * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * - * @parameter ePackage the package in question. + * + * @param ePackage + * the package in question. * @return whether this is a switch for the given package. * @generated */ @Override - protected boolean isSwitchFor(EPackage ePackage) - { + protected boolean isSwitchFor(EPackage ePackage) { return ePackage == modelPackage; } @@ -71,61 +69,53 @@ public class UmlStateSwitch<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 */ @Override - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { case UmlStatePackage.STATE_RULE: { StateRule stateRule = (StateRule) theEObject; T result = caseStateRule(stateRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } case UmlStatePackage.SUBMACHINE_RULE: { SubmachineRule submachineRule = (SubmachineRule) theEObject; T result = caseSubmachineRule(submachineRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } case UmlStatePackage.QUALIFIED_NAME: { QualifiedName qualifiedName = (QualifiedName) theEObject; T result = caseQualifiedName(qualifiedName); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } case UmlStatePackage.ENTRY_RULE: { EntryRule entryRule = (EntryRule) theEObject; T result = caseEntryRule(entryRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } case UmlStatePackage.DO_RULE: { DoRule doRule = (DoRule) theEObject; T result = caseDoRule(doRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } case UmlStatePackage.EXIT_RULE: { ExitRule exitRule = (ExitRule) theEObject; T result = caseExitRule(exitRule); - if (result == null) { + if (result == null) result = defaultCase(theEObject); - } return result; } default: @@ -139,15 +129,14 @@ public class UmlStateSwitch<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>State Rule</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseStateRule(StateRule object) - { + public T caseStateRule(StateRule object) { return null; } @@ -157,15 +146,14 @@ public class UmlStateSwitch<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>Submachine Rule</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseSubmachineRule(SubmachineRule object) - { + public T caseSubmachineRule(SubmachineRule object) { return null; } @@ -175,15 +163,14 @@ public class UmlStateSwitch<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>Qualified Name</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseQualifiedName(QualifiedName object) - { + public T caseQualifiedName(QualifiedName object) { return null; } @@ -193,15 +180,14 @@ public class UmlStateSwitch<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>Entry Rule</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseEntryRule(EntryRule object) - { + public T caseEntryRule(EntryRule object) { return null; } @@ -211,15 +197,14 @@ public class UmlStateSwitch<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>Do Rule</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseDoRule(DoRule object) - { + public T caseDoRule(DoRule object) { return null; } @@ -229,15 +214,14 @@ public class UmlStateSwitch<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>Exit Rule</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseExitRule(ExitRule object) - { + public T caseExitRule(ExitRule object) { return null; } @@ -247,7 +231,7 @@ public class UmlStateSwitch<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>'. @@ -255,8 +239,7 @@ public class UmlStateSwitch<T> extends Switch<T> * @generated */ @Override - public T defaultCase(EObject object) - { + public T defaultCase(EObject object) { return null; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateXMLProcessor.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateXMLProcessor.java deleted file mode 100644 index 36162150591..00000000000 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/src-gen/org/eclipse/papyrus/uml/textedit/state/xtext/umlState/util/UmlStateXMLProcessor.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - */ -package org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util; - -import java.util.Map; - -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.xmi.util.XMLProcessor; -import org.eclipse.papyrus.uml.textedit.state.xtext.umlState.UmlStatePackage; - -/** - * This class contains helper methods to serialize and deserialize XML documents - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ -public class UmlStateXMLProcessor extends XMLProcessor -{ - - /** - * Public constructor to instantiate the helper. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - public UmlStateXMLProcessor() - { - super((EPackage.Registry.INSTANCE)); - UmlStatePackage.eINSTANCE.eClass(); - } - - /** - * Register for "*" and "xml" file extensions the UmlStateResourceFactoryImpl factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - @Override - protected Map<String, Resource.Factory> getRegistrations() - { - if (registrations == null) - { - super.getRegistrations(); - registrations.put(XML_EXTENSION, new UmlStateResourceFactoryImpl()); - registrations.put(STAR_EXTENSION, new UmlStateResourceFactoryImpl()); - } - return registrations; - } - -} // UmlStateXMLProcessor |