Attachment 189079 Details for Bug 337289 – Patch for embedded xtext editors

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for embedded xtext editors

embedded_editors.patch (text/plain), 4.26 MB, created by Arnaud Cuccuru

on 2011-02-16 05:09:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Arnaud Cuccuru

Created: 2011-02-16 05:09:38 EST

Size: 4.26 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.papyrus.message.editor.xtext
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.genmodel	(working copy)
>@@ -6,17 +6,17 @@
> modelPluginID="org.eclipse.papyrus.message.editor.xtext" forceOverwrite="true"
> modelName="UmlMessage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.message.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.message.editor.xtext.editor" usedGenPackages="../../../../../../../model/UML.genmodel#//uml">
>+ editorPluginID="org.eclipse.papyrus.message.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.message.editor.xtext/model/UML.genmodel#//uml">
> <genPackages prefix="UmlMessage" basePackage="org.eclipse.papyrus.message.editor.xtext"
>- disposableProviderFactory="true" ecorePackage="UmlMessage.ecore#/">
>- <genClasses ecoreClass="UmlMessage.ecore#//MessageRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlMessage.ecore#//MessageRule/sequenceTerm"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//MessageRule/name"/>
>+ disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#/">
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//MessageRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//MessageRule/sequenceTerm"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//MessageRule/name"/>
> </genClasses>
>- <genClasses ecoreClass="UmlMessage.ecore#//SequenceTermRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/sequencialOrder"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/sequenceName"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlMessage.ecore#//SequenceTermRule/recurrence"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//SequenceTermRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//SequenceTermRule/sequencialOrder"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//SequenceTermRule/sequenceName"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//SequenceTermRule/recurrence"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/UmlMessageFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/UmlMessageFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/UmlMessageFactory.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage;
> 
> import org.eclipse.emf.ecore.EFactory;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/UmlMessagePackage.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/UmlMessagePackage.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/UmlMessagePackage.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage;
> 
> import org.eclipse.emf.ecore.EAttribute;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/MessageRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/MessageRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/MessageRule.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage;
> 
> import org.eclipse.emf.common.util.EList;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/SequenceTermRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/SequenceTermRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/SequenceTermRule.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage;
> 
> import org.eclipse.emf.ecore.EObject;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/MessageRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/MessageRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/MessageRuleImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage.impl;
> 
> import java.util.Collection;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/SequenceTermRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/SequenceTermRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/SequenceTermRuleImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage.impl;
> 
> import org.eclipse.emf.common.notify.Notification;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/UmlMessagePackageImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/UmlMessagePackageImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/UmlMessagePackageImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage.impl;
> 
> import org.eclipse.emf.ecore.EAttribute;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/UmlMessageFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/UmlMessageFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/impl/UmlMessageFactoryImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage.impl;
> 
> import org.eclipse.emf.ecore.EClass;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/util/UmlMessageSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/util/UmlMessageSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/util/UmlMessageSwitch.java	(working copy)
>@@ -1,22 +1,15 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>-package org.eclipse.papyrus.message.editor.xtext.umlMessage.util;
> 
>-import java.util.List;
>+ */
>+package org.eclipse.papyrus.message.editor.xtext.umlMessage.util;
> 
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
> 
> import org.eclipse.papyrus.message.editor.xtext.umlMessage.*;
> 
>@@ -33,7 +26,7 @@
> * @see org.eclipse.papyrus.message.editor.xtext.umlMessage.UmlMessagePackage
> * @generated
> */
>-public class UmlMessageSwitch<T>
>+public class UmlMessageSwitch<T> extends Switch<T>
> {
> /**
> * The cached model package
>@@ -58,15 +51,17 @@
> }
> 
> /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * Checks whether this is a switch for the given package.
> * 
> * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
> * @generated
> */
>- public T doSwitch(EObject theEObject)
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
> {
>- return doSwitch(theEObject.eClass(), theEObject);
>+ return ePackage == modelPackage;
> }
> 
> /**
>@@ -76,29 +71,7 @@
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>- protected T doSwitch(EClass theEClass, EObject theEObject)
>- {
>- if (theEClass.eContainer() == modelPackage)
>- {
>- return doSwitch(theEClass.getClassifierID(), theEObject);
>- }
>- else
>- {
>- List<EClass> eSuperTypes = theEClass.getESuperTypes();
>- return
>- eSuperTypes.isEmpty() ?
>- defaultCase(theEObject) :
>- doSwitch(eSuperTypes.get(0), theEObject);
>- }
>- }
>-
>- /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>- * 
>- * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>- * @generated
>- */
>+ @Override
> protected T doSwitch(int classifierID, EObject theEObject)
> {
> switch (classifierID)
>@@ -164,6 +137,7 @@
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
> */
>+ @Override
> public T defaultCase(EObject object)
> {
> return null;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/util/UmlMessageAdapterFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/util/UmlMessageAdapterFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/umlMessage/util/UmlMessageAdapterFactory.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.message.editor.xtext.umlMessage.util;
> 
> import org.eclipse.emf.common.notify.Adapter;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/validation/AbstractUmlMessageJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/validation/AbstractUmlMessageJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/validation/AbstractUmlMessageJavaValidator.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.message.editor.xtext.validation;
> 
> import java.util.ArrayList;
>@@ -23,7 +10,7 @@
> @ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlMessageJavaValidator extends AbstractDeclarativeValidator {
> 
>-@Override
>+	@Override
> 	protected List<EPackage> getEPackages() {
> 	 List<EPackage> result = new ArrayList<EPackage>();
> 	 result.add(org.eclipse.papyrus.message.editor.xtext.umlMessage.UmlMessagePackage.eINSTANCE);
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore	(working copy)
>@@ -5,7 +5,8 @@
> nsURI="http://www.eclipse.org/papyrus/message/editor/xtext/UmlMessage" nsPrefix="umlMessage">
> <eClassifiers xsi:type="ecore:EClass" name="MessageRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceTerm" upperBound="-1"
>- eType="#//SequenceTermRule" containment="true"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.ecore#//SequenceTermRule"
>+ containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="SequenceTermRule">
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/services/UmlMessageGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/services/UmlMessageGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/services/UmlMessageGrammarAccess.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> 
> package org.eclipse.papyrus.message.editor.xtext.services;
> 
>@@ -145,7 +135,7 @@
> 		//sequenceTerm1 = SequenceTermRule
> 		//('.' sequenceTerm2 = SequenceTermRule )* 
> 		//
>-		// * /RecurrenceRule returns ecore::EString:
>+		// * /RecurrenceRule:
> 		//	"*" "[" STRING "]" | "[" STRING "]";
> 		public ParserRule getRule() { return rule; }
> 
>@@ -250,7 +240,7 @@
> 	//sequenceTerm1 = SequenceTermRule
> 	//('.' sequenceTerm2 = SequenceTermRule )* 
> 	//
>-	// * /RecurrenceRule returns ecore::EString:
>+	// * /RecurrenceRule:
> 	//	"*" "[" STRING "]" | "[" STRING "]";
> 	public RecurrenceRuleElements getRecurrenceRuleAccess() {
> 		return (pRecurrenceRule != null) ? pRecurrenceRule : (pRecurrenceRule = new RecurrenceRuleElements());
>@@ -273,8 +263,8 @@
> 	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaTerminals.getSTRINGRule();
> 	} 
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parseTreeConstruction/UmlMessageParsetreeConstructor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parseTreeConstruction/UmlMessageParsetreeConstructor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parseTreeConstruction/UmlMessageParsetreeConstructor.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.message.editor.xtext.parseTreeConstruction;
> 
> import org.eclipse.emf.ecore.*;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessageStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessageStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessageStandaloneSetupGenerated.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> 
> package org.eclipse.papyrus.message.editor.xtext;
> 
>@@ -52,6 +39,5 @@
> 
> 
> 
>-
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/AbstractUmlMessageRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/AbstractUmlMessageRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/AbstractUmlMessageRuntimeModule.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+ * generated by Xtext
>+ */
> package org.eclipse.papyrus.message.editor.xtext;
> 
> import java.util.Properties;
>@@ -55,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.message.editor.xtext.parser.antlr.UmlMessageParser.class;
> 	}
> 
>@@ -101,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -109,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/UmlMessage.xmi	(working copy)
>@@ -158,6 +158,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -183,6 +184,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/UmlMessageAntlrTokenFileProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/UmlMessageAntlrTokenFileProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/UmlMessageAntlrTokenFileProvider.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.message.editor.xtext.parser.antlr;
> 
> import java.io.InputStream;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/UmlMessageParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/UmlMessageParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/UmlMessageParser.java	(working copy)
>@@ -1,26 +1,11 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.message.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.papyrus.message.editor.xtext.services.UmlMessageGrammarAccess;
> 
> public class UmlMessageParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>@@ -29,25 +14,13 @@
> 	private UmlMessageGrammarAccess grammarAccess;
> 	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal.InternalUmlMessageParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(),re);
>-		}
> 	}
> 	
>+	@Override
> 	protected org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal.InternalUmlMessageParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal.InternalUmlMessageParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal.InternalUmlMessageParser(stream, getGrammarAccess());
> 	}
> 	
> 	@Override 
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.tokens	(working copy)
>@@ -1,6 +1,11 @@
> RULE_NAMERULE=4
> RULE_ID=6
> RULE_STRING=7
>+T__16=16
>+T__15=15
>+T__12=12
>+T__14=14
>+T__13=13
> RULE_ANY_OTHER=11
> RULE_INT=5
> RULE_WS=10
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessageLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessageLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessageLexer.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal;
> 
> // Hack: Use our own Lexer superclass by means of import. 
>@@ -28,132 +15,149 @@
> public static final int RULE_NAMERULE=4;
> public static final int RULE_ID=6;
> public static final int RULE_STRING=7;
>+ public static final int T__16=16;
>+ public static final int T__15=15;
>+ 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_ANY_OTHER=11;
> public static final int RULE_INT=5;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
>- public static final int T15=15;
> public static final int RULE_WS=10;
>- public static final int Tokens=17;
>- public static final int T16=16;
> public static final int RULE_SL_COMMENT=9;
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=8;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlMessageLexer() {;} 
> public InternalUmlMessageLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlMessageLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g"; }
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:10:5: ( '.' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:10:7: '.'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:11:7: ( '.' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:11:9: '.'
> {
> match('.'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:11:5: ( ':' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:11:7: ':'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:12:7: ( ':' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:12:9: ':'
> {
> match(':'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:12:5: ( '*' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:12:7: '*'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:13:7: ( '*' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:13:9: '*'
> {
> match('*'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:13:5: ( '[' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:13:7: '['
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:14:7: ( '[' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:14:9: '['
> {
> match('['); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:14:5: ( ']' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:14:7: ']'
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:15:7: ( ']' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:15:9: ']'
> {
> match(']'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start RULE_NAMERULE
>+ // $ANTLR start "RULE_NAMERULE"
> public final void mRULE_NAMERULE() throws RecognitionException {
> try {
> int _type = RULE_NAMERULE;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:342:15: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:342:17: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )*
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:15: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:17: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )*
> {
> if ( (input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='a' && input.LA(1)<='z') ) {
> input.consume();
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:342:37: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:37: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )*
> loop1:
> do {
> int alt1=2;
>@@ -173,10 +177,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -190,21 +193,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_NAMERULE
>+ // $ANTLR end "RULE_NAMERULE"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:344:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:344:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:292:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:344:11: ( '^' )?
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: ( '^' )?
> int alt2=2;
> int LA2_0 = input.LA(1);
> 
>@@ -213,7 +218,7 @@
> }
> switch (alt2) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:344:11: '^'
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:292:11: '^'
> {
> match('^'); 
> 
>@@ -227,12 +232,11 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:344:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:292:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop3:
> do {
> int alt3=2;
>@@ -252,10 +256,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -269,21 +272,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:346:10: ( ( '0' .. '9' )+ )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:346:12: ( '0' .. '9' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:294:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:294:12: ( '0' .. '9' )+
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:346:12: ( '0' .. '9' )+
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:294:12: ( '0' .. '9' )+
> int cnt4=0;
> loop4:
> do {
>@@ -297,7 +302,7 @@
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:346:13: '0' .. '9'
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:294:13: '0' .. '9'
> 	 {
> 	 matchRange('0','9'); 
> 
>@@ -316,21 +321,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt7=2;
> int LA7_0 = input.LA(1);
> 
>@@ -342,16 +349,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("348:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 7, 0, input);
>+ new NoViableAltException("", 7, 0, input);
> 
> throw nvae;
> }
> switch (alt7) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -360,41 +367,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -410,10 +415,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop6:
> do {
> int alt6=3;
>@@ -422,41 +427,39 @@
> if ( (LA6_0=='\\') ) {
> alt6=1;
> }
>- else if ( ((LA6_0>='\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFE')) ) {
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
> alt6=2;
> }
> 
> 
> switch (alt6) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:348:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:296:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -477,23 +480,25 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:350:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:350:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:298:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:298:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
> match("/*"); 
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:350:24: ( options {greedy=false; } : . )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:298:24: ( options {greedy=false; } : . )*
> loop8:
> do {
> int alt8=2;
>@@ -505,20 +510,20 @@
> if ( (LA8_1=='/') ) {
> alt8=2;
> }
>- else if ( ((LA8_1>='\u0000' && LA8_1<='.')||(LA8_1>='0' && LA8_1<='\uFFFE')) ) {
>+ else if ( ((LA8_1>='\u0000' && LA8_1<='.')||(LA8_1>='0' && LA8_1<='\uFFFF')) ) {
> alt8=1;
> }
> 
> 
> }
>- else if ( ((LA8_0>='\u0000' && LA8_0<=')')||(LA8_0>='+' && LA8_0<='\uFFFE')) ) {
>+ else if ( ((LA8_0>='\u0000' && LA8_0<=')')||(LA8_0>='+' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
> 
> switch (alt8) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:350:52: .
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:298:52: .
> 	 {
> 	 matchAny(); 
> 
>@@ -535,46 +540,47 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
> match("//"); 
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:24: (~ ( ( '\\n' | '\\r' ) ) )*
> loop9:
> do {
> int alt9=2;
> int LA9_0 = input.LA(1);
> 
>- if ( ((LA9_0>='\u0000' && LA9_0<='\t')||(LA9_0>='\u000B' && LA9_0<='\f')||(LA9_0>='\u000E' && LA9_0<='\uFFFE')) ) {
>+ if ( ((LA9_0>='\u0000' && LA9_0<='\t')||(LA9_0>='\u000B' && LA9_0<='\f')||(LA9_0>='\u000E' && LA9_0<='\uFFFF')) ) {
> alt9=1;
> }
> 
> 
> switch (alt9) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:24: ~ ( ( '\\n' | '\\r' ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -585,7 +591,7 @@
> }
> } while (true);
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:40: ( ( '\\r' )? '\\n' )?
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:40: ( ( '\\r' )? '\\n' )?
> int alt11=2;
> int LA11_0 = input.LA(1);
> 
>@@ -594,9 +600,9 @@
> }
> switch (alt11) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:41: ( '\\r' )? '\\n'
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:41: ( '\\r' )? '\\n'
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:41: ( '\\r' )?
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:41: ( '\\r' )?
> int alt10=2;
> int LA10_0 = input.LA(1);
> 
>@@ -605,7 +611,7 @@
> }
> switch (alt10) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:352:41: '\\r'
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:300:41: '\\r'
> {
> match('\r'); 
> 
>@@ -624,21 +630,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:354:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:354:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:302:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:302:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:354:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:302:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> int cnt12=0;
> loop12:
> do {
>@@ -659,10 +667,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -680,122 +687,125 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:356:16: ( . )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:356:18: .
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:304:16: ( . )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:304:18: .
> {
> matchAny(); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:8: ( T12 | T13 | T14 | T15 | T16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt13=13;
> alt13 = dfa13.predict(input);
> switch (alt13) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:10: T12
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:10: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:14: T13
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:16: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:18: T14
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:22: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:22: T15
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:28: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:26: T16
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:34: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:30: RULE_NAMERULE
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAMERULE
> {
> mRULE_NAMERULE(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:44: RULE_ID
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:54: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:52: RULE_INT
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:62: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:61: RULE_STRING
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:71: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:73: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:83: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:89: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:99: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:105: RULE_WS
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:115: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:113: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:1:123: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -815,16 +825,16 @@
> static final String DFA13_minS =
> "\1\0\5\uffff\1\60\1\101\2\uffff\2\0\1\52\7\uffff\1\60\7\uffff";
> static final String DFA13_maxS =
>- "\1\ufffe\5\uffff\2\172\2\uffff\2\ufffe\1\57\7\uffff\1\172\7\uffff";
>+ "\1\uffff\5\uffff\2\172\2\uffff\2\uffff\1\57\7\uffff\1\172\7\uffff";
> static final String DFA13_acceptS =
> "\1\uffff\1\1\1\2\1\3\1\4\1\5\2\uffff\1\7\1\10\3\uffff\1\14\1\15"+
> "\1\1\1\2\1\3\1\4\1\5\1\uffff\1\6\1\7\1\10\1\11\1\12\1\13\1\14";
> static final String DFA13_specialS =
>- "\34\uffff}>";
>+ "\1\0\11\uffff\1\2\1\1\20\uffff}>";
> static final String[] DFA13_transitionS = {
> "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\12\4\16\1\13\2\16\1"+
> "\3\3\16\1\1\1\14\12\11\1\2\6\16\32\6\1\4\1\16\1\5\1\7\1\10\1"+
>- "\16\32\6\uff84\16",
>+ "\16\32\6\uff85\16",
> "",
> "",
> "",
>@@ -834,8 +844,8 @@
> "\32\26\4\uffff\1\26\1\uffff\32\26",
> "",
> "",
>- "\uffff\30",
>- "\uffff\30",
>+ "\0\30",
>+ "\0\30",
> "\1\31\4\uffff\1\32",
> "",
> "",
>@@ -884,7 +894,71 @@
> this.transition = DFA13_transition;
> }
> public String getDescription() {
>- return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA13_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA13_0=='.') ) {s = 1;}
>+
>+ else if ( (LA13_0==':') ) {s = 2;}
>+
>+ else if ( (LA13_0=='*') ) {s = 3;}
>+
>+ else if ( (LA13_0=='[') ) {s = 4;}
>+
>+ else if ( (LA13_0==']') ) {s = 5;}
>+
>+ else if ( ((LA13_0>='A' && LA13_0<='Z')||(LA13_0>='a' && LA13_0<='z')) ) {s = 6;}
>+
>+ else if ( (LA13_0=='^') ) {s = 7;}
>+
>+ else if ( (LA13_0=='_') ) {s = 8;}
>+
>+ else if ( ((LA13_0>='0' && LA13_0<='9')) ) {s = 9;}
>+
>+ else if ( (LA13_0=='\"') ) {s = 10;}
>+
>+ else if ( (LA13_0=='\'') ) {s = 11;}
>+
>+ else if ( (LA13_0=='/') ) {s = 12;}
>+
>+ else if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {s = 13;}
>+
>+ else if ( ((LA13_0>='\u0000' && LA13_0<='\b')||(LA13_0>='\u000B' && LA13_0<='\f')||(LA13_0>='\u000E' && LA13_0<='\u001F')||LA13_0=='!'||(LA13_0>='#' && LA13_0<='&')||(LA13_0>='(' && LA13_0<=')')||(LA13_0>='+' && LA13_0<='-')||(LA13_0>=';' && LA13_0<='@')||LA13_0=='\\'||LA13_0=='`'||(LA13_0>='{' && LA13_0<='\uFFFF')) ) {s = 14;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA13_11 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA13_11>='\u0000' && LA13_11<='\uFFFF')) ) {s = 24;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA13_10 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA13_10>='\u0000' && LA13_10<='\uFFFF')) ) {s = 24;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 13, _s, input);
>+ error(nvae);
>+ throw nvae;
> }
> }
> 
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessageParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessageParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessageParser.java	(working copy)
>@@ -1,30 +1,14 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.message.editor.xtext.services.UmlMessageGrammarAccess;
> 
> 
>@@ -42,6 +26,11 @@
> public static final int RULE_NAMERULE=4;
> public static final int RULE_ID=6;
> public static final int RULE_STRING=7;
>+ public static final int T__16=16;
>+ public static final int T__15=15;
>+ 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_ANY_OTHER=11;
> public static final int RULE_INT=5;
> public static final int RULE_WS=10;
>@@ -49,29 +38,30 @@
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=8;
> 
>+ // delegates
>+ // delegators
>+
>+
> public InternalUmlMessageParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlMessageParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlMessageParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g"; }
> 
> 
> 
> 	private UmlMessageGrammarAccess grammarAccess;
> 	
>- public InternalUmlMessageParser(TokenStream input, IAstFactory factory, UmlMessageGrammarAccess grammarAccess) {
>+ public InternalUmlMessageParser(TokenStream input, UmlMessageGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -86,8 +76,8 @@
> 
> 
> 
>- // $ANTLR start entryRuleMessageRule
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:77:1: entryRuleMessageRule returns [EObject current=null] : iv_ruleMessageRule= ruleMessageRule EOF ;
>+ // $ANTLR start "entryRuleMessageRule"
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:67:1: entryRuleMessageRule returns [EObject current=null] : iv_ruleMessageRule= ruleMessageRule EOF ;
> public final EObject entryRuleMessageRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -95,13 +85,14 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:78:2: (iv_ruleMessageRule= ruleMessageRule EOF )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:79:2: iv_ruleMessageRule= ruleMessageRule EOF
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:68:2: (iv_ruleMessageRule= ruleMessageRule EOF )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:69:2: iv_ruleMessageRule= ruleMessageRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getMessageRuleRule(), currentNode); 
>+ newCompositeNode(grammarAccess.getMessageRuleRule()); 
> pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule75);
> iv_ruleMessageRule=ruleMessageRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleMessageRule; 
> match(input,EOF,FOLLOW_EOF_in_entryRuleMessageRule85); 
>@@ -118,58 +109,55 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleMessageRule
>+ // $ANTLR end "entryRuleMessageRule"
> 
> 
>- // $ANTLR start ruleMessageRule
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:86:1: ruleMessageRule returns [EObject current=null] : ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) ( '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* ':' ( (lv_name_4_0= RULE_NAMERULE ) ) ) ;
>+ // $ANTLR start "ruleMessageRule"
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:76:1: ruleMessageRule returns [EObject current=null] : ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) ) ;
> public final EObject ruleMessageRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_1=null;
>+ Token otherlv_3=null;
> Token lv_name_4_0=null;
> EObject lv_sequenceTerm_0_0 = null;
> 
> EObject lv_sequenceTerm_2_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:91:6: ( ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) ( '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* ':' ( (lv_name_4_0= RULE_NAMERULE ) ) ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:92:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) ( '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* ':' ( (lv_name_4_0= RULE_NAMERULE ) ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:79:28: ( ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:92:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) ( '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* ':' ( (lv_name_4_0= RULE_NAMERULE ) ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:92:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) ( '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* ':' ( (lv_name_4_0= RULE_NAMERULE ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:80:1: ( ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) ) (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )* otherlv_3= ':' ( (lv_name_4_0= RULE_NAMERULE ) )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:92:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:93:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:80:2: ( (lv_sequenceTerm_0_0= ruleSequenceTermRule ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:93:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:94:3: lv_sequenceTerm_0_0= ruleSequenceTermRule
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:81:1: (lv_sequenceTerm_0_0= ruleSequenceTermRule )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:82:3: lv_sequenceTerm_0_0= ruleSequenceTermRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0()); 
> 	 
> pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131);
> lv_sequenceTerm_0_0=ruleSequenceTermRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getMessageRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getMessageRuleRule());
> 	 }
>- 	 try {
>- 	 		add(
>- 	 			current, 
>- 	 			"sequenceTerm",
>- 	 		lv_sequenceTerm_0_0, 
>- 	 		"SequenceTermRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			current, 
>+ 			"sequenceTerm",
>+ 		lv_sequenceTerm_0_0, 
>+ 		"SequenceTermRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -177,7 +165,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:116:2: ( '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )*
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:98:2: (otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) ) )*
> loop1:
> do {
> int alt1=2;
>@@ -190,41 +178,36 @@
> 
> switch (alt1) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:116:4: '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:98:4: otherlv_1= '.' ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )
> 	 {
>- 	 match(input,12,FOLLOW_12_in_ruleMessageRule142); 
>+ 	 otherlv_1=(Token)match(input,12,FOLLOW_12_in_ruleMessageRule144); 
> 
>- 	 createLeafNode(grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0(), null); 
>+ 	 	newLeafNode(otherlv_1, grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());
> 	 
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:120:1: ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:121:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:102:1: ( (lv_sequenceTerm_2_0= ruleSequenceTermRule ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )
> 	 {
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:121:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )
>- 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:122:3: lv_sequenceTerm_2_0= ruleSequenceTermRule
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:103:1: (lv_sequenceTerm_2_0= ruleSequenceTermRule )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:104:3: lv_sequenceTerm_2_0= ruleSequenceTermRule
> 	 {
> 	 
>- 	 	 currentNode=createCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0(), currentNode); 
>+ 	 	 newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0()); 
> 	 	 
>- 	 pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule163);
>+ 	 pushFollow(FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165);
> 	 lv_sequenceTerm_2_0=ruleSequenceTermRule();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 	 if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getMessageRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 	 current = createModelElementForParent(grammarAccess.getMessageRuleRule());
> 	 	 }
>- 	 	 try {
>- 	 	 		add(
>- 	 	 			current, 
>- 	 	 			"sequenceTerm",
>- 	 	 		lv_sequenceTerm_2_0, 
>- 	 	 		"SequenceTermRule", 
>- 	 	 		currentNode);
>- 	 	 } catch (ValueConverterException vce) {
>- 	 				handleValueConverterException(vce);
>- 	 	 }
>- 	 	 currentNode = currentNode.getParent();
>+ 	 		add(
>+ 	 			current, 
>+ 	 			"sequenceTerm",
>+ 	 		lv_sequenceTerm_2_0, 
>+ 	 		"SequenceTermRule");
>+ 	 	 afterParserOrEnumRuleCall();
> 	 	 
> 
> 	 }
>@@ -241,36 +224,29 @@
> }
> } while (true);
> 
>- match(input,13,FOLLOW_13_in_ruleMessageRule175); 
>+ otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleMessageRule179); 
> 
>- createLeafNode(grammarAccess.getMessageRuleAccess().getColonKeyword_2(), null); 
>+ 	newLeafNode(otherlv_3, grammarAccess.getMessageRuleAccess().getColonKeyword_2());
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:148:1: ( (lv_name_4_0= RULE_NAMERULE ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:149:1: (lv_name_4_0= RULE_NAMERULE )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:124:1: ( (lv_name_4_0= RULE_NAMERULE ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAMERULE )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:149:1: (lv_name_4_0= RULE_NAMERULE )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:150:3: lv_name_4_0= RULE_NAMERULE
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:125:1: (lv_name_4_0= RULE_NAMERULE )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:126:3: lv_name_4_0= RULE_NAMERULE
> {
>- lv_name_4_0=(Token)input.LT(1);
>- match(input,RULE_NAMERULE,FOLLOW_RULE_NAMERULE_in_ruleMessageRule192); 
>+ lv_name_4_0=(Token)match(input,RULE_NAMERULE,FOLLOW_RULE_NAMERULE_in_ruleMessageRule196); 
> 
>- 			createLeafNode(grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0(), "name"); 
>+ 			newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getMessageRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getMessageRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"name",
>- 	 		lv_name_4_0, 
>- 	 		"nameRule", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"name",
>+ 		lv_name_4_0, 
>+ 		"nameRule");
> 	 
> 
> }
>@@ -284,9 +260,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -297,11 +271,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleMessageRule
>+ // $ANTLR end "ruleMessageRule"
> 
> 
>- // $ANTLR start entryRuleSequenceTermRule
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:180:1: entryRuleSequenceTermRule returns [EObject current=null] : iv_ruleSequenceTermRule= ruleSequenceTermRule EOF ;
>+ // $ANTLR start "entryRuleSequenceTermRule"
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:150:1: entryRuleSequenceTermRule returns [EObject current=null] : iv_ruleSequenceTermRule= ruleSequenceTermRule EOF ;
> public final EObject entryRuleSequenceTermRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -309,16 +283,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:181:2: (iv_ruleSequenceTermRule= ruleSequenceTermRule EOF )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:182:2: iv_ruleSequenceTermRule= ruleSequenceTermRule EOF
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:151:2: (iv_ruleSequenceTermRule= ruleSequenceTermRule EOF )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:152:2: iv_ruleSequenceTermRule= ruleSequenceTermRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getSequenceTermRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule233);
>+ newCompositeNode(grammarAccess.getSequenceTermRuleRule()); 
>+ pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237);
> iv_ruleSequenceTermRule=ruleSequenceTermRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleSequenceTermRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleSequenceTermRule243); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleSequenceTermRule247); 
> 
> }
> 
>@@ -332,11 +307,11 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleSequenceTermRule
>+ // $ANTLR end "entryRuleSequenceTermRule"
> 
> 
>- // $ANTLR start ruleSequenceTermRule
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:189:1: ruleSequenceTermRule returns [EObject current=null] : ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ;
>+ // $ANTLR start "ruleSequenceTermRule"
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:159:1: ruleSequenceTermRule returns [EObject current=null] : ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) ;
> public final EObject ruleSequenceTermRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -345,41 +320,34 @@
> AntlrDatatypeRuleToken lv_recurrence_2_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:194:6: ( ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:195:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:162:28: ( ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:195:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:195:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )?
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:163:1: ( ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )? )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) ) ( (lv_sequenceName_1_0= RULE_ID ) )? ( (lv_recurrence_2_0= ruleRecurrenceRule ) )?
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:195:2: ( (lv_sequencialOrder_0_0= RULE_INT ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:196:1: (lv_sequencialOrder_0_0= RULE_INT )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:163:2: ( (lv_sequencialOrder_0_0= RULE_INT ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:196:1: (lv_sequencialOrder_0_0= RULE_INT )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:197:3: lv_sequencialOrder_0_0= RULE_INT
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:164:1: (lv_sequencialOrder_0_0= RULE_INT )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:165:3: lv_sequencialOrder_0_0= RULE_INT
> {
>- lv_sequencialOrder_0_0=(Token)input.LT(1);
>- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSequenceTermRule285); 
>+ lv_sequencialOrder_0_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSequenceTermRule289); 
> 
>- 			createLeafNode(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0(), "sequencialOrder"); 
>+ 			newLeafNode(lv_sequencialOrder_0_0, grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getSequenceTermRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getSequenceTermRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"sequencialOrder",
>- 	 		lv_sequencialOrder_0_0, 
>- 	 		"INT", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"sequencialOrder",
>+ 		lv_sequencialOrder_0_0, 
>+ 		"INT");
> 	 
> 
> }
>@@ -387,7 +355,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:219:2: ( (lv_sequenceName_1_0= RULE_ID ) )?
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:181:2: ( (lv_sequenceName_1_0= RULE_ID ) )?
> int alt2=2;
> int LA2_0 = input.LA(1);
> 
>@@ -396,31 +364,24 @@
> }
> switch (alt2) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:220:1: (lv_sequenceName_1_0= RULE_ID )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:220:1: (lv_sequenceName_1_0= RULE_ID )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:221:3: lv_sequenceName_1_0= RULE_ID
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:182:1: (lv_sequenceName_1_0= RULE_ID )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:183:3: lv_sequenceName_1_0= RULE_ID
> {
>- lv_sequenceName_1_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSequenceTermRule307); 
>+ lv_sequenceName_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSequenceTermRule311); 
> 
>- 			createLeafNode(grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0(), "sequenceName"); 
>+ 			newLeafNode(lv_sequenceName_1_0, grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getSequenceTermRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"sequenceName",
>- 	 		lv_sequenceName_1_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getSequenceTermRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"sequenceName",
>+ 		lv_sequenceName_1_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -431,7 +392,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:243:3: ( (lv_recurrence_2_0= ruleRecurrenceRule ) )?
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:199:3: ( (lv_recurrence_2_0= ruleRecurrenceRule ) )?
> int alt3=2;
> int LA3_0 = input.LA(1);
> 
>@@ -440,34 +401,29 @@
> }
> switch (alt3) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:244:1: (lv_recurrence_2_0= ruleRecurrenceRule )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:244:1: (lv_recurrence_2_0= ruleRecurrenceRule )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:245:3: lv_recurrence_2_0= ruleRecurrenceRule
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:200:1: (lv_recurrence_2_0= ruleRecurrenceRule )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:201:3: lv_recurrence_2_0= ruleRecurrenceRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0()); 
> 	 
>- pushFollow(FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule334);
>+ pushFollow(FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338);
> lv_recurrence_2_0=ruleRecurrenceRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getSequenceTermRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getSequenceTermRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"recurrence",
>- 	 		lv_recurrence_2_0, 
>- 	 		"RecurrenceRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"recurrence",
>+ 		lv_recurrence_2_0, 
>+ 		"RecurrenceRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -484,9 +440,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -497,11 +451,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleSequenceTermRule
>+ // $ANTLR end "ruleSequenceTermRule"
> 
> 
>- // $ANTLR start entryRuleRecurrenceRule
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:275:1: entryRuleRecurrenceRule returns [String current=null] : iv_ruleRecurrenceRule= ruleRecurrenceRule EOF ;
>+ // $ANTLR start "entryRuleRecurrenceRule"
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:225:1: entryRuleRecurrenceRule returns [String current=null] : iv_ruleRecurrenceRule= ruleRecurrenceRule EOF ;
> public final String entryRuleRecurrenceRule() throws RecognitionException {
> String current = null;
> 
>@@ -509,16 +463,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:276:2: (iv_ruleRecurrenceRule= ruleRecurrenceRule EOF )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:277:2: iv_ruleRecurrenceRule= ruleRecurrenceRule EOF
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:226:2: (iv_ruleRecurrenceRule= ruleRecurrenceRule EOF )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:227:2: iv_ruleRecurrenceRule= ruleRecurrenceRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getRecurrenceRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule372);
>+ newCompositeNode(grammarAccess.getRecurrenceRuleRule()); 
>+ pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376);
> iv_ruleRecurrenceRule=ruleRecurrenceRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleRecurrenceRule.getText(); 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleRecurrenceRule383); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleRecurrenceRule387); 
> 
> }
> 
>@@ -532,11 +487,11 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleRecurrenceRule
>+ // $ANTLR end "entryRuleRecurrenceRule"
> 
> 
>- // $ANTLR start ruleRecurrenceRule
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:284:1: ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ;
>+ // $ANTLR start "ruleRecurrenceRule"
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:234:1: ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) ;
> public final AntlrDatatypeRuleToken ruleRecurrenceRule() throws RecognitionException {
> AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
> 
>@@ -544,13 +499,13 @@
> Token this_STRING_2=null;
> Token this_STRING_5=null;
> 
>- setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:289:6: ( ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:237:28: ( ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:238:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) )
> int alt4=2;
> int LA4_0 = input.LA(1);
> 
>@@ -562,42 +517,38 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("290:1: ( (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' ) | (kw= '[' this_STRING_5= RULE_STRING kw= ']' ) )", 4, 0, input);
>+ new NoViableAltException("", 4, 0, input);
> 
> throw nvae;
> }
> switch (alt4) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:290:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:291:2: kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']'
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:238:2: (kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:239:2: kw= '*' kw= '[' this_STRING_2= RULE_STRING kw= ']'
> {
>- kw=(Token)input.LT(1);
>- match(input,14,FOLLOW_14_in_ruleRecurrenceRule422); 
>+ kw=(Token)match(input,14,FOLLOW_14_in_ruleRecurrenceRule426); 
> 
> current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0()); 
> 
>- kw=(Token)input.LT(1);
>- match(input,15,FOLLOW_15_in_ruleRecurrenceRule435); 
>+ kw=(Token)match(input,15,FOLLOW_15_in_ruleRecurrenceRule439); 
> 
> current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1()); 
> 
>- this_STRING_2=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRecurrenceRule450); 
>+ this_STRING_2=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRecurrenceRule454); 
> 
> 		current.merge(this_STRING_2);
> 
> 
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2(), null); 
>+ newLeafNode(this_STRING_2, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2()); 
> 
>- kw=(Token)input.LT(1);
>- match(input,16,FOLLOW_16_in_ruleRecurrenceRule468); 
>+ kw=(Token)match(input,16,FOLLOW_16_in_ruleRecurrenceRule472); 
> 
> current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3()); 
> 
> 
> }
>@@ -606,30 +557,27 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:316:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:316:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )
>- // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:317:2: kw= '[' this_STRING_5= RULE_STRING kw= ']'
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:264:6: (kw= '[' this_STRING_5= RULE_STRING kw= ']' )
>+ // ../org.eclipse.papyrus.message.editor.xtext/src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g:265:2: kw= '[' this_STRING_5= RULE_STRING kw= ']'
> {
>- kw=(Token)input.LT(1);
>- match(input,15,FOLLOW_15_in_ruleRecurrenceRule489); 
>+ kw=(Token)match(input,15,FOLLOW_15_in_ruleRecurrenceRule493); 
> 
> current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0()); 
> 
>- this_STRING_5=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRecurrenceRule504); 
>+ this_STRING_5=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRecurrenceRule508); 
> 
> 		current.merge(this_STRING_5);
> 
> 
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1(), null); 
>+ newLeafNode(this_STRING_5, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1()); 
> 
>- kw=(Token)input.LT(1);
>- match(input,16,FOLLOW_16_in_ruleRecurrenceRule522); 
>+ kw=(Token)match(input,16,FOLLOW_16_in_ruleRecurrenceRule526); 
> 
> current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2()); 
> 
> 
> }
>@@ -643,9 +591,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	 lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -656,31 +602,33 @@
> }
> return current;
> }
>- // $ANTLR end ruleRecurrenceRule
>+ // $ANTLR end "ruleRecurrenceRule"
> 
>+ // Delegated rules
>+
> 
> 
> 
> public static final BitSet FOLLOW_ruleMessageRule_in_entryRuleMessageRule75 = new BitSet(new long[]{0x0000000000000000L});
> public static final BitSet FOLLOW_EOF_in_entryRuleMessageRule85 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule131 = new BitSet(new long[]{0x0000000000003000L});
>- public static final BitSet FOLLOW_12_in_ruleMessageRule142 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule163 = new BitSet(new long[]{0x0000000000003000L});
>- public static final BitSet FOLLOW_13_in_ruleMessageRule175 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_NAMERULE_in_ruleMessageRule192 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule233 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule243 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_RULE_INT_in_ruleSequenceTermRule285 = new BitSet(new long[]{0x000000000000C042L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleSequenceTermRule307 = new BitSet(new long[]{0x000000000000C002L});
>- public static final BitSet FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule334 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule372 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule383 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_14_in_ruleRecurrenceRule422 = new BitSet(new long[]{0x0000000000008000L});
>- public static final BitSet FOLLOW_15_in_ruleRecurrenceRule435 = new BitSet(new long[]{0x0000000000000080L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule450 = new BitSet(new long[]{0x0000000000010000L});
>- public static final BitSet FOLLOW_16_in_ruleRecurrenceRule468 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_15_in_ruleRecurrenceRule489 = new BitSet(new long[]{0x0000000000000080L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule504 = new BitSet(new long[]{0x0000000000010000L});
>- public static final BitSet FOLLOW_16_in_ruleRecurrenceRule522 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_12_in_ruleMessageRule144 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_ruleSequenceTermRule_in_ruleMessageRule165 = new BitSet(new long[]{0x0000000000003000L});
>+ public static final BitSet FOLLOW_13_in_ruleMessageRule179 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_NAMERULE_in_ruleMessageRule196 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule237 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleSequenceTermRule247 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_INT_in_ruleSequenceTermRule289 = new BitSet(new long[]{0x000000000000C042L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleSequenceTermRule311 = new BitSet(new long[]{0x000000000000C002L});
>+ public static final BitSet FOLLOW_ruleRecurrenceRule_in_ruleSequenceTermRule338 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule376 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleRecurrenceRule387 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_14_in_ruleRecurrenceRule426 = new BitSet(new long[]{0x0000000000008000L});
>+ public static final BitSet FOLLOW_15_in_ruleRecurrenceRule439 = new BitSet(new long[]{0x0000000000000080L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule454 = new BitSet(new long[]{0x0000000000010000L});
>+ public static final BitSet FOLLOW_16_in_ruleRecurrenceRule472 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_15_in_ruleRecurrenceRule493 = new BitSet(new long[]{0x0000000000000080L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleRecurrenceRule508 = new BitSet(new long[]{0x0000000000010000L});
>+ public static final BitSet FOLLOW_16_in_ruleRecurrenceRule526 = new BitSet(new long[]{0x0000000000000002L});
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.g	(working copy)
>@@ -19,18 +19,15 @@
> @parser::header {
> package org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.message.editor.xtext.services.UmlMessageGrammarAccess;
> 
> }
>@@ -39,17 +36,10 @@
> 
> 	private UmlMessageGrammarAccess grammarAccess;
> 	
>- public InternalUmlMessageParser(TokenStream input, IAstFactory factory, UmlMessageGrammarAccess grammarAccess) {
>+ public InternalUmlMessageParser(TokenStream input, UmlMessageGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/message/editor/xtext/parser/antlr/internal/InternalUmlMessage.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -76,7 +66,7 @@
> // Entry rule entryRuleMessageRule
> entryRuleMessageRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getMessageRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getMessageRuleRule()); }
> 	 iv_ruleMessageRule=ruleMessageRule 
> 	 { $current=$iv_ruleMessageRule.current; } 
> 	 EOF 
>@@ -84,88 +74,68 @@
> 
> // Rule MessageRule
> ruleMessageRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0()); 
> 	 }
> 		lv_sequenceTerm_0_0=ruleSequenceTermRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMessageRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getMessageRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"sequenceTerm",
>-	 		lv_sequenceTerm_0_0, 
>-	 		"SequenceTermRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"sequenceTerm",
>+ 		lv_sequenceTerm_0_0, 
>+ 		"SequenceTermRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)(	'.' 
>+)(	otherlv_1='.' 
> {
>- createLeafNode(grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getMessageRuleAccess().getFullStopKeyword_1_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0()); 
> 	 }
> 		lv_sequenceTerm_2_0=ruleSequenceTermRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMessageRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getMessageRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"sequenceTerm",
>-	 		lv_sequenceTerm_2_0, 
>-	 		"SequenceTermRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"sequenceTerm",
>+ 		lv_sequenceTerm_2_0, 
>+ 		"SequenceTermRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-))*	':' 
>+))*	otherlv_3=':' 
> {
>- createLeafNode(grammarAccess.getMessageRuleAccess().getColonKeyword_2(), null); 
>+ 	newLeafNode(otherlv_3, grammarAccess.getMessageRuleAccess().getColonKeyword_2());
> }
> (
> (
> 		lv_name_4_0=RULE_NAMERULE
> 		{
>-			createLeafNode(grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0(), "name"); 
>+			newLeafNode(lv_name_4_0, grammarAccess.getMessageRuleAccess().getNameNameRuleTerminalRuleCall_3_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMessageRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getMessageRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"name",
>-	 		lv_name_4_0, 
>-	 		"nameRule", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"name",
>+ 		lv_name_4_0, 
>+ 		"nameRule");
> 	 }
> 
> )
>@@ -179,7 +149,7 @@
> // Entry rule entryRuleSequenceTermRule
> entryRuleSequenceTermRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getSequenceTermRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getSequenceTermRuleRule()); }
> 	 iv_ruleSequenceTermRule=ruleSequenceTermRule 
> 	 { $current=$iv_ruleSequenceTermRule.current; } 
> 	 EOF 
>@@ -187,32 +157,24 @@
> 
> // Rule SequenceTermRule
> ruleSequenceTermRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		lv_sequencialOrder_0_0=RULE_INT
> 		{
>-			createLeafNode(grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0(), "sequencialOrder"); 
>+			newLeafNode(lv_sequencialOrder_0_0, grammarAccess.getSequenceTermRuleAccess().getSequencialOrderINTTerminalRuleCall_0_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getSequenceTermRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getSequenceTermRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"sequencialOrder",
>-	 		lv_sequencialOrder_0_0, 
>-	 		"INT", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"sequencialOrder",
>+ 		lv_sequencialOrder_0_0, 
>+ 		"INT");
> 	 }
> 
> )
>@@ -220,47 +182,35 @@
> (
> 		lv_sequenceName_1_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0(), "sequenceName"); 
>+			newLeafNode(lv_sequenceName_1_0, grammarAccess.getSequenceTermRuleAccess().getSequenceNameIDTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getSequenceTermRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getSequenceTermRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"sequenceName",
>-	 		lv_sequenceName_1_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"sequenceName",
>+ 		lv_sequenceName_1_0, 
>+ 		"ID");
> 	 }
> 
> )
> )?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0()); 
> 	 }
> 		lv_recurrence_2_0=ruleRecurrenceRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getSequenceTermRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getSequenceTermRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"recurrence",
>-	 		lv_recurrence_2_0, 
>-	 		"RecurrenceRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"recurrence",
>+ 		lv_recurrence_2_0, 
>+ 		"RecurrenceRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -274,7 +224,7 @@
> // Entry rule entryRuleRecurrenceRule
> entryRuleRecurrenceRule returns [String current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getRecurrenceRuleRule(), currentNode); } 
>+	{ newCompositeNode(grammarAccess.getRecurrenceRuleRule()); } 
> 	 iv_ruleRecurrenceRule=ruleRecurrenceRule 
> 	 { $current=$iv_ruleRecurrenceRule.current.getText(); } 
> 	 EOF 
>@@ -282,55 +232,53 @@
> 
> // Rule RecurrenceRule
> ruleRecurrenceRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 
>- @init { setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>-	 lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> 	kw='*' 
> {
> $current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getAsteriskKeyword_0_0()); 
> }
> 
> 	kw='[' 
> {
> $current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_0_1()); 
> }
> this_STRING_2=RULE_STRING {
> 		$current.merge(this_STRING_2);
> }
> 
> { 
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2(), null); 
>+ newLeafNode(this_STRING_2, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_0_2()); 
> }
> 
> 	kw=']' 
> {
> $current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_0_3()); 
> }
> )
> |(
> 	kw='[' 
> {
> $current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getLeftSquareBracketKeyword_1_0()); 
> }
> this_STRING_5=RULE_STRING {
> 		$current.merge(this_STRING_5);
> }
> 
> { 
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1(), null); 
>+ newLeafNode(this_STRING_5, grammarAccess.getRecurrenceRuleAccess().getSTRINGTerminalRuleCall_1_1()); 
> }
> 
> 	kw=']' 
> {
> $current.merge(kw);
>- createLeafNode(grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2(), null); 
>+ newLeafNode(kw, grammarAccess.getRecurrenceRuleAccess().getRightSquareBracketKeyword_1_2()); 
> }
> ))
> ;
>@@ -345,7 +293,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -22,7 +22,7 @@
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.papyrus.log;bundle-version="0.8.0",
> org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0"
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.message.editor.xtext,
>Index: src/org/eclipse/papyrus/message/editor/xtext/GenerateUmlMessage.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/message/editor/xtext/GenerateUmlMessage.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/message/editor/xtext/GenerateUmlMessage.mwe2	(working copy)
>@@ -84,8 +84,7 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// quickfix API 
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>#P org.eclipse.papyrus.collaborationuse.editor.xtext.ui
>Index: src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,31 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UmlCollaborationUseOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = {
>-	// provide list of classes to adapt to, e.g.:
>-	// Entity.class
>-	// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>Index: src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlCollaborationUseOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>Index: src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/outline/UmlCollaborationUseTransformer.java	(working copy)
>@@ -1,24 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UmlCollaborationUseTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-
>-}
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/internal/UmlCollaborationUseActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/internal/UmlCollaborationUseActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/internal/UmlCollaborationUseActivator.java	(working copy)
>@@ -3,69 +3,80 @@
> */
> package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.internal;
> 
>-import java.util.HashMap;
>-import java.util.Map;
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
> 
> import org.apache.log4j.Logger;
>+
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
>+
>+import java.util.Map;
>+import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlCollaborationUseActivator extends AbstractUIPlugin {
> 
>-	private Map<String, Injector> injectors = new HashMap<String, Injector>();
>-
>+	private Map<String,Injector> injectors = new HashMap<String,Injector>();
> 	private static UmlCollaborationUseActivator INSTANCE;
> 
> 	public Injector getInjector(String languageName) {
> 		return injectors.get(languageName);
> 	}
>-
>+	
> 	@Override
> 	public void start(BundleContext context) throws Exception {
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-
>-			injectors.put("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse", Guice.createInjector(Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse")).with(getUiModule("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse"))).with(getSharedStateModule())));
>-
>+			registerInjectorFor("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse");
>+			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
> 			throw e;
> 		}
> 	}
>-
>+	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlCollaborationUseActivator getInstance() {
> 		return INSTANCE;
> 	}
>-
>+	
> 	protected Module getRuntimeModule(String grammar) {
>-
>-		if("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse".equals(grammar)) {
>-			return new org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUseRuntimeModule();
>+		if ("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse".equals(grammar)) {
>+		 return new org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUseRuntimeModule();
> 		}
>-
>+		
> 		throw new IllegalArgumentException(grammar);
> 	}
>-
>+	
> 	protected Module getUiModule(String grammar) {
>-
>-		if("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse".equals(grammar)) {
>-			return new org.eclipse.papyrus.collaborationuse.editor.xtext.ui.UmlCollaborationUseUiModule(this);
>+		if ("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse".equals(grammar)) {
>+		 return new org.eclipse.papyrus.collaborationuse.editor.xtext.ui.UmlCollaborationUseUiModule(this);
> 		}
>-
>+		
> 		throw new IllegalArgumentException(grammar);
> 	}
>-
>+	
> 	protected Module getSharedStateModule() {
> 		return new org.eclipse.xtext.ui.shared.SharedStateModule();
> 	}
>-
>+	
> }
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/AbstractUmlCollaborationUseUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/AbstractUmlCollaborationUseUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/AbstractUmlCollaborationUseUiModule.java	(working copy)
>@@ -1,43 +1,34 @@
>+
> /*
> * generated by Xtext
> */
> package org.eclipse.papyrus.collaborationuse.editor.xtext.ui;
> 
>-import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.eclipse.xtext.ui.DefaultUiModule;
>+import org.eclipse.ui.plugin.AbstractUIPlugin;
> 
> /**
> * Manual modifications go to {org.eclipse.papyrus.collaborationuse.editor.xtext.ui.UmlCollaborationUseUiModule}
> */
> @SuppressWarnings("all")
> public abstract class AbstractUmlCollaborationUseUiModule extends DefaultUiModule {
>-
>+	
> 	public AbstractUmlCollaborationUseUiModule(AbstractUIPlugin plugin) {
> 		super(plugin);
> 	}
>-
>-
>+	
>+	
> 	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
> 	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
> 		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.FastDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal.InternalUmlCollaborationUseLexer.class);
> 	}
>@@ -47,9 +38,14 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.builderState.ShadowingResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>@@ -77,14 +73,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.collaborationuse.editor.xtext.ui.labeling.UmlCollaborationUseDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline.UmlCollaborationUseTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline.UmlCollaborationUseOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline.UmlCollaborationUseOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.collaborationuse.editor.xtext.ui.outline.UmlCollaborationUseOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUseLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUseLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUseLexer.java	(working copy)
>@@ -1,936 +1,1049 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.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;
>-import org.antlr.runtime.EarlyExitException;
>-import org.antlr.runtime.MismatchedSetException;
>-import org.antlr.runtime.NoViableAltException;
>-import org.antlr.runtime.RecognitionException;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
> 
>-@SuppressWarnings("all")
>-public class InternalUmlCollaborationUseLexer extends Lexer {
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int Tokens = 19;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public static final int RULE_STRING = 7;
> 
>-	public static final int RULE_INT = 6;
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-	public static final int T12 = 12;
>-
>-	public static final int T13 = 13;
>-
>-	public static final int T14 = 14;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int T15 = 15;
>-
>-	public static final int T16 = 16;
>-
>-	public static final int T17 = 17;
>-
>-	public static final int T18 = 18;
>-
>-	public InternalUmlCollaborationUseLexer() {
>-		;
>-	}
>-
>-	public InternalUmlCollaborationUseLexer(CharStream input) {
>-		super(input);
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g";
>-	}
>-
>-	// $ANTLR start T12
>-	public final void mT12() throws RecognitionException {
>-		try {
>-			int _type = T12;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:10:5: ( '<Undefined>' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:10:7: '<Undefined>'
>-			{
>-				match("<Undefined>");
>-
>-
>-			}
>-
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>-
>-	// $ANTLR end T12
>+@SuppressWarnings("all")
>+public class InternalUmlCollaborationUseLexer extends Lexer {
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ 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__17=17;
>+ 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_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>-	// $ANTLR start T13
>-	public final void mT13() throws RecognitionException {
>-		try {
>-			int _type = T13;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:11:5: ( '+' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:11:7: '+'
>-			{
>-				match('+');
>+ // delegates
>+ // delegators
> 
>-			}
>+ public InternalUmlCollaborationUseLexer() {;} 
>+ public InternalUmlCollaborationUseLexer(CharStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCollaborationUseLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g"; }
> 
>-	// $ANTLR end T13
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
>+ try {
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:11:7: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:11:9: '<Undefined>'
>+ {
>+ match("<Undefined>"); 
> 
>-	// $ANTLR start T14
>-	public final void mT14() throws RecognitionException {
>-		try {
>-			int _type = T14;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:12:5: ( '-' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:12:7: '-'
>-			{
>-				match('-');
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__12"
> 
>-	// $ANTLR end T14
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
>+ try {
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:12:7: ( '+' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:12:9: '+'
>+ {
>+ match('+'); 
> 
>-	// $ANTLR start T15
>-	public final void mT15() throws RecognitionException {
>-		try {
>-			int _type = T15;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:13:5: ( '#' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:13:7: '#'
>-			{
>-				match('#');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__13"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
>+ try {
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:13:7: ( '-' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:13:9: '-'
>+ {
>+ match('-'); 
> 
>-	// $ANTLR end T15
>+ }
> 
>-	// $ANTLR start T16
>-	public final void mT16() throws RecognitionException {
>-		try {
>-			int _type = T16;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:14:5: ( '~' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:14:7: '~'
>-			{
>-				match('~');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__14"
> 
>-			}
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
>+ try {
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:14:7: ( '#' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:14:9: '#'
>+ {
>+ match('#'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T16
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__15"
> 
>-	// $ANTLR start T17
>-	public final void mT17() throws RecognitionException {
>-		try {
>-			int _type = T17;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:15:5: ( ':' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:15:7: ':'
>-			{
>-				match(':');
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
>+ try {
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:15:7: ( '~' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:15:9: '~'
>+ {
>+ match('~'); 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__16"
> 
>-	// $ANTLR end T17
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
>+ try {
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:16:7: ( ':' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:16:9: ':'
>+ {
>+ match(':'); 
> 
>-	// $ANTLR start T18
>-	public final void mT18() throws RecognitionException {
>-		try {
>-			int _type = T18;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:16:5: ( '::' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:16:7: '::'
>-			{
>-				match("::");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__17"
> 
>-			}
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
>+ try {
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:17:7: ( '::' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:17:9: '::'
>+ {
>+ match("::"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T18
>+ }
> 
>-	// $ANTLR start RULE_UNLIMITEDLITERAL
>-	public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>-		try {
>-			int _type = RULE_UNLIMITEDLITERAL;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-				int alt2 = 2;
>-				int LA2_0 = input.LA(1);
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__18"
> 
>-				if(((LA2_0 >= '0' && LA2_0 <= '9'))) {
>-					alt2 = 1;
>-				} else if((LA2_0 == '*')) {
>-					alt2 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("675:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
>+ public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>+ try {
>+ int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-					throw nvae;
>-				}
>-				switch(alt2) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:26: '0' .. '9' ( '0' .. '9' )*
>-				{
>-					matchRange('0', '9');
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:35: ( '0' .. '9' )*
>-					loop1: do {
>-						int alt1 = 2;
>-						int LA1_0 = input.LA(1);
>+ if ( ((LA2_0>='0' && LA2_0<='9')) ) {
>+ alt2=1;
>+ }
>+ else if ( (LA2_0=='*') ) {
>+ alt2=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>-						if(((LA1_0 >= '0' && LA1_0 <= '9'))) {
>-							alt1 = 1;
>-						}
>+ throw nvae;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:26: '0' .. '9' ( '0' .. '9' )*
>+ {
>+ matchRange('0','9'); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:35: ( '0' .. '9' )*
>+ loop1:
>+ do {
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>+ if ( ((LA1_0>='0' && LA1_0<='9')) ) {
>+ alt1=1;
>+ }
> 
>-						switch(alt1) {
>-						case 1:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:36: '0' .. '9'
>-						{
>-							matchRange('0', '9');
> 
>-						}
>-							break;
>+ switch (alt1) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:36: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-						default:
>-							break loop1;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop1;
>+ }
>+ } while (true);
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:47: '*'
>-				{
>-					match('*');
> 
>-				}
>-					break;
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:675:47: '*'
>+ {
>+ match('*'); 
> 
>-				}
>+ }
>+ break;
> 
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end RULE_UNLIMITEDLITERAL
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>-	// $ANTLR start RULE_ID
>-	public final void mRULE_ID() throws RecognitionException {
>-		try {
>-			int _type = RULE_ID;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:11: ( '^' )?
>-				int alt3 = 2;
>-				int LA3_0 = input.LA(1);
>+ // $ANTLR start "RULE_ID"
>+ public final void mRULE_ID() throws RecognitionException {
>+ try {
>+ int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:11: ( '^' )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-				if((LA3_0 == '^')) {
>-					alt3 = 1;
>-				}
>-				switch(alt3) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:11: '^'
>-				{
>-					match('^');
>+ if ( (LA3_0=='^') ) {
>+ alt3=1;
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:11: '^'
>+ {
>+ match('^'); 
> 
>-				}
>-					break;
>+ }
>+ break;
> 
>-				}
>+ }
> 
>-				if((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {
>-					input.consume();
>+ if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
>+ input.consume();
> 
>-				} else {
>-					MismatchedSetException mse = new MismatchedSetException(null, input);
>-					recover(mse);
>-					throw mse;
>-				}
>+ }
>+ else {
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-				loop4: do {
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:677:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-					if(((LA4_0 >= '0' && LA4_0 <= '9') || (LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
>-						alt4 = 1;
>-					}
>+ if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
>+ alt4=1;
>+ }
> 
> 
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.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();
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.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 {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-					}
>-						break;
>+ 	 }
>+ 	 break;
> 
>-					default:
>-						break loop4;
>-					}
>-				} while(true);
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ID"
> 
>-	// $ANTLR end RULE_ID
>+ // $ANTLR start "RULE_INT"
>+ public final void mRULE_INT() throws RecognitionException {
>+ try {
>+ int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:12: ( '0' .. '9' )+
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:12: ( '0' .. '9' )+
>+ int cnt5=0;
>+ loop5:
>+ do {
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-	// $ANTLR start RULE_INT
>-	public final void mRULE_INT() throws RecognitionException {
>-		try {
>-			int _type = RULE_INT;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:10: ( ( '0' .. '9' )+ )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:12: ( '0' .. '9' )+
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:12: ( '0' .. '9' )+
>-				int cnt5 = 0;
>-				loop5: do {
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
>+ if ( ((LA5_0>='0' && LA5_0<='9')) ) {
>+ alt5=1;
>+ }
> 
>-					if(((LA5_0 >= '0' && LA5_0 <= '9'))) {
>-						alt5 = 1;
>-					}
> 
>+ switch (alt5) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:13: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:679:13: '0' .. '9'
>-					{
>-						matchRange('0', '9');
>+ 	 }
>+ 	 break;
> 
>-					}
>-						break;
>+ 	default :
>+ 	 if ( cnt5 >= 1 ) break loop5;
>+ EarlyExitException eee =
>+ new EarlyExitException(5, input);
>+ throw eee;
>+ }
>+ cnt5++;
>+ } while (true);
> 
>-					default:
>-						if(cnt5 >= 1)
>-							break loop5;
>-						EarlyExitException eee = new EarlyExitException(5, input);
>-						throw eee;
>-					}
>-					cnt5++;
>-				} while(true);
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_INT"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "RULE_STRING"
>+ public final void mRULE_STRING() throws RecognitionException {
>+ try {
>+ int _type = RULE_STRING;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>-	// $ANTLR end RULE_INT
>+ if ( (LA8_0=='\"') ) {
>+ alt8=1;
>+ }
>+ else if ( (LA8_0=='\'') ) {
>+ alt8=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>-	// $ANTLR start RULE_STRING
>-	public final void mRULE_STRING() throws RecognitionException {
>-		try {
>-			int _type = RULE_STRING;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-				int alt8 = 2;
>-				int LA8_0 = input.LA(1);
>+ throw nvae;
>+ }
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ {
>+ match('\"'); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ loop6:
>+ do {
>+ int alt6=3;
>+ int LA6_0 = input.LA(1);
> 
>-				if((LA8_0 == '\"')) {
>-					alt8 = 1;
>-				} else if((LA8_0 == '\'')) {
>-					alt8 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("681:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ if ( (LA6_0=='\\') ) {
>+ alt6=1;
>+ }
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
>+ alt6=2;
>+ }
> 
>-					throw nvae;
>-				}
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>-				{
>-					match('\"');
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>-					loop6: do {
>-						int alt6 = 3;
>-						int LA6_0 = input.LA(1);
> 
>-						if((LA6_0 == '\\')) {
>-							alt6 = 1;
>-						} else if(((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '[') || (LA6_0 >= ']' && LA6_0 <= '\uFFFE'))) {
>-							alt6 = 2;
>-						}
>+ switch (alt6) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						switch(alt6) {
>-						case 1:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:21: '\\\\' ( '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 {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:66: ~ ( ( '\\\\' | '\"' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:62: ~ ( ( '\\\\' | '\"' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop6;
>+ }
>+ } while (true);
> 
>-						}
>-							break;
>+ match('\"'); 
> 
>-						default:
>-							break loop6;
>-						}
>-					} while(true);
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ {
>+ match('\''); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ loop7:
>+ do {
>+ int alt7=3;
>+ int LA7_0 = input.LA(1);
> 
>-					match('\"');
>+ if ( (LA7_0=='\\') ) {
>+ alt7=1;
>+ }
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
>+ alt7=2;
>+ }
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>-				{
>-					match('\'');
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>-					loop7: do {
>-						int alt7 = 3;
>-						int LA7_0 = input.LA(1);
> 
>-						if((LA7_0 == '\\')) {
>-							alt7 = 1;
>-						} else if(((LA7_0 >= '\u0000' && LA7_0 <= '&') || (LA7_0 >= '(' && LA7_0 <= '[') || (LA7_0 >= ']' && LA7_0 <= '\uFFFE'))) {
>-							alt7 = 2;
>-						}
>+ switch (alt7) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						switch(alt7) {
>-						case 1:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:88: '\\\\' ( '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 {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:137: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:681:129: ~ ( ( '\\\\' | '\\'' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop7;
>+ }
>+ } while (true);
> 
>-						}
>-							break;
>+ match('\''); 
> 
>-						default:
>-							break loop7;
>-						}
>-					} while(true);
>+ }
>+ break;
> 
>-					match('\'');
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_STRING"
> 
>-			}
>+ // $ANTLR start "RULE_ML_COMMENT"
>+ public final void mRULE_ML_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ {
>+ match("/*"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:24: ( options {greedy=false; } : . )*
>+ loop9:
>+ do {
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>-	// $ANTLR end RULE_STRING
>+ if ( (LA9_0=='*') ) {
>+ int LA9_1 = input.LA(2);
> 
>-	// $ANTLR start RULE_ML_COMMENT
>-	public final void mRULE_ML_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_ML_COMMENT;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:19: '/*' ( options {greedy=false; } : . )* '*/'
>-			{
>-				match("/*");
>+ if ( (LA9_1=='/') ) {
>+ alt9=2;
>+ }
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:24: ( options {greedy=false; } : . )*
>-				loop9: do {
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
> 
>-					if((LA9_0 == '*')) {
>-						int LA9_1 = input.LA(2);
>+ }
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-						if((LA9_1 == '/')) {
>-							alt9 = 2;
>-						} else if(((LA9_1 >= '\u0000' && LA9_1 <= '.') || (LA9_1 >= '0' && LA9_1 <= '\uFFFE'))) {
>-							alt9 = 1;
>-						}
> 
>+ switch (alt9) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:52: .
>+ 	 {
>+ 	 matchAny(); 
> 
>-					} else if(((LA9_0 >= '\u0000' && LA9_0 <= ')') || (LA9_0 >= '+' && LA9_0 <= '\uFFFE'))) {
>-						alt9 = 1;
>-					}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop9;
>+ }
>+ } while (true);
> 
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:683:52: .
>-					{
>-						matchAny();
>+ match("*/"); 
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop9;
>-					}
>-				} while(true);
>+ }
> 
>-				match("*/");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>+ // $ANTLR start "RULE_SL_COMMENT"
>+ public final void mRULE_SL_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ {
>+ match("//"); 
> 
>-			}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ loop10:
>+ do {
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
>+ alt10=1;
>+ }
> 
>-	// $ANTLR end RULE_ML_COMMENT
> 
>-	// $ANTLR start RULE_SL_COMMENT
>-	public final void mRULE_SL_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_SL_COMMENT;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>-			{
>-				match("//");
>+ switch (alt10) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685: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)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:24: (~ ( ( '\\n' | '\\r' ) ) )*
>-				loop10: do {
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					if(((LA10_0 >= '\u0000' && LA10_0 <= '\t') || (LA10_0 >= '\u000B' && LA10_0 <= '\f') || (LA10_0 >= '\u000E' && LA10_0 <= '\uFFFE'))) {
>-						alt10 = 1;
>-					}
> 
>+ 	 }
>+ 	 break;
> 
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685: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) <= '\uFFFE')) {
>-							input.consume();
>+ 	default :
>+ 	 break loop10;
>+ }
>+ } while (true);
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:40: ( ( '\\r' )? '\\n' )?
>+ int alt12=2;
>+ int LA12_0 = input.LA(1);
> 
>+ if ( (LA12_0=='\n'||LA12_0=='\r') ) {
>+ alt12=1;
>+ }
>+ switch (alt12) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:41: ( '\\r' )? '\\n'
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:41: ( '\\r' )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-					}
>-						break;
>+ if ( (LA11_0=='\r') ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:41: '\\r'
>+ {
>+ match('\r'); 
> 
>-					default:
>-						break loop10;
>-					}
>-				} while(true);
>+ }
>+ break;
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:40: ( ( '\\r' )? '\\n' )?
>-				int alt12 = 2;
>-				int LA12_0 = input.LA(1);
>+ }
> 
>-				if((LA12_0 == '\n' || LA12_0 == '\r')) {
>-					alt12 = 1;
>-				}
>-				switch(alt12) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:41: ( '\\r' )? '\\n'
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:41: ( '\\r' )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ match('\n'); 
> 
>-					if((LA11_0 == '\r')) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:685:41: '\\r'
>-					{
>-						match('\r');
>+ }
>+ break;
> 
>-					}
>-						break;
>+ }
> 
>-					}
> 
>-					match('\n');
>+ }
> 
>-				}
>-					break;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>-				}
>+ // $ANTLR start "RULE_WS"
>+ public final void mRULE_WS() throws RecognitionException {
>+ try {
>+ int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:687:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:687:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:687:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int cnt13=0;
>+ loop13:
>+ do {
>+ int alt13=2;
>+ int LA13_0 = input.LA(1);
> 
>+ if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
>+ alt13=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ switch (alt13) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:
>+ 	 {
>+ 	 if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
>+ 	 input.consume();
> 
>-	// $ANTLR end RULE_SL_COMMENT
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start RULE_WS
>-	public final void mRULE_WS() throws RecognitionException {
>-		try {
>-			int _type = RULE_WS;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:687:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:687:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:687:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-				int cnt13 = 0;
>-				loop13: do {
>-					int alt13 = 2;
>-					int LA13_0 = input.LA(1);
> 
>-					if(((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) {
>-						alt13 = 1;
>-					}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 if ( cnt13 >= 1 ) break loop13;
>+ EarlyExitException eee =
>+ new EarlyExitException(13, input);
>+ throw eee;
>+ }
>+ cnt13++;
>+ } while (true);
> 
>-					switch(alt13) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:
>-					{
>-						if((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
>-							input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_WS"
> 
>-					}
>-						break;
>+ // $ANTLR start "RULE_ANY_OTHER"
>+ public final void mRULE_ANY_OTHER() throws RecognitionException {
>+ try {
>+ int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:689:16: ( . )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:689:18: .
>+ {
>+ matchAny(); 
> 
>-					default:
>-						if(cnt13 >= 1)
>-							break loop13;
>-						EarlyExitException eee = new EarlyExitException(13, input);
>-						throw eee;
>-					}
>-					cnt13++;
>-				} while(true);
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
>-			}
>+ public void mTokens() throws RecognitionException {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ int alt14=15;
>+ alt14 = dfa14.predict(input);
>+ switch (alt14) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:10: T__12
>+ {
>+ mT__12(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:16: T__13
>+ {
>+ mT__13(); 
> 
>-	// $ANTLR end RULE_WS
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:22: T__14
>+ {
>+ mT__14(); 
> 
>-	// $ANTLR start RULE_ANY_OTHER
>-	public final void mRULE_ANY_OTHER() throws RecognitionException {
>-		try {
>-			int _type = RULE_ANY_OTHER;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:689:16: ( . )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:689:18: .
>-			{
>-				matchAny();
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:28: T__15
>+ {
>+ mT__15(); 
> 
>-			}
>+ }
>+ break;
>+ case 5 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:34: T__16
>+ {
>+ mT__16(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 6 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:40: T__17
>+ {
>+ mT__17(); 
> 
>-	// $ANTLR end RULE_ANY_OTHER
>+ }
>+ break;
>+ case 7 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:46: T__18
>+ {
>+ mT__18(); 
> 
>-	public void mTokens() throws RecognitionException {
>-		// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:8: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>-		int alt14 = 15;
>-		alt14 = dfa14.predict(input);
>-		switch(alt14) {
>-		case 1:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:10: T12
>-		{
>-			mT12();
>+ }
>+ break;
>+ case 8 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:52: RULE_UNLIMITEDLITERAL
>+ {
>+ mRULE_UNLIMITEDLITERAL(); 
> 
>-		}
>-			break;
>-		case 2:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:14: T13
>-		{
>-			mT13();
>+ }
>+ break;
>+ case 9 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:74: RULE_ID
>+ {
>+ mRULE_ID(); 
> 
>-		}
>-			break;
>-		case 3:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:18: T14
>-		{
>-			mT14();
>+ }
>+ break;
>+ case 10 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:82: RULE_INT
>+ {
>+ mRULE_INT(); 
> 
>-		}
>-			break;
>-		case 4:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:22: T15
>-		{
>-			mT15();
>+ }
>+ break;
>+ case 11 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:91: RULE_STRING
>+ {
>+ mRULE_STRING(); 
> 
>-		}
>-			break;
>-		case 5:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:26: T16
>-		{
>-			mT16();
>+ }
>+ break;
>+ case 12 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:103: RULE_ML_COMMENT
>+ {
>+ mRULE_ML_COMMENT(); 
> 
>-		}
>-			break;
>-		case 6:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:30: T17
>-		{
>-			mT17();
>+ }
>+ break;
>+ case 13 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:119: RULE_SL_COMMENT
>+ {
>+ mRULE_SL_COMMENT(); 
> 
>-		}
>-			break;
>-		case 7:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:34: T18
>-		{
>-			mT18();
>+ }
>+ break;
>+ case 14 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:135: RULE_WS
>+ {
>+ mRULE_WS(); 
> 
>-		}
>-			break;
>-		case 8:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:38: RULE_UNLIMITEDLITERAL
>-		{
>-			mRULE_UNLIMITEDLITERAL();
>+ }
>+ break;
>+ case 15 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:143: RULE_ANY_OTHER
>+ {
>+ mRULE_ANY_OTHER(); 
> 
>-		}
>-			break;
>-		case 9:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:60: RULE_ID
>-		{
>-			mRULE_ID();
>+ }
>+ break;
> 
>-		}
>-			break;
>-		case 10:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:68: RULE_INT
>-		{
>-			mRULE_INT();
>+ }
> 
>-		}
>-			break;
>-		case 11:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:77: RULE_STRING
>-		{
>-			mRULE_STRING();
>+ }
> 
>-		}
>-			break;
>-		case 12:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:89: RULE_ML_COMMENT
>-		{
>-			mRULE_ML_COMMENT();
> 
>-		}
>-			break;
>-		case 13:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:105: RULE_SL_COMMENT
>-		{
>-			mRULE_SL_COMMENT();
>+ protected DFA14 dfa14 = new DFA14(this);
>+ static final String DFA14_eotS =
>+ "\1\uffff\1\17\4\uffff\1\26\1\30\1\uffff\1\17\1\uffff\3\17\11\uffff"+
>+ "\1\30\6\uffff";
>+ static final String DFA14_eofS =
>+ "\36\uffff";
>+ static final String DFA14_minS =
>+ "\1\0\1\125\4\uffff\1\72\1\60\1\uffff\1\101\1\uffff\2\0\1\52\11"+
>+ "\uffff\1\60\6\uffff";
>+ static final String DFA14_maxS =
>+ "\1\uffff\1\125\4\uffff\1\72\1\71\1\uffff\1\172\1\uffff\2\uffff"+
>+ "\1\57\11\uffff\1\71\6\uffff";
>+ static final String DFA14_acceptS =
>+ "\2\uffff\1\2\1\3\1\4\1\5\2\uffff\1\10\1\uffff\1\11\3\uffff\1\16"+
>+ "\1\17\1\1\1\2\1\3\1\4\1\5\1\7\1\6\1\uffff\1\10\1\11\1\13\1\14\1"+
>+ "\15\1\16";
>+ static final String DFA14_specialS =
>+ "\1\1\12\uffff\1\0\1\2\21\uffff}>";
>+ static final String[] DFA14_transitionS = {
>+ "\11\17\2\16\2\17\1\16\22\17\1\16\1\17\1\13\1\4\3\17\1\14\2"+
>+ "\17\1\10\1\2\1\17\1\3\1\17\1\15\12\7\1\6\1\17\1\1\4\17\32\12"+
>+ "\3\17\1\11\1\12\1\17\32\12\3\17\1\5\uff81\17",
>+ "\1\20",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\25",
>+ "\12\27",
>+ "",
>+ "\32\31\4\uffff\1\31\1\uffff\32\31",
>+ "",
>+ "\0\32",
>+ "\0\32",
>+ "\1\33\4\uffff\1\34",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\12\27",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ ""
>+ };
> 
>-		}
>-			break;
>-		case 14:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:121: RULE_WS
>-		{
>-			mRULE_WS();
>+ static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ static final short[][] DFA14_transition;
> 
>-		}
>-			break;
>-		case 15:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:1:129: RULE_ANY_OTHER
>-		{
>-			mRULE_ANY_OTHER();
>+ static {
>+ int numStates = DFA14_transitionS.length;
>+ DFA14_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>+ }
>+ }
> 
>-		}
>-			break;
>+ class DFA14 extends DFA {
> 
>-		}
>+ public DFA14(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 14;
>+ this.eot = DFA14_eot;
>+ this.eof = DFA14_eof;
>+ this.min = DFA14_min;
>+ this.max = DFA14_max;
>+ this.accept = DFA14_accept;
>+ this.special = DFA14_special;
>+ this.transition = DFA14_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_11 = input.LA(1);
> 
>-	}
>+ s = -1;
>+ if ( ((LA14_11>='\u0000' && LA14_11<='\uFFFF')) ) {s = 26;}
> 
>+ else s = 15;
> 
>-	protected DFA14 dfa14 = new DFA14(this);
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_0 = input.LA(1);
> 
>-	static final String DFA14_eotS = "\1\uffff\1\17\4\uffff\1\26\1\30\1\uffff\1\17\1\uffff\3\17\11\uffff" + "\1\30\6\uffff";
>+ s = -1;
>+ if ( (LA14_0=='<') ) {s = 1;}
> 
>-	static final String DFA14_eofS = "\36\uffff";
>+ else if ( (LA14_0=='+') ) {s = 2;}
> 
>-	static final String DFA14_minS = "\1\0\1\125\4\uffff\1\72\1\60\1\uffff\1\101\1\uffff\2\0\1\52\11\uffff" + "\1\60\6\uffff";
>+ else if ( (LA14_0=='-') ) {s = 3;}
> 
>-	static final String DFA14_maxS = "\1\ufffe\1\125\4\uffff\1\72\1\71\1\uffff\1\172\1\uffff\2\ufffe\1" + "\57\11\uffff\1\71\6\uffff";
>+ else if ( (LA14_0=='#') ) {s = 4;}
> 
>-	static final String DFA14_acceptS = "\2\uffff\1\2\1\3\1\4\1\5\2\uffff\1\10\1\uffff\1\11\3\uffff\1\16" + "\1\17\1\1\1\2\1\3\1\4\1\5\1\7\1\6\1\uffff\1\10\1\11\1\13\1\15\1" + "\14\1\16";
>+ else if ( (LA14_0=='~') ) {s = 5;}
> 
>-	static final String DFA14_specialS = "\36\uffff}>";
>+ else if ( (LA14_0==':') ) {s = 6;}
> 
>-	static final String[] DFA14_transitionS = { "\11\17\2\16\2\17\1\16\22\17\1\16\1\17\1\13\1\4\3\17\1\14\2\17" + "\1\10\1\2\1\17\1\3\1\17\1\15\12\7\1\6\1\17\1\1\4\17\32\12\3" + "\17\1\11\1\12\1\17\32\12\3\17\1\5\uff80\17", "\1\20", "", "", "", "", "\1\25", "\12\27", "", "\32\31\4\uffff\1\31\1\uffff\32\31", "", "\uffff\32", "\uffff\32", "\1\34\4\uffff\1\33", "", "", "", "", "", "", "", "", "", "\12\27", "", "", "", "", "", "" };
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 7;}
> 
>-	static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ else if ( (LA14_0=='*') ) {s = 8;}
> 
>-	static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ else if ( (LA14_0=='^') ) {s = 9;}
> 
>-	static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')) ) {s = 10;}
> 
>-	static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ else if ( (LA14_0=='\"') ) {s = 11;}
> 
>-	static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ else if ( (LA14_0=='\'') ) {s = 12;}
> 
>-	static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ else if ( (LA14_0=='/') ) {s = 13;}
> 
>-	static final short[][] DFA14_transition;
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 14;}
> 
>-	static {
>-		int numStates = DFA14_transitionS.length;
>-		DFA14_transition = new short[numStates][];
>-		for(int i = 0; i < numStates; i++) {
>-			DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>-		}
>-	}
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='$' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||LA14_0==','||LA14_0=='.'||LA14_0==';'||(LA14_0>='=' && LA14_0<='@')||(LA14_0>='[' && LA14_0<=']')||LA14_0=='`'||(LA14_0>='{' && LA14_0<='}')||(LA14_0>='\u007F' && LA14_0<='\uFFFF')) ) {s = 15;}
> 
>-	class DFA14 extends DFA {
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_12 = input.LA(1);
> 
>-		public DFA14(BaseRecognizer recognizer) {
>-			this.recognizer = recognizer;
>-			this.decisionNumber = 14;
>-			this.eot = DFA14_eot;
>-			this.eof = DFA14_eof;
>-			this.min = DFA14_min;
>-			this.max = DFA14_max;
>-			this.accept = DFA14_accept;
>-			this.special = DFA14_special;
>-			this.transition = DFA14_transition;
>-		}
>+ s = -1;
>+ if ( ((LA14_12>='\u0000' && LA14_12<='\uFFFF')) ) {s = 26;}
> 
>-		public String getDescription() {
>-			return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>-		}
>-	}
>+ else s = 15;
> 
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
>+ 
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUseParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUseParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUseParser.java	(working copy)
>@@ -1,1771 +1,1801 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal;
>+package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal; 
> 
>-import org.antlr.runtime.BitSet;
>-import org.antlr.runtime.NoViableAltException;
>-import org.antlr.runtime.RecognitionException;
>-import org.antlr.runtime.TokenStream;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
>-import org.eclipse.xtext.Grammar;
>+import java.io.InputStream;
>+import org.eclipse.xtext.*;
>+import org.eclipse.xtext.parser.*;
>+import org.eclipse.xtext.parser.impl.*;
>+import org.eclipse.xtext.parsetree.*;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
>-
>-@SuppressWarnings("all")
>-public class InternalUmlCollaborationUseParser extends AbstractInternalContentAssistParser {
>-
>-	public static final String[] tokenNames = new String[]{ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'", "':'", "'::'" };
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlCollaborationUseParser(TokenStream input) {
>-		super(input);
>-	}
>-
>-
>-	public String[] getTokenNames() {
>-		return tokenNames;
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g";
>-	}
>-
>-
>-
>-	private UmlCollaborationUseGrammarAccess grammarAccess;
>-
>-	public void setGrammarAccess(UmlCollaborationUseGrammarAccess grammarAccess) {
>-		this.grammarAccess = grammarAccess;
>-	}
>-
>-	@Override
>-	protected Grammar getGrammar() {
>-		return grammarAccess.getGrammar();
>-	}
>-
>-	@Override
>-	protected String getValueForTokenName(String tokenName) {
>-		return tokenName;
>-	}
>-
>-
>-
>-
>-	// $ANTLR start entryRuleCollaborationUseRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:61:1: entryRuleCollaborationUseRule : ruleCollaborationUseRule EOF ;
>-	public final void entryRuleCollaborationUseRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:62:1: ( ruleCollaborationUseRule EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:63:1: ruleCollaborationUseRule EOF
>-			{
>-				before(grammarAccess.getCollaborationUseRuleRule());
>-				pushFollow(FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule61);
>-				ruleCollaborationUseRule();
>-				_fsp--;
>-
>-				after(grammarAccess.getCollaborationUseRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleCollaborationUseRule68);
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end entryRuleCollaborationUseRule
>-
>-
>-	// $ANTLR start ruleCollaborationUseRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:70:1: ruleCollaborationUseRule : ( ( rule__CollaborationUseRule__Group__0 ) ) ;
>-	public final void ruleCollaborationUseRule() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:74:2: ( ( ( rule__CollaborationUseRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:75:1: ( ( rule__CollaborationUseRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:75:1: ( ( rule__CollaborationUseRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:76:1: ( rule__CollaborationUseRule__Group__0 )
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:77:1: ( rule__CollaborationUseRule__Group__0 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:77:2: rule__CollaborationUseRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__CollaborationUseRule__Group__0_in_ruleCollaborationUseRule94);
>-						rule__CollaborationUseRule__Group__0();
>-						_fsp--;
>-
>-
>-					}
>-
>-					after(grammarAccess.getCollaborationUseRuleAccess().getGroup());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end ruleCollaborationUseRule
>-
>-
>-	// $ANTLR start entryRuleTypeRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:89:1: entryRuleTypeRule : ruleTypeRule EOF ;
>-	public final void entryRuleTypeRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:90:1: ( ruleTypeRule EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:91:1: ruleTypeRule EOF
>-			{
>-				before(grammarAccess.getTypeRuleRule());
>-				pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule121);
>-				ruleTypeRule();
>-				_fsp--;
>-
>-				after(grammarAccess.getTypeRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleTypeRule128);
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end entryRuleTypeRule
>-
>-
>-	// $ANTLR start ruleTypeRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:98:1: ruleTypeRule : ( ( rule__TypeRule__Group__0 ) ) ;
>-	public final void ruleTypeRule() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:102:2: ( ( ( rule__TypeRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:103:1: ( ( rule__TypeRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:103:1: ( ( rule__TypeRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:104:1: ( rule__TypeRule__Group__0 )
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:105:1: ( rule__TypeRule__Group__0 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:105:2: rule__TypeRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule154);
>-						rule__TypeRule__Group__0();
>-						_fsp--;
>-
>-
>-					}
>-
>-					after(grammarAccess.getTypeRuleAccess().getGroup());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end ruleTypeRule
>-
>-
>-	// $ANTLR start entryRuleQualifiedName
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:117:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
>-	public final void entryRuleQualifiedName() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:118:1: ( ruleQualifiedName EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:119:1: ruleQualifiedName EOF
>-			{
>-				before(grammarAccess.getQualifiedNameRule());
>-				pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName181);
>-				ruleQualifiedName();
>-				_fsp--;
>-
>-				after(grammarAccess.getQualifiedNameRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName188);
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end entryRuleQualifiedName
>-
>-
>-	// $ANTLR start ruleQualifiedName
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:126:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
>-	public final void ruleQualifiedName() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:130:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:131:1: ( ( rule__QualifiedName__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:131:1: ( ( rule__QualifiedName__Group__0 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:132:1: ( rule__QualifiedName__Group__0 )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getGroup());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:133:1: ( rule__QualifiedName__Group__0 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:133:2: rule__QualifiedName__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName214);
>-						rule__QualifiedName__Group__0();
>-						_fsp--;
>-
>-
>-					}
>-
>-					after(grammarAccess.getQualifiedNameAccess().getGroup());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end ruleQualifiedName
>-
>-
>-	// $ANTLR start entryRuleBoundSpecification
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:147:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
>-	public final void entryRuleBoundSpecification() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:148:1: ( ruleBoundSpecification EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:149:1: ruleBoundSpecification EOF
>-			{
>-				before(grammarAccess.getBoundSpecificationRule());
>-				pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification243);
>-				ruleBoundSpecification();
>-				_fsp--;
>-
>-				after(grammarAccess.getBoundSpecificationRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleBoundSpecification250);
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end entryRuleBoundSpecification
>-
>-
>-	// $ANTLR start ruleBoundSpecification
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:156:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
>-	public final void ruleBoundSpecification() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:160:2: ( ( ( rule__BoundSpecification__ValueAssignment ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:161:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:161:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:162:1: ( rule__BoundSpecification__ValueAssignment )
>-				{
>-					before(grammarAccess.getBoundSpecificationAccess().getValueAssignment());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:163:1: ( rule__BoundSpecification__ValueAssignment )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:163:2: rule__BoundSpecification__ValueAssignment
>-					{
>-						pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification276);
>-						rule__BoundSpecification__ValueAssignment();
>-						_fsp--;
>-
>-
>-					}
>+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
> 
>-					after(grammarAccess.getBoundSpecificationAccess().getValueAssignment());
> 
>-				}
> 
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-			}
>+@SuppressWarnings("all")
>+public class InternalUmlCollaborationUseParser extends AbstractInternalContentAssistParser {
>+ public static final String[] tokenNames = new String[] {
>+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'", "':'", "'::'"
>+ };
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ 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__17=17;
>+ 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_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // delegates
>+ // delegators
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ public InternalUmlCollaborationUseParser(TokenStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCollaborationUseParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
>+ }
>+ 
> 
>-	// $ANTLR end ruleBoundSpecification
>+ public String[] getTokenNames() { return InternalUmlCollaborationUseParser.tokenNames; }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g"; }
> 
> 
>-	// $ANTLR start ruleVisibilityKind
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:176:1: ruleVisibilityKind : ( ( rule__VisibilityKind__Alternatives ) ) ;
>-	public final void ruleVisibilityKind() throws RecognitionException {
>+ 
>+ 	private UmlCollaborationUseGrammarAccess grammarAccess;
>+ 	
>+ public void setGrammarAccess(UmlCollaborationUseGrammarAccess grammarAccess) {
>+ 	this.grammarAccess = grammarAccess;
>+ }
>+ 
>+ @Override
>+ protected Grammar getGrammar() {
>+ 	return grammarAccess.getGrammar();
>+ }
>+ 
>+ @Override
>+ protected String getValueForTokenName(String tokenName) {
>+ 	return tokenName;
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:180:1: ( ( ( rule__VisibilityKind__Alternatives ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:181:1: ( ( rule__VisibilityKind__Alternatives ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:181:1: ( ( rule__VisibilityKind__Alternatives ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:182:1: ( rule__VisibilityKind__Alternatives )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getAlternatives());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:183:1: ( rule__VisibilityKind__Alternatives )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:183:2: rule__VisibilityKind__Alternatives
>-					{
>-						pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind313);
>-						rule__VisibilityKind__Alternatives();
>-						_fsp--;
> 
> 
>-					}
>+ // $ANTLR start "entryRuleCollaborationUseRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:61:1: entryRuleCollaborationUseRule : ruleCollaborationUseRule EOF ;
>+ public final void entryRuleCollaborationUseRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:62:1: ( ruleCollaborationUseRule EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:63:1: ruleCollaborationUseRule EOF
>+ {
>+ before(grammarAccess.getCollaborationUseRuleRule()); 
>+ pushFollow(FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule61);
>+ ruleCollaborationUseRule();
> 
>-					after(grammarAccess.getVisibilityKindAccess().getAlternatives());
>+ state._fsp--;
> 
>-				}
>+ after(grammarAccess.getCollaborationUseRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleCollaborationUseRule68); 
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleCollaborationUseRule"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "ruleCollaborationUseRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:70:1: ruleCollaborationUseRule : ( ( rule__CollaborationUseRule__Group__0 ) ) ;
>+ public final void ruleCollaborationUseRule() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:74:2: ( ( ( rule__CollaborationUseRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:75:1: ( ( rule__CollaborationUseRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:75:1: ( ( rule__CollaborationUseRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:76:1: ( rule__CollaborationUseRule__Group__0 )
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:77:1: ( rule__CollaborationUseRule__Group__0 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:77:2: rule__CollaborationUseRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__0_in_ruleCollaborationUseRule94);
>+ rule__CollaborationUseRule__Group__0();
> 
>-	// $ANTLR end ruleVisibilityKind
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__Alternatives_3
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:196:1: rule__CollaborationUseRule__Alternatives_3 : ( ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) ) | ( '<Undefined>' ) );
>-	public final void rule__CollaborationUseRule__Alternatives_3() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getCollaborationUseRuleAccess().getGroup()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:200:1: ( ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) ) | ( '<Undefined>' ) )
>-			int alt1 = 2;
>-			int LA1_0 = input.LA(1);
>+ }
> 
>-			if((LA1_0 == RULE_ID)) {
>-				alt1 = 1;
>-			} else if((LA1_0 == 12)) {
>-				alt1 = 2;
>-			} else {
>-				NoViableAltException nvae = new NoViableAltException("196:1: rule__CollaborationUseRule__Alternatives_3 : ( ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) ) | ( '<Undefined>' ) );", 1, 0, input);
> 
>-				throw nvae;
>-			}
>-			switch(alt1) {
>-			case 1:
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:201:1: ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:201:1: ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:202:1: ( rule__CollaborationUseRule__TypeAssignment_3_0 )
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getTypeAssignment_3_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:203:1: ( rule__CollaborationUseRule__TypeAssignment_3_0 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:203:2: rule__CollaborationUseRule__TypeAssignment_3_0
>-					{
>-						pushFollow(FOLLOW_rule__CollaborationUseRule__TypeAssignment_3_0_in_rule__CollaborationUseRule__Alternatives_3350);
>-						rule__CollaborationUseRule__TypeAssignment_3_0();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getCollaborationUseRuleAccess().getTypeAssignment_3_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleCollaborationUseRule"
> 
>-				}
> 
>+ // $ANTLR start "entryRuleTypeRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:89:1: entryRuleTypeRule : ruleTypeRule EOF ;
>+ public final void entryRuleTypeRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:90:1: ( ruleTypeRule EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:91:1: ruleTypeRule EOF
>+ {
>+ before(grammarAccess.getTypeRuleRule()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule121);
>+ ruleTypeRule();
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:207:6: ( '<Undefined>' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:207:6: ( '<Undefined>' )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:208:1: '<Undefined>'
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1());
>-					match(input, 12, FOLLOW_12_in_rule__CollaborationUseRule__Alternatives_3369);
>-					after(grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1());
>+ state._fsp--;
> 
>-				}
>+ after(grammarAccess.getTypeRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule128); 
> 
>+ }
> 
>-			}
>-				break;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleTypeRule"
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "ruleTypeRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:98:1: ruleTypeRule : ( ( rule__TypeRule__Group__0 ) ) ;
>+ public final void ruleTypeRule() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:102:2: ( ( ( rule__TypeRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:103:1: ( ( rule__TypeRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:103:1: ( ( rule__TypeRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:104:1: ( rule__TypeRule__Group__0 )
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:105:1: ( rule__TypeRule__Group__0 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:105:2: rule__TypeRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule154);
>+ rule__TypeRule__Group__0();
> 
>-	// $ANTLR end rule__CollaborationUseRule__Alternatives_3
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__VisibilityKind__Alternatives
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:220:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );
>-	public final void rule__VisibilityKind__Alternatives() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getTypeRuleAccess().getGroup()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:224:1: ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) )
>-			int alt2 = 4;
>-			switch(input.LA(1)) {
>-			case 13:
>-			{
>-				alt2 = 1;
>-			}
>-				break;
>-			case 14:
>-			{
>-				alt2 = 2;
>-			}
>-				break;
>-			case 15:
>-			{
>-				alt2 = 3;
>-			}
>-				break;
>-			case 16:
>-			{
>-				alt2 = 4;
>-			}
>-				break;
>-			default:
>-				NoViableAltException nvae = new NoViableAltException("220:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );", 2, 0, input);
>+ }
> 
>-				throw nvae;
>-			}
> 
>-			switch(alt2) {
>-			case 1:
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:225:1: ( ( '+' ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:225:1: ( ( '+' ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:226:1: ( '+' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:227:1: ( '+' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:227:3: '+'
>-					{
>-						match(input, 13, FOLLOW_13_in_rule__VisibilityKind__Alternatives404);
>+ }
> 
>-					}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					after(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0());
>+ 	restoreStackSize(stackSize);
> 
>-				}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleTypeRule"
> 
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:232:6: ( ( '-' ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:232:6: ( ( '-' ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:233:1: ( '-' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:234:1: ( '-' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:234:3: '-'
>-					{
>-						match(input, 14, FOLLOW_14_in_rule__VisibilityKind__Alternatives425);
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:117:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
>+ public final void entryRuleQualifiedName() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:118:1: ( ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:119:1: ruleQualifiedName EOF
>+ {
>+ before(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName181);
>+ ruleQualifiedName();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1());
>+ after(grammarAccess.getQualifiedNameRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName188); 
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleQualifiedName"
> 
>-			}
>-				break;
>-			case 3:
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:239:6: ( ( '#' ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:239:6: ( ( '#' ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:240:1: ( '#' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:241:1: ( '#' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:241:3: '#'
>-					{
>-						match(input, 15, FOLLOW_15_in_rule__VisibilityKind__Alternatives446);
> 
>-					}
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:126:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
>+ public final void ruleQualifiedName() throws RecognitionException {
> 
>-					after(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2());
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:130:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:131:1: ( ( rule__QualifiedName__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:131:1: ( ( rule__QualifiedName__Group__0 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:132:1: ( rule__QualifiedName__Group__0 )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:133:1: ( rule__QualifiedName__Group__0 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:133:2: rule__QualifiedName__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName214);
>+ rule__QualifiedName__Group__0();
> 
>-				}
>+ state._fsp--;
> 
> 
>-			}
>-				break;
>-			case 4:
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:246:6: ( ( '~' ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:246:6: ( ( '~' ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:247:1: ( '~' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:248:1: ( '~' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:248:3: '~'
>-					{
>-						match(input, 16, FOLLOW_16_in_rule__VisibilityKind__Alternatives467);
>+ }
> 
>-					}
>+ after(grammarAccess.getQualifiedNameAccess().getGroup()); 
> 
>-					after(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3());
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>-				break;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleQualifiedName"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__VisibilityKind__Alternatives
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:147:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
>+ public final void entryRuleBoundSpecification() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:148:1: ( ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:149:1: ruleBoundSpecification EOF
>+ {
>+ before(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification243);
>+ ruleBoundSpecification();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:261:1: rule__CollaborationUseRule__Group__0 : rule__CollaborationUseRule__Group__0__Impl rule__CollaborationUseRule__Group__1 ;
>-	public final void rule__CollaborationUseRule__Group__0() throws RecognitionException {
>+ after(grammarAccess.getBoundSpecificationRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification250); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:265:1: ( rule__CollaborationUseRule__Group__0__Impl rule__CollaborationUseRule__Group__1 )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:266:2: rule__CollaborationUseRule__Group__0__Impl rule__CollaborationUseRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__0__Impl_in_rule__CollaborationUseRule__Group__0501);
>-				rule__CollaborationUseRule__Group__0__Impl();
>-				_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__1_in_rule__CollaborationUseRule__Group__0504);
>-				rule__CollaborationUseRule__Group__1();
>-				_fsp--;
> 
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:156:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
>+ public final void ruleBoundSpecification() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:160:2: ( ( ( rule__BoundSpecification__ValueAssignment ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:161:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:161:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:162:1: ( rule__BoundSpecification__ValueAssignment )
>+ {
>+ before(grammarAccess.getBoundSpecificationAccess().getValueAssignment()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:163:1: ( rule__BoundSpecification__ValueAssignment )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:163:2: rule__BoundSpecification__ValueAssignment
>+ {
>+ pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification276);
>+ rule__BoundSpecification__ValueAssignment();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__0
>+ after(grammarAccess.getBoundSpecificationAccess().getValueAssignment()); 
> 
>+ }
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:273:1: rule__CollaborationUseRule__Group__0__Impl : ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) ) ;
>-	public final void rule__CollaborationUseRule__Group__0__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:277:1: ( ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:278:1: ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:278:1: ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:279:1: ( rule__CollaborationUseRule__VisibilityAssignment_0 )
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getVisibilityAssignment_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:280:1: ( rule__CollaborationUseRule__VisibilityAssignment_0 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:280:2: rule__CollaborationUseRule__VisibilityAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__CollaborationUseRule__VisibilityAssignment_0_in_rule__CollaborationUseRule__Group__0__Impl531);
>-						rule__CollaborationUseRule__VisibilityAssignment_0();
>-						_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-					}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleBoundSpecification"
> 
>-					after(grammarAccess.getCollaborationUseRuleAccess().getVisibilityAssignment_0());
> 
>-				}
>+ // $ANTLR start "ruleVisibilityKind"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:176:1: ruleVisibilityKind : ( ( rule__VisibilityKind__Alternatives ) ) ;
>+ public final void ruleVisibilityKind() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:180:1: ( ( ( rule__VisibilityKind__Alternatives ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:181:1: ( ( rule__VisibilityKind__Alternatives ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:181:1: ( ( rule__VisibilityKind__Alternatives ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:182:1: ( rule__VisibilityKind__Alternatives )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getAlternatives()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:183:1: ( rule__VisibilityKind__Alternatives )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:183:2: rule__VisibilityKind__Alternatives
>+ {
>+ pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind313);
>+ rule__VisibilityKind__Alternatives();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getVisibilityKindAccess().getAlternatives()); 
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__0__Impl
>+ }
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__1
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:290:1: rule__CollaborationUseRule__Group__1 : rule__CollaborationUseRule__Group__1__Impl rule__CollaborationUseRule__Group__2 ;
>-	public final void rule__CollaborationUseRule__Group__1() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:294:1: ( rule__CollaborationUseRule__Group__1__Impl rule__CollaborationUseRule__Group__2 )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:295:2: rule__CollaborationUseRule__Group__1__Impl rule__CollaborationUseRule__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__1__Impl_in_rule__CollaborationUseRule__Group__1561);
>-				rule__CollaborationUseRule__Group__1__Impl();
>-				_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__2_in_rule__CollaborationUseRule__Group__1564);
>-				rule__CollaborationUseRule__Group__2();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleVisibilityKind"
> 
> 
>-			}
>+ // $ANTLR start "rule__CollaborationUseRule__Alternatives_3"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:196:1: rule__CollaborationUseRule__Alternatives_3 : ( ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) ) | ( '<Undefined>' ) );
>+ public final void rule__CollaborationUseRule__Alternatives_3() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:200:1: ( ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) ) | ( '<Undefined>' ) )
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-			restoreStackSize(stackSize);
>+ if ( (LA1_0==RULE_ID) ) {
>+ alt1=1;
>+ }
>+ else if ( (LA1_0==12) ) {
>+ alt1=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 1, 0, input);
> 
>-		}
>-		return;
>-	}
>+ throw nvae;
>+ }
>+ switch (alt1) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:201:1: ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:201:1: ( ( rule__CollaborationUseRule__TypeAssignment_3_0 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:202:1: ( rule__CollaborationUseRule__TypeAssignment_3_0 )
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getTypeAssignment_3_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:203:1: ( rule__CollaborationUseRule__TypeAssignment_3_0 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:203:2: rule__CollaborationUseRule__TypeAssignment_3_0
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__TypeAssignment_3_0_in_rule__CollaborationUseRule__Alternatives_3350);
>+ rule__CollaborationUseRule__TypeAssignment_3_0();
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__1
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:302:1: rule__CollaborationUseRule__Group__1__Impl : ( ( rule__CollaborationUseRule__NameAssignment_1 ) ) ;
>-	public final void rule__CollaborationUseRule__Group__1__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getCollaborationUseRuleAccess().getTypeAssignment_3_0()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:306:1: ( ( ( rule__CollaborationUseRule__NameAssignment_1 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:307:1: ( ( rule__CollaborationUseRule__NameAssignment_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:307:1: ( ( rule__CollaborationUseRule__NameAssignment_1 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:308:1: ( rule__CollaborationUseRule__NameAssignment_1 )
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getNameAssignment_1());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:309:1: ( rule__CollaborationUseRule__NameAssignment_1 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:309:2: rule__CollaborationUseRule__NameAssignment_1
>-					{
>-						pushFollow(FOLLOW_rule__CollaborationUseRule__NameAssignment_1_in_rule__CollaborationUseRule__Group__1__Impl591);
>-						rule__CollaborationUseRule__NameAssignment_1();
>-						_fsp--;
>+ }
> 
> 
>-					}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:207:6: ( '<Undefined>' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:207:6: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:208:1: '<Undefined>'
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1()); 
>+ match(input,12,FOLLOW_12_in_rule__CollaborationUseRule__Alternatives_3369); 
>+ after(grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1()); 
> 
>-					after(grammarAccess.getCollaborationUseRuleAccess().getNameAssignment_1());
>+ }
> 
>-				}
> 
>+ }
>+ break;
> 
>-			}
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Alternatives_3"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__1__Impl
>+ // $ANTLR start "rule__VisibilityKind__Alternatives"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:220:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );
>+ public final void rule__VisibilityKind__Alternatives() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:224:1: ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) )
>+ int alt2=4;
>+ switch ( input.LA(1) ) {
>+ case 13:
>+ {
>+ alt2=1;
>+ }
>+ break;
>+ case 14:
>+ {
>+ alt2=2;
>+ }
>+ break;
>+ case 15:
>+ {
>+ alt2=3;
>+ }
>+ break;
>+ case 16:
>+ {
>+ alt2=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__2
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:319:1: rule__CollaborationUseRule__Group__2 : rule__CollaborationUseRule__Group__2__Impl rule__CollaborationUseRule__Group__3 ;
>-	public final void rule__CollaborationUseRule__Group__2() throws RecognitionException {
>+ throw nvae;
>+ }
> 
>-		int stackSize = keepStackSize();
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:225:1: ( ( '+' ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:225:1: ( ( '+' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:226:1: ( '+' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:227:1: ( '+' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:227:3: '+'
>+ {
>+ match(input,13,FOLLOW_13_in_rule__VisibilityKind__Alternatives404); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:323:1: ( rule__CollaborationUseRule__Group__2__Impl rule__CollaborationUseRule__Group__3 )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:324:2: rule__CollaborationUseRule__Group__2__Impl rule__CollaborationUseRule__Group__3
>-			{
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__2__Impl_in_rule__CollaborationUseRule__Group__2621);
>-				rule__CollaborationUseRule__Group__2__Impl();
>-				_fsp--;
>+ }
> 
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__3_in_rule__CollaborationUseRule__Group__2624);
>-				rule__CollaborationUseRule__Group__3();
>-				_fsp--;
>+ after(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:232:6: ( ( '-' ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:232:6: ( ( '-' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:233:1: ( '-' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:234:1: ( '-' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:234:3: '-'
>+ {
>+ match(input,14,FOLLOW_14_in_rule__VisibilityKind__Alternatives425); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__2
>+ }
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__2__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:331:1: rule__CollaborationUseRule__Group__2__Impl : ( ':' ) ;
>-	public final void rule__CollaborationUseRule__Group__2__Impl() throws RecognitionException {
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:239:6: ( ( '#' ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:239:6: ( ( '#' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:240:1: ( '#' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:241:1: ( '#' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:241:3: '#'
>+ {
>+ match(input,15,FOLLOW_15_in_rule__VisibilityKind__Alternatives446); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:335:1: ( ( ':' ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:336:1: ( ':' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:336:1: ( ':' )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:337:1: ':'
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2());
>-					match(input, 17, FOLLOW_17_in_rule__CollaborationUseRule__Group__2__Impl652);
>-					after(grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2());
>+ after(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
> 
>-				}
>+ }
> 
> 
>-			}
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:246:6: ( ( '~' ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:246:6: ( ( '~' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:247:1: ( '~' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:248:1: ( '~' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:248:3: '~'
>+ {
>+ match(input,16,FOLLOW_16_in_rule__VisibilityKind__Alternatives467); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__2__Impl
> 
>+ }
>+ break;
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__3
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:350:1: rule__CollaborationUseRule__Group__3 : rule__CollaborationUseRule__Group__3__Impl ;
>-	public final void rule__CollaborationUseRule__Group__3() throws RecognitionException {
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:354:1: ( rule__CollaborationUseRule__Group__3__Impl )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:355:2: rule__CollaborationUseRule__Group__3__Impl
>-			{
>-				pushFollow(FOLLOW_rule__CollaborationUseRule__Group__3__Impl_in_rule__CollaborationUseRule__Group__3683);
>-				rule__CollaborationUseRule__Group__3__Impl();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__VisibilityKind__Alternatives"
> 
> 
>-			}
>+ // $ANTLR start "rule__CollaborationUseRule__Group__0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:261:1: rule__CollaborationUseRule__Group__0 : rule__CollaborationUseRule__Group__0__Impl rule__CollaborationUseRule__Group__1 ;
>+ public final void rule__CollaborationUseRule__Group__0() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:265:1: ( rule__CollaborationUseRule__Group__0__Impl rule__CollaborationUseRule__Group__1 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:266:2: rule__CollaborationUseRule__Group__0__Impl rule__CollaborationUseRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__0__Impl_in_rule__CollaborationUseRule__Group__0501);
>+ rule__CollaborationUseRule__Group__0__Impl();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__1_in_rule__CollaborationUseRule__Group__0504);
>+ rule__CollaborationUseRule__Group__1();
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__3
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__Group__3__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:361:1: rule__CollaborationUseRule__Group__3__Impl : ( ( rule__CollaborationUseRule__Alternatives_3 ) ) ;
>-	public final void rule__CollaborationUseRule__Group__3__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:365:1: ( ( ( rule__CollaborationUseRule__Alternatives_3 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:366:1: ( ( rule__CollaborationUseRule__Alternatives_3 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:366:1: ( ( rule__CollaborationUseRule__Alternatives_3 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:367:1: ( rule__CollaborationUseRule__Alternatives_3 )
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:368:1: ( rule__CollaborationUseRule__Alternatives_3 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:368:2: rule__CollaborationUseRule__Alternatives_3
>-					{
>-						pushFollow(FOLLOW_rule__CollaborationUseRule__Alternatives_3_in_rule__CollaborationUseRule__Group__3__Impl710);
>-						rule__CollaborationUseRule__Alternatives_3();
>-						_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__0"
> 
>-					}
> 
>-					after(grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3());
>+ // $ANTLR start "rule__CollaborationUseRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:273:1: rule__CollaborationUseRule__Group__0__Impl : ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) ) ;
>+ public final void rule__CollaborationUseRule__Group__0__Impl() throws RecognitionException {
> 
>-				}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:277:1: ( ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:278:1: ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:278:1: ( ( rule__CollaborationUseRule__VisibilityAssignment_0 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:279:1: ( rule__CollaborationUseRule__VisibilityAssignment_0 )
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getVisibilityAssignment_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:280:1: ( rule__CollaborationUseRule__VisibilityAssignment_0 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:280:2: rule__CollaborationUseRule__VisibilityAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__VisibilityAssignment_0_in_rule__CollaborationUseRule__Group__0__Impl531);
>+ rule__CollaborationUseRule__VisibilityAssignment_0();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getCollaborationUseRuleAccess().getVisibilityAssignment_0()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__CollaborationUseRule__Group__3__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__TypeRule__Group__0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:386:1: rule__TypeRule__Group__0 : rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 ;
>-	public final void rule__TypeRule__Group__0() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:390:1: ( rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:391:2: rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__0748);
>-				rule__TypeRule__Group__0__Impl();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__0__Impl"
> 
>-				pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__0751);
>-				rule__TypeRule__Group__1();
>-				_fsp--;
> 
>+ // $ANTLR start "rule__CollaborationUseRule__Group__1"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:290:1: rule__CollaborationUseRule__Group__1 : rule__CollaborationUseRule__Group__1__Impl rule__CollaborationUseRule__Group__2 ;
>+ public final void rule__CollaborationUseRule__Group__1() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:294:1: ( rule__CollaborationUseRule__Group__1__Impl rule__CollaborationUseRule__Group__2 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:295:2: rule__CollaborationUseRule__Group__1__Impl rule__CollaborationUseRule__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__1__Impl_in_rule__CollaborationUseRule__Group__1561);
>+ rule__CollaborationUseRule__Group__1__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__2_in_rule__CollaborationUseRule__Group__1564);
>+ rule__CollaborationUseRule__Group__2();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__TypeRule__Group__0
> 
>+ }
> 
>-	// $ANTLR start rule__TypeRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:398:1: rule__TypeRule__Group__0__Impl : ( ( rule__TypeRule__PathAssignment_0 )? ) ;
>-	public final void rule__TypeRule__Group__0__Impl() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:402:1: ( ( ( rule__TypeRule__PathAssignment_0 )? ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:403:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:403:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:404:1: ( rule__TypeRule__PathAssignment_0 )?
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getPathAssignment_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:405:1: ( rule__TypeRule__PathAssignment_0 )?
>-					int alt3 = 2;
>-					int LA3_0 = input.LA(1);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__1"
> 
>-					if((LA3_0 == RULE_ID)) {
>-						int LA3_1 = input.LA(2);
> 
>-						if((LA3_1 == 18)) {
>-							alt3 = 1;
>-						}
>-					}
>-					switch(alt3) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:405:2: rule__TypeRule__PathAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl778);
>-						rule__TypeRule__PathAssignment_0();
>-						_fsp--;
>+ // $ANTLR start "rule__CollaborationUseRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:302:1: rule__CollaborationUseRule__Group__1__Impl : ( ( rule__CollaborationUseRule__NameAssignment_1 ) ) ;
>+ public final void rule__CollaborationUseRule__Group__1__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:306:1: ( ( ( rule__CollaborationUseRule__NameAssignment_1 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:307:1: ( ( rule__CollaborationUseRule__NameAssignment_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:307:1: ( ( rule__CollaborationUseRule__NameAssignment_1 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:308:1: ( rule__CollaborationUseRule__NameAssignment_1 )
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getNameAssignment_1()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:309:1: ( rule__CollaborationUseRule__NameAssignment_1 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:309:2: rule__CollaborationUseRule__NameAssignment_1
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__NameAssignment_1_in_rule__CollaborationUseRule__Group__1__Impl591);
>+ rule__CollaborationUseRule__NameAssignment_1();
> 
>-					}
>-						break;
>+ state._fsp--;
> 
>-					}
> 
>-					after(grammarAccess.getTypeRuleAccess().getPathAssignment_0());
>+ }
> 
>-				}
>+ after(grammarAccess.getCollaborationUseRuleAccess().getNameAssignment_1()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__TypeRule__Group__0__Impl
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__1__Impl"
> 
> 
>-	// $ANTLR start rule__TypeRule__Group__1
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:415:1: rule__TypeRule__Group__1 : rule__TypeRule__Group__1__Impl ;
>-	public final void rule__TypeRule__Group__1() throws RecognitionException {
>+ // $ANTLR start "rule__CollaborationUseRule__Group__2"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:319:1: rule__CollaborationUseRule__Group__2 : rule__CollaborationUseRule__Group__2__Impl rule__CollaborationUseRule__Group__3 ;
>+ public final void rule__CollaborationUseRule__Group__2() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:323:1: ( rule__CollaborationUseRule__Group__2__Impl rule__CollaborationUseRule__Group__3 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:324:2: rule__CollaborationUseRule__Group__2__Impl rule__CollaborationUseRule__Group__3
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__2__Impl_in_rule__CollaborationUseRule__Group__2621);
>+ rule__CollaborationUseRule__Group__2__Impl();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:419:1: ( rule__TypeRule__Group__1__Impl )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:420:2: rule__TypeRule__Group__1__Impl
>-			{
>-				pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__1809);
>-				rule__TypeRule__Group__1__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__3_in_rule__CollaborationUseRule__Group__2624);
>+ rule__CollaborationUseRule__Group__3();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__TypeRule__Group__1
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__2"
> 
>-	// $ANTLR start rule__TypeRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:426:1: rule__TypeRule__Group__1__Impl : ( ( rule__TypeRule__TypeAssignment_1 ) ) ;
>-	public final void rule__TypeRule__Group__1__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__CollaborationUseRule__Group__2__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:331:1: rule__CollaborationUseRule__Group__2__Impl : ( ':' ) ;
>+ public final void rule__CollaborationUseRule__Group__2__Impl() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:430:1: ( ( ( rule__TypeRule__TypeAssignment_1 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:431:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:431:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:432:1: ( rule__TypeRule__TypeAssignment_1 )
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getTypeAssignment_1());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:433:1: ( rule__TypeRule__TypeAssignment_1 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:433:2: rule__TypeRule__TypeAssignment_1
>-					{
>-						pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl836);
>-						rule__TypeRule__TypeAssignment_1();
>-						_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:335:1: ( ( ':' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:336:1: ( ':' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:336:1: ( ':' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:337:1: ':'
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2()); 
>+ match(input,17,FOLLOW_17_in_rule__CollaborationUseRule__Group__2__Impl652); 
>+ after(grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2()); 
> 
>+ }
> 
>-					}
> 
>-					after(grammarAccess.getTypeRuleAccess().getTypeAssignment_1());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__2__Impl"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "rule__CollaborationUseRule__Group__3"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:350:1: rule__CollaborationUseRule__Group__3 : rule__CollaborationUseRule__Group__3__Impl ;
>+ public final void rule__CollaborationUseRule__Group__3() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:354:1: ( rule__CollaborationUseRule__Group__3__Impl )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:355:2: rule__CollaborationUseRule__Group__3__Impl
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Group__3__Impl_in_rule__CollaborationUseRule__Group__3683);
>+ rule__CollaborationUseRule__Group__3__Impl();
> 
>-	// $ANTLR end rule__TypeRule__Group__1__Impl
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__QualifiedName__Group__0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:447:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
>-	public final void rule__QualifiedName__Group__0() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:451:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:452:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0870);
>-				rule__QualifiedName__Group__0__Impl();
>-				_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0873);
>-				rule__QualifiedName__Group__1();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__3"
> 
> 
>-			}
>+ // $ANTLR start "rule__CollaborationUseRule__Group__3__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:361:1: rule__CollaborationUseRule__Group__3__Impl : ( ( rule__CollaborationUseRule__Alternatives_3 ) ) ;
>+ public final void rule__CollaborationUseRule__Group__3__Impl() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:365:1: ( ( ( rule__CollaborationUseRule__Alternatives_3 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:366:1: ( ( rule__CollaborationUseRule__Alternatives_3 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:366:1: ( ( rule__CollaborationUseRule__Alternatives_3 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:367:1: ( rule__CollaborationUseRule__Alternatives_3 )
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:368:1: ( rule__CollaborationUseRule__Alternatives_3 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:368:2: rule__CollaborationUseRule__Alternatives_3
>+ {
>+ pushFollow(FOLLOW_rule__CollaborationUseRule__Alternatives_3_in_rule__CollaborationUseRule__Group__3__Impl710);
>+ rule__CollaborationUseRule__Alternatives_3();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__Group__0
>+ }
> 
>+ after(grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3()); 
> 
>-	// $ANTLR start rule__QualifiedName__Group__0__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:459:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
>-	public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:463:1: ( ( ( rule__QualifiedName__PathAssignment_0 ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:464:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:464:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:465:1: ( rule__QualifiedName__PathAssignment_0 )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:466:1: ( rule__QualifiedName__PathAssignment_0 )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:466:2: rule__QualifiedName__PathAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl900);
>-						rule__QualifiedName__PathAssignment_0();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getQualifiedNameAccess().getPathAssignment_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__Group__3__Impl"
> 
>-				}
> 
>+ // $ANTLR start "rule__TypeRule__Group__0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:386:1: rule__TypeRule__Group__0 : rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 ;
>+ public final void rule__TypeRule__Group__0() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:390:1: ( rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:391:2: rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__0748);
>+ rule__TypeRule__Group__0__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__0751);
>+ rule__TypeRule__Group__1();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__QualifiedName__Group__0__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__QualifiedName__Group__1
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:476:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
>-	public final void rule__QualifiedName__Group__1() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:480:1: ( rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:481:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1930);
>-				rule__QualifiedName__Group__1__Impl();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__0"
> 
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1933);
>-				rule__QualifiedName__Group__2();
>-				_fsp--;
> 
>+ // $ANTLR start "rule__TypeRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:398:1: rule__TypeRule__Group__0__Impl : ( ( rule__TypeRule__PathAssignment_0 )? ) ;
>+ public final void rule__TypeRule__Group__0__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:402:1: ( ( ( rule__TypeRule__PathAssignment_0 )? ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:403:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:403:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:404:1: ( rule__TypeRule__PathAssignment_0 )?
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getPathAssignment_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:405:1: ( rule__TypeRule__PathAssignment_0 )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ if ( (LA3_0==RULE_ID) ) {
>+ int LA3_1 = input.LA(2);
> 
>-			restoreStackSize(stackSize);
>+ if ( (LA3_1==18) ) {
>+ alt3=1;
>+ }
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:405:2: rule__TypeRule__PathAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl778);
>+ rule__TypeRule__PathAssignment_0();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__QualifiedName__Group__1
> 
>+ }
>+ break;
> 
>-	// $ANTLR start rule__QualifiedName__Group__1__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:488:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
>-	public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getTypeRuleAccess().getPathAssignment_0()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:492:1: ( ( '::' ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:493:1: ( '::' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:493:1: ( '::' )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:494:1: '::'
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>-					match(input, 18, FOLLOW_18_in_rule__QualifiedName__Group__1__Impl961);
>-					after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__0__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__Group__1__Impl
>+ // $ANTLR start "rule__TypeRule__Group__1"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:415:1: rule__TypeRule__Group__1 : rule__TypeRule__Group__1__Impl ;
>+ public final void rule__TypeRule__Group__1() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:419:1: ( rule__TypeRule__Group__1__Impl )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:420:2: rule__TypeRule__Group__1__Impl
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__1809);
>+ rule__TypeRule__Group__1__Impl();
> 
>-	// $ANTLR start rule__QualifiedName__Group__2
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:507:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
>-	public final void rule__QualifiedName__Group__2() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:511:1: ( rule__QualifiedName__Group__2__Impl )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:512:2: rule__QualifiedName__Group__2__Impl
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2992);
>-				rule__QualifiedName__Group__2__Impl();
>-				_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__1"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__TypeRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:426:1: rule__TypeRule__Group__1__Impl : ( ( rule__TypeRule__TypeAssignment_1 ) ) ;
>+ public final void rule__TypeRule__Group__1__Impl() throws RecognitionException {
> 
>-	// $ANTLR end rule__QualifiedName__Group__2
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:430:1: ( ( ( rule__TypeRule__TypeAssignment_1 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:431:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:431:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:432:1: ( rule__TypeRule__TypeAssignment_1 )
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getTypeAssignment_1()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:433:1: ( rule__TypeRule__TypeAssignment_1 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:433:2: rule__TypeRule__TypeAssignment_1
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl836);
>+ rule__TypeRule__TypeAssignment_1();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__QualifiedName__Group__2__Impl
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:518:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
>-	public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:522:1: ( ( ( rule__QualifiedName__RemainingAssignment_2 )? ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:523:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:523:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:524:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:525:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
>+ after(grammarAccess.getTypeRuleAccess().getTypeAssignment_1()); 
> 
>-					if((LA4_0 == RULE_ID)) {
>-						int LA4_1 = input.LA(2);
>+ }
> 
>-						if((LA4_1 == 18)) {
>-							alt4 = 1;
>-						}
>-					}
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:525:2: rule__QualifiedName__RemainingAssignment_2
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1019);
>-						rule__QualifiedName__RemainingAssignment_2();
>-						_fsp--;
> 
>+ }
> 
>-					}
>-						break;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__1__Impl"
> 
>-				}
> 
>+ // $ANTLR start "rule__QualifiedName__Group__0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:447:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
>+ public final void rule__QualifiedName__Group__0() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:451:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:452:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0870);
>+ rule__QualifiedName__Group__0__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0873);
>+ rule__QualifiedName__Group__1();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__QualifiedName__Group__2__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__CollaborationUseRule__VisibilityAssignment_0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:544:1: rule__CollaborationUseRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ;
>-	public final void rule__CollaborationUseRule__VisibilityAssignment_0() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:548:1: ( ( ruleVisibilityKind ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:549:1: ( ruleVisibilityKind )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:549:1: ( ruleVisibilityKind )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:550:1: ruleVisibilityKind
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0());
>-					pushFollow(FOLLOW_ruleVisibilityKind_in_rule__CollaborationUseRule__VisibilityAssignment_01063);
>-					ruleVisibilityKind();
>-					_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__0"
> 
>-					after(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0());
> 
>-				}
>+ // $ANTLR start "rule__QualifiedName__Group__0__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:459:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
>+ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:463:1: ( ( ( rule__QualifiedName__PathAssignment_0 ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:464:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:464:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:465:1: ( rule__QualifiedName__PathAssignment_0 )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:466:1: ( rule__QualifiedName__PathAssignment_0 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:466:2: rule__QualifiedName__PathAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl900);
>+ rule__QualifiedName__PathAssignment_0();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
> 
>-	// $ANTLR end rule__CollaborationUseRule__VisibilityAssignment_0
>+ }
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__NameAssignment_1
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:559:1: rule__CollaborationUseRule__NameAssignment_1 : ( RULE_ID ) ;
>-	public final void rule__CollaborationUseRule__NameAssignment_1() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:563:1: ( ( RULE_ID ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:564:1: ( RULE_ID )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:564:1: ( RULE_ID )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:565:1: RULE_ID
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0());
>-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__CollaborationUseRule__NameAssignment_11094);
>-					after(grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0());
>+ 	restoreStackSize(stackSize);
> 
>-				}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__0__Impl"
> 
> 
>-			}
>+ // $ANTLR start "rule__QualifiedName__Group__1"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:476:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
>+ public final void rule__QualifiedName__Group__1() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:480:1: ( rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:481:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1930);
>+ rule__QualifiedName__Group__1__Impl();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1933);
>+ rule__QualifiedName__Group__2();
> 
>-	// $ANTLR end rule__CollaborationUseRule__NameAssignment_1
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__CollaborationUseRule__TypeAssignment_3_0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:574:1: rule__CollaborationUseRule__TypeAssignment_3_0 : ( ruleTypeRule ) ;
>-	public final void rule__CollaborationUseRule__TypeAssignment_3_0() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:578:1: ( ( ruleTypeRule ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:579:1: ( ruleTypeRule )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:579:1: ( ruleTypeRule )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:580:1: ruleTypeRule
>-				{
>-					before(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0());
>-					pushFollow(FOLLOW_ruleTypeRule_in_rule__CollaborationUseRule__TypeAssignment_3_01125);
>-					ruleTypeRule();
>-					_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__1"
> 
>-				}
> 
>+ // $ANTLR start "rule__QualifiedName__Group__1__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:488:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
>+ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:492:1: ( ( '::' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:493:1: ( '::' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:493:1: ( '::' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:494:1: '::'
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
>+ match(input,18,FOLLOW_18_in_rule__QualifiedName__Group__1__Impl961); 
>+ after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__CollaborationUseRule__TypeAssignment_3_0
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__TypeRule__PathAssignment_0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:589:1: rule__TypeRule__PathAssignment_0 : ( ruleQualifiedName ) ;
>-	public final void rule__TypeRule__PathAssignment_0() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__1__Impl"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:593:1: ( ( ruleQualifiedName ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:594:1: ( ruleQualifiedName )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:594:1: ( ruleQualifiedName )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:595:1: ruleQualifiedName
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0());
>-					pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_01156);
>-					ruleQualifiedName();
>-					_fsp--;
>+ // $ANTLR start "rule__QualifiedName__Group__2"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:507:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
>+ public final void rule__QualifiedName__Group__2() throws RecognitionException {
> 
>-					after(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0());
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:511:1: ( rule__QualifiedName__Group__2__Impl )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:512:2: rule__QualifiedName__Group__2__Impl
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2992);
>+ rule__QualifiedName__Group__2__Impl();
> 
>-				}
>+ state._fsp--;
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			restoreStackSize(stackSize);
>+ 	restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__2"
> 
>-	// $ANTLR end rule__TypeRule__PathAssignment_0
> 
>+ // $ANTLR start "rule__QualifiedName__Group__2__Impl"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:518:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
>+ public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
> 
>-	// $ANTLR start rule__TypeRule__TypeAssignment_1
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:604:1: rule__TypeRule__TypeAssignment_1 : ( ( RULE_ID ) ) ;
>-	public final void rule__TypeRule__TypeAssignment_1() throws RecognitionException {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:522:1: ( ( ( rule__QualifiedName__RemainingAssignment_2 )? ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:523:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:523:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:524:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:525:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-		int stackSize = keepStackSize();
>+ if ( (LA4_0==RULE_ID) ) {
>+ int LA4_1 = input.LA(2);
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:608:1: ( ( ( RULE_ID ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:609:1: ( ( RULE_ID ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:609:1: ( ( RULE_ID ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:610:1: ( RULE_ID )
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:611:1: ( RULE_ID )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:612:1: RULE_ID
>-					{
>-						before(grammarAccess.getTypeRuleAccess().getTypeCollaborationIDTerminalRuleCall_1_0_1());
>-						match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_11191);
>-						after(grammarAccess.getTypeRuleAccess().getTypeCollaborationIDTerminalRuleCall_1_0_1());
>+ if ( (LA4_1==18) ) {
>+ alt4=1;
>+ }
>+ }
>+ switch (alt4) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:525:2: rule__QualifiedName__RemainingAssignment_2
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1019);
>+ rule__QualifiedName__RemainingAssignment_2();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0());
> 
>-				}
>+ }
>+ break;
> 
>+ }
> 
>-			}
>+ after(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__TypeRule__TypeAssignment_1
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__QualifiedName__PathAssignment_0
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:623:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
>-	public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__2__Impl"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:627:1: ( ( ( RULE_ID ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:628:1: ( ( RULE_ID ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:628:1: ( ( RULE_ID ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:629:1: ( RULE_ID )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0());
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:630:1: ( RULE_ID )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:631:1: RULE_ID
>-					{
>-						before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1());
>-						match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_01230);
>-						after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1());
>+ // $ANTLR start "rule__CollaborationUseRule__VisibilityAssignment_0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:544:1: rule__CollaborationUseRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ;
>+ public final void rule__CollaborationUseRule__VisibilityAssignment_0() throws RecognitionException {
> 
>-					}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:548:1: ( ( ruleVisibilityKind ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:549:1: ( ruleVisibilityKind )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:549:1: ( ruleVisibilityKind )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:550:1: ruleVisibilityKind
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
>+ pushFollow(FOLLOW_ruleVisibilityKind_in_rule__CollaborationUseRule__VisibilityAssignment_01063);
>+ ruleVisibilityKind();
> 
>-					after(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0());
>+ state._fsp--;
> 
>-				}
>+ after(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__QualifiedName__PathAssignment_0
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__VisibilityAssignment_0"
> 
> 
>-	// $ANTLR start rule__QualifiedName__RemainingAssignment_2
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:642:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
>-	public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
>+ // $ANTLR start "rule__CollaborationUseRule__NameAssignment_1"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:559:1: rule__CollaborationUseRule__NameAssignment_1 : ( RULE_ID ) ;
>+ public final void rule__CollaborationUseRule__NameAssignment_1() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:563:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:564:1: ( RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:564:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:565:1: RULE_ID
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__CollaborationUseRule__NameAssignment_11094); 
>+ after(grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:646:1: ( ( ruleQualifiedName ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:647:1: ( ruleQualifiedName )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:647:1: ( ruleQualifiedName )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:648:1: ruleQualifiedName
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0());
>-					pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_21265);
>-					ruleQualifiedName();
>-					_fsp--;
>+ }
> 
>-					after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__NameAssignment_1"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__CollaborationUseRule__TypeAssignment_3_0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:574:1: rule__CollaborationUseRule__TypeAssignment_3_0 : ( ruleTypeRule ) ;
>+ public final void rule__CollaborationUseRule__TypeAssignment_3_0() throws RecognitionException {
> 
>-	// $ANTLR end rule__QualifiedName__RemainingAssignment_2
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:578:1: ( ( ruleTypeRule ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:579:1: ( ruleTypeRule )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:579:1: ( ruleTypeRule )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:580:1: ruleTypeRule
>+ {
>+ before(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_rule__CollaborationUseRule__TypeAssignment_3_01125);
>+ ruleTypeRule();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__BoundSpecification__ValueAssignment
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:659:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
>-	public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
>+ after(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:663:1: ( ( RULE_UNLIMITEDLITERAL ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:664:1: ( RULE_UNLIMITEDLITERAL )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:664:1: ( RULE_UNLIMITEDLITERAL )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:665:1: RULE_UNLIMITEDLITERAL
>-				{
>-					before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0());
>-					match(input, RULE_UNLIMITEDLITERAL, FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment1298);
>-					after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__CollaborationUseRule__TypeAssignment_3_0"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__TypeRule__PathAssignment_0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:589:1: rule__TypeRule__PathAssignment_0 : ( ruleQualifiedName ) ;
>+ public final void rule__TypeRule__PathAssignment_0() throws RecognitionException {
> 
>-	// $ANTLR end rule__BoundSpecification__ValueAssignment
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:593:1: ( ( ruleQualifiedName ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:594:1: ( ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:594:1: ( ruleQualifiedName )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:595:1: ruleQualifiedName
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_01156);
>+ ruleQualifiedName();
> 
>+ state._fsp--;
> 
>+ after(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 
>+ }
> 
>-	public static final BitSet FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule61 = new BitSet(new long[]{ 0x0000000000000000L });
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleCollaborationUseRule68 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__0_in_ruleCollaborationUseRule94 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule121 = new BitSet(new long[]{ 0x0000000000000000L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule128 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__PathAssignment_0"
> 
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule154 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName181 = new BitSet(new long[]{ 0x0000000000000000L });
>+ // $ANTLR start "rule__TypeRule__TypeAssignment_1"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:604:1: rule__TypeRule__TypeAssignment_1 : ( ( RULE_ID ) ) ;
>+ public final void rule__TypeRule__TypeAssignment_1() throws RecognitionException {
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName188 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:608:1: ( ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:609:1: ( ( RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:609:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:610:1: ( RULE_ID )
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:611:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:612:1: RULE_ID
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getTypeCollaborationIDTerminalRuleCall_1_0_1()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_11191); 
>+ after(grammarAccess.getTypeRuleAccess().getTypeCollaborationIDTerminalRuleCall_1_0_1()); 
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName214 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification243 = new BitSet(new long[]{ 0x0000000000000000L });
>+ after(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0()); 
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification250 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification276 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind313 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__TypeAssignment_3_0_in_rule__CollaborationUseRule__Alternatives_3350 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_12_in_rule__CollaborationUseRule__Alternatives_3369 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_13_in_rule__VisibilityKind__Alternatives404 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__TypeAssignment_1"
> 
>-	public static final BitSet FOLLOW_14_in_rule__VisibilityKind__Alternatives425 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_15_in_rule__VisibilityKind__Alternatives446 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // $ANTLR start "rule__QualifiedName__PathAssignment_0"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:623:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
>+ public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
> 
>-	public static final BitSet FOLLOW_16_in_rule__VisibilityKind__Alternatives467 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:627:1: ( ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:628:1: ( ( RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:628:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:629:1: ( RULE_ID )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:630:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:631:1: RULE_ID
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_01230); 
>+ after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__0__Impl_in_rule__CollaborationUseRule__Group__0501 = new BitSet(new long[]{ 0x0000000000000010L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__1_in_rule__CollaborationUseRule__Group__0504 = new BitSet(new long[]{ 0x0000000000000002L });
>+ after(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__VisibilityAssignment_0_in_rule__CollaborationUseRule__Group__0__Impl531 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__1__Impl_in_rule__CollaborationUseRule__Group__1561 = new BitSet(new long[]{ 0x0000000000020000L });
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__2_in_rule__CollaborationUseRule__Group__1564 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__NameAssignment_1_in_rule__CollaborationUseRule__Group__1__Impl591 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__2__Impl_in_rule__CollaborationUseRule__Group__2621 = new BitSet(new long[]{ 0x0000000000001010L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__3_in_rule__CollaborationUseRule__Group__2624 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__PathAssignment_0"
> 
>-	public static final BitSet FOLLOW_17_in_rule__CollaborationUseRule__Group__2__Impl652 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__3__Impl_in_rule__CollaborationUseRule__Group__3683 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // $ANTLR start "rule__QualifiedName__RemainingAssignment_2"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:642:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
>+ public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
> 
>-	public static final BitSet FOLLOW_rule__CollaborationUseRule__Alternatives_3_in_rule__CollaborationUseRule__Group__3__Impl710 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:646:1: ( ( ruleQualifiedName ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:647:1: ( ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:647:1: ( ruleQualifiedName )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:648:1: ruleQualifiedName
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_21265);
>+ ruleQualifiedName();
> 
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__0748 = new BitSet(new long[]{ 0x0000000000000010L });
>+ state._fsp--;
> 
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__0751 = new BitSet(new long[]{ 0x0000000000000002L });
>+ after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 
>-	public static final BitSet FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl778 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__1809 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl836 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0870 = new BitSet(new long[]{ 0x0000000000040000L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0873 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl900 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__RemainingAssignment_2"
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1930 = new BitSet(new long[]{ 0x0000000000000012L });
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1933 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // $ANTLR start "rule__BoundSpecification__ValueAssignment"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:659:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
>+ public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
> 
>-	public static final BitSet FOLLOW_18_in_rule__QualifiedName__Group__1__Impl961 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:663:1: ( ( RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:664:1: ( RULE_UNLIMITEDLITERAL )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:664:1: ( RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext.ui/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g:665:1: RULE_UNLIMITEDLITERAL
>+ {
>+ before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
>+ match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment1298); 
>+ after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2992 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1019 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__CollaborationUseRule__VisibilityAssignment_01063 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__CollaborationUseRule__NameAssignment_11094 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_ruleTypeRule_in_rule__CollaborationUseRule__TypeAssignment_3_01125 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_01156 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__BoundSpecification__ValueAssignment"
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_11191 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // Delegated rules
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_01230 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_21265 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 
> 
>-	public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment1298 = new BitSet(new long[]{ 0x0000000000000002L });
>+ public static final BitSet FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule61 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleCollaborationUseRule68 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__0_in_ruleCollaborationUseRule94 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule121 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule128 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule154 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName181 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName188 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName214 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification243 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification250 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification276 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind313 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__TypeAssignment_3_0_in_rule__CollaborationUseRule__Alternatives_3350 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_12_in_rule__CollaborationUseRule__Alternatives_3369 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_13_in_rule__VisibilityKind__Alternatives404 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_14_in_rule__VisibilityKind__Alternatives425 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_15_in_rule__VisibilityKind__Alternatives446 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_16_in_rule__VisibilityKind__Alternatives467 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__0__Impl_in_rule__CollaborationUseRule__Group__0501 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__1_in_rule__CollaborationUseRule__Group__0504 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__VisibilityAssignment_0_in_rule__CollaborationUseRule__Group__0__Impl531 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__1__Impl_in_rule__CollaborationUseRule__Group__1561 = new BitSet(new long[]{0x0000000000020000L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__2_in_rule__CollaborationUseRule__Group__1564 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__NameAssignment_1_in_rule__CollaborationUseRule__Group__1__Impl591 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__2__Impl_in_rule__CollaborationUseRule__Group__2621 = new BitSet(new long[]{0x0000000000001010L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__3_in_rule__CollaborationUseRule__Group__2624 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_17_in_rule__CollaborationUseRule__Group__2__Impl652 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Group__3__Impl_in_rule__CollaborationUseRule__Group__3683 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__CollaborationUseRule__Alternatives_3_in_rule__CollaborationUseRule__Group__3__Impl710 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__0748 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__0751 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl778 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__1809 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl836 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0870 = new BitSet(new long[]{0x0000000000040000L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0873 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl900 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1930 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1933 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_18_in_rule__QualifiedName__Group__1__Impl961 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2992 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1019 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__CollaborationUseRule__VisibilityAssignment_01063 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__CollaborationUseRule__NameAssignment_11094 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_rule__CollaborationUseRule__TypeAssignment_3_01125 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_01156 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_11191 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_01230 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_21265 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment1298 = new BitSet(new long[]{0x0000000000000002L});
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.g	(working copy)
>@@ -678,7 +678,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCollaborationUse.tokens	(working copy)
>@@ -1,6 +1,13 @@
> RULE_ID=4
> RULE_STRING=7
> RULE_UNLIMITEDLITERAL=5
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__14=14
>+T__13=13
> RULE_ANY_OTHER=11
> RULE_INT=6
> RULE_WS=10
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/UmlCollaborationUseParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/UmlCollaborationUseParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/antlr/UmlCollaborationUseParser.java	(working copy)
>@@ -1,14 +1,13 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr;
> 
> import java.util.Collection;
>-import java.util.HashMap;
> import java.util.Map;
>+import java.util.HashMap;
> 
> import org.antlr.runtime.RecognitionException;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
> import org.eclipse.xtext.AbstractElement;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractContentAssistParser;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
>@@ -16,25 +15,26 @@
> 
> import com.google.inject.Inject;
> 
>-public class UmlCollaborationUseParser extends AbstractContentAssistParser {
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
> 
>+public class UmlCollaborationUseParser extends AbstractContentAssistParser {
>+	
> 	@Inject
> 	private UmlCollaborationUseGrammarAccess grammarAccess;
>-
>+	
> 	private Map<AbstractElement, String> nameMappings;
>-
>+	
> 	@Override
> 	protected org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser createParser() {
> 		org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser result = new org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser(null);
> 		result.setGrammarAccess(grammarAccess);
> 		return result;
> 	}
>-
>+	
> 	@Override
> 	protected String getRuleName(AbstractElement element) {
>-		if(nameMappings == null) {
>+		if (nameMappings == null) {
> 			nameMappings = new HashMap<AbstractElement, String>() {
>-
> 				private static final long serialVersionUID = 1L;
> 				{
> 					put(grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3(), "rule__CollaborationUseRule__Alternatives_3");
>@@ -60,27 +60,27 @@
> 		}
> 		return nameMappings.get(element);
> 	}
>-
>+	
> 	@Override
> 	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
> 		try {
>-			org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser typedParser = (org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser)parser;
>+			org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser typedParser = (org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCollaborationUseParser) parser;
> 			typedParser.entryRuleCollaborationUseRule();
> 			return typedParser.getFollowElements();
>-		} catch (RecognitionException ex) {
>+		} catch(RecognitionException ex) {
> 			throw new RuntimeException(ex);
>-		}
>+		}		
> 	}
>-
>+	
> 	@Override
> 	protected String[] getInitialHiddenTokens() {
>-		return new String[]{ "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
>+		return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
> 	}
>-
>+	
> 	public UmlCollaborationUseGrammarAccess getGrammarAccess() {
> 		return this.grammarAccess;
> 	}
>-
>+	
> 	public void setGrammarAccess(UmlCollaborationUseGrammarAccess grammarAccess) {
> 		this.grammarAccess = grammarAccess;
> 	}
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/AbstractUmlCollaborationUseProposalProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/AbstractUmlCollaborationUseProposalProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/contentassist/AbstractUmlCollaborationUseProposalProvider.java	(working copy)
>@@ -1,48 +1,41 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist;
> 
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.xtext.*;
> import org.eclipse.papyrus.common.editor.xtext.ui.contentassist.UmlCommonProposalProvider;
>-import org.eclipse.xtext.Assignment;
>-import org.eclipse.xtext.CrossReference;
>-import org.eclipse.xtext.RuleCall;
>-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
> import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
>+import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
> 
> /**
> * Represents a generated, default implementation of interface {@link IProposalProvider}.
>- * Methods are dynamically dispatched on the first parameter, i.e., you can override them
>- * with a more concrete subtype.
>+ * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
>+ * with a more concrete subtype. 
> */
> @SuppressWarnings("all")
> public class AbstractUmlCollaborationUseProposalProvider extends UmlCommonProposalProvider {
>-
>+		
> 	public void completeCollaborationUseRule_Visibility(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeCollaborationUseRule_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeCollaborationUseRule_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeTypeRule_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeTypeRule_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
> 	}
>-
>+ 
> 	public void complete_CollaborationUseRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_TypeRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/UmlCollaborationUseExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/UmlCollaborationUseExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/ui/UmlCollaborationUseExecutableExtensionFactory.java	(working copy)
>@@ -1,7 +1,6 @@
> /*
> * generated by Xtext
> */
>-
> package org.eclipse.papyrus.collaborationuse.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -10,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- * @generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlCollaborationUseExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>@@ -18,10 +18,10 @@
> 	protected Bundle getBundle() {
> 		return org.eclipse.papyrus.collaborationuse.editor.xtext.ui.internal.UmlCollaborationUseActivator.getInstance().getBundle();
> 	}
>-
>+	
> 	@Override
> 	protected Injector getInjector() {
> 		return org.eclipse.papyrus.collaborationuse.editor.xtext.ui.internal.UmlCollaborationUseActivator.getInstance().getInjector("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse");
> 	}
>-
>+	
> }
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -14,7 +14,6 @@
> org.eclipse.xtext.builder,
> org.antlr.runtime,
> org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.8.0",
>- org.eclipse.xtext.gmf.glue,
> org.eclipse.papyrus.umlutils;bundle-version="0.8.0",
> org.eclipse.gmf.runtime.common.core;bundle-version="1.4.0",
> org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
>@@ -23,7 +22,8 @@
> org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
> org.eclipse.papyrus.service.edit,
> org.eclipse.papyrus.diagram.common;bundle-version="0.8.0",
>- org.eclipse.papyrus.common.editor.xtext.ui
>+ org.eclipse.papyrus.common.editor.xtext.ui,
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.collaborationuse.editor.xtext.ui.contentassist.antlr
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,6 +139,39 @@
> 
> 
> 
>+	
>+	<extension
>+		point="org.eclipse.ui.handlers">
>+		<handler 
>+			class="org.eclipse.papyrus.collaborationuse.editor.xtext.ui.UmlCollaborationUseExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
>+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
>+			<activeWhen>
>+				<reference
>+					definitionId="org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse.Editor.opened">
>+				</reference>
>+			</activeWhen>
>+		</handler>
>+	</extension>
>+	<extension
>+		point="org.eclipse.ui.commands">
>+		<command
>+			description="Open the quick outline."
>+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
>+			name="Quick Outline">
>+		</command>
>+	</extension>
>+	<extension point="org.eclipse.ui.menus">
>+		<menuContribution
>+			locationURI="popup:#TextEditorContext?after=group.open">
>+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
>+				style="push"
>+				tooltip="Open Quick Outline">
>+				<visibleWhen checkEnabled="false">
>+					<reference definitionId="org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse.Editor.opened"/>
>+				</visibleWhen>
>+			</command>
>+		</menuContribution>
>+	</extension>
> 
> 	
> 	<extension
>#P org.eclipse.papyrus.connectionpointreference.editor.xtext
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -19,7 +19,7 @@
> org.antlr.runtime,
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0"
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.connectionpointreference.editor.xtext,
>Index: src/org/eclipse/papyrus/connectionpointreference/editor/xtext/GenerateUMLConnectionPointReference.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/connectionpointreference/editor/xtext/GenerateUMLConnectionPointReference.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/connectionpointreference/editor/xtext/GenerateUMLConnectionPointReference.mwe2	(working copy)
>@@ -88,10 +88,9 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
>-
>+			
> 			// quickfix API 
> 			fragment = quickfix.QuickfixProviderFragment {}
> 
>@@ -101,10 +100,12 @@
> 			// the following fragment tries to use the Antlr based content assist 
> 			// fragment which can be downloaded from http://www.itemis.com 
> 			// and will be ignored if it's not available. 
>-			fragment = DelegatingGeneratorFragment { 
>-				delegate = "de.itemis.xtext.antlr.XtextAntlrUiGeneratorFragment"
>-				message="You are generating without ANTLR. It is highly recommended to download and use the plugin \'de.itemis.xtext.antlr\' \n\t using the update site http://download.itemis.com/updates/."
>-			}
>+			// fragment = DelegatingGeneratorFragment { 
>+			//	delegate = "de.itemis.xtext.antlr.XtextAntlrUiGeneratorFragment"
>+			//	message="You are generating without ANTLR. It is highly recommended to download and use the plugin \'de.itemis.xtext.antlr\' \n\t using the update site http://download.itemis.com/updates/."
>+			//}
>+
>+			fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
> 
> 			fragment = builder.BuilderIntegrationFragment {}
> 
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/UMLConnectionPointReferenceAntlrTokenFileProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/UMLConnectionPointReferenceAntlrTokenFileProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/UMLConnectionPointReferenceAntlrTokenFileProvider.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr;
> 
> import java.io.InputStream;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/UMLConnectionPointReferenceParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/UMLConnectionPointReferenceParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/UMLConnectionPointReferenceParser.java	(working copy)
>@@ -1,26 +1,11 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.papyrus.connectionpointreference.editor.xtext.services.UMLConnectionPointReferenceGrammarAccess;
> 
> public class UMLConnectionPointReferenceParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>@@ -29,25 +14,13 @@
> 	private UMLConnectionPointReferenceGrammarAccess grammarAccess;
> 	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal.InternalUMLConnectionPointReferenceParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(),re);
>-		}
> 	}
> 	
>+	@Override
> 	protected org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal.InternalUMLConnectionPointReferenceParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal.InternalUMLConnectionPointReferenceParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal.InternalUMLConnectionPointReferenceParser(stream, getGrammarAccess());
> 	}
> 	
> 	@Override 
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReferenceLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReferenceLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReferenceLexer.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal;
> 
> // Hack: Use our own Lexer superclass by means of import. 
>@@ -27,86 +14,100 @@
> public class InternalUMLConnectionPointReferenceLexer extends Lexer {
> public static final int RULE_ID=4;
> public static final int RULE_STRING=6;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__13=13;
> public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
>- public static final int T11=11;
>- public static final int T12=12;
>- public static final int T13=13;
> public static final int RULE_WS=9;
>- public static final int Tokens=14;
> public static final int RULE_SL_COMMENT=8;
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=7;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUMLConnectionPointReferenceLexer() {;} 
> public InternalUMLConnectionPointReferenceLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUMLConnectionPointReferenceLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g"; }
> 
>- // $ANTLR start T11
>- public final void mT11() throws RecognitionException {
>+ // $ANTLR start "T__11"
>+ public final void mT__11() throws RecognitionException {
> try {
>- int _type = T11;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:10:5: ( 'entry' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:10:7: 'entry'
>+ int _type = T__11;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:11:7: ( 'entry' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:11:9: 'entry'
> {
> match("entry"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T11
>+ // $ANTLR end "T__11"
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:11:5: ( ',' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:11:7: ','
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:12:7: ( ',' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:12:9: ','
> {
> match(','); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:12:5: ( 'exit' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:12:7: 'exit'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:13:7: ( 'exit' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:13:9: 'exit'
> {
> match("exit"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:172:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:172:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:156:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:156:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:172:11: ( '^' )?
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:156:11: ( '^' )?
> int alt1=2;
> int LA1_0 = input.LA(1);
> 
>@@ -115,7 +116,7 @@
> }
> switch (alt1) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:172:11: '^'
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:156:11: '^'
> {
> match('^'); 
> 
>@@ -129,12 +130,11 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:172:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:156:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop2:
> do {
> int alt2=2;
>@@ -154,10 +154,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -171,21 +170,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:174:10: ( ( '0' .. '9' )+ )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:174:12: ( '0' .. '9' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:158:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:158:12: ( '0' .. '9' )+
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:174:12: ( '0' .. '9' )+
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:158:12: ( '0' .. '9' )+
> int cnt3=0;
> loop3:
> do {
>@@ -199,7 +200,7 @@
> 
> switch (alt3) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:174:13: '0' .. '9'
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:158:13: '0' .. '9'
> 	 {
> 	 matchRange('0','9'); 
> 
>@@ -218,21 +219,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -244,16 +247,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("176:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop4:
> do {
> int alt4=3;
>@@ -262,41 +265,39 @@
> if ( (LA4_0=='\\') ) {
> alt4=1;
> }
>- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
>+ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
> alt4=2;
> }
> 
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -312,10 +313,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -324,41 +325,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:176:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:160:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -379,23 +378,25 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:178:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:178:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:162:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:162:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
> match("/*"); 
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:178:24: ( options {greedy=false; } : . )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:162:24: ( options {greedy=false; } : . )*
> loop7:
> do {
> int alt7=2;
>@@ -407,20 +408,20 @@
> if ( (LA7_1=='/') ) {
> alt7=2;
> }
>- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
>+ else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> switch (alt7) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:178:52: .
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:162:52: .
> 	 {
> 	 matchAny(); 
> 
>@@ -437,46 +438,47 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
> match("//"); 
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:24: (~ ( ( '\\n' | '\\r' ) ) )*
> loop8:
> do {
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
>+ if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
> 
> switch (alt8) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:24: ~ ( ( '\\n' | '\\r' ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -487,7 +489,7 @@
> }
> } while (true);
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:40: ( ( '\\r' )? '\\n' )?
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:40: ( ( '\\r' )? '\\n' )?
> int alt10=2;
> int LA10_0 = input.LA(1);
> 
>@@ -496,9 +498,9 @@
> }
> switch (alt10) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:41: ( '\\r' )? '\\n'
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:41: ( '\\r' )? '\\n'
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:41: ( '\\r' )?
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:41: ( '\\r' )?
> int alt9=2;
> int LA9_0 = input.LA(1);
> 
>@@ -507,7 +509,7 @@
> }
> switch (alt9) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:180:41: '\\r'
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:164:41: '\\r'
> {
> match('\r'); 
> 
>@@ -526,21 +528,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:182:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:182:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:166:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:166:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:182:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:166:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> int cnt11=0;
> loop11:
> do {
>@@ -561,10 +565,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -582,224 +585,104 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:184:16: ( . )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:184:18: .
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:168:16: ( . )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:168:18: .
> {
> matchAny(); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:8: ( T11 | T12 | T13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:8: ( T__11 | T__12 | T__13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt12=10;
>- int LA12_0 = input.LA(1);
>-
>- if ( (LA12_0=='e') ) {
>- switch ( input.LA(2) ) {
>- case 'n':
>- {
>- int LA12_11 = input.LA(3);
>-
>- if ( (LA12_11=='t') ) {
>- int LA12_20 = input.LA(4);
>-
>- if ( (LA12_20=='r') ) {
>- int LA12_22 = input.LA(5);
>-
>- if ( (LA12_22=='y') ) {
>- int LA12_24 = input.LA(6);
>-
>- if ( ((LA12_24>='0' && LA12_24<='9')||(LA12_24>='A' && LA12_24<='Z')||LA12_24=='_'||(LA12_24>='a' && LA12_24<='z')) ) {
>- alt12=4;
>- }
>- else {
>- alt12=1;}
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=4;}
>- }
>- break;
>- case 'x':
>- {
>- int LA12_12 = input.LA(3);
>-
>- if ( (LA12_12=='i') ) {
>- int LA12_21 = input.LA(4);
>-
>- if ( (LA12_21=='t') ) {
>- int LA12_23 = input.LA(5);
>-
>- if ( ((LA12_23>='0' && LA12_23<='9')||(LA12_23>='A' && LA12_23<='Z')||LA12_23=='_'||(LA12_23>='a' && LA12_23<='z')) ) {
>- alt12=4;
>- }
>- else {
>- alt12=3;}
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=4;}
>- }
>- break;
>- default:
>- alt12=4;}
>-
>- }
>- else if ( (LA12_0==',') ) {
>- alt12=2;
>- }
>- else if ( (LA12_0=='^') ) {
>- int LA12_3 = input.LA(2);
>-
>- if ( ((LA12_3>='A' && LA12_3<='Z')||LA12_3=='_'||(LA12_3>='a' && LA12_3<='z')) ) {
>- alt12=4;
>- }
>- else {
>- alt12=10;}
>- }
>- else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='d')||(LA12_0>='f' && LA12_0<='z')) ) {
>- alt12=4;
>- }
>- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
>- alt12=5;
>- }
>- else if ( (LA12_0=='\"') ) {
>- int LA12_6 = input.LA(2);
>-
>- if ( ((LA12_6>='\u0000' && LA12_6<='\uFFFE')) ) {
>- alt12=6;
>- }
>- else {
>- alt12=10;}
>- }
>- else if ( (LA12_0=='\'') ) {
>- int LA12_7 = input.LA(2);
>-
>- if ( ((LA12_7>='\u0000' && LA12_7<='\uFFFE')) ) {
>- alt12=6;
>- }
>- else {
>- alt12=10;}
>- }
>- else if ( (LA12_0=='/') ) {
>- switch ( input.LA(2) ) {
>- case '/':
>- {
>- alt12=8;
>- }
>- break;
>- case '*':
>- {
>- alt12=7;
>- }
>- break;
>- default:
>- alt12=10;}
>-
>- }
>- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
>- alt12=9;
>- }
>- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
>- alt12=10;
>- }
>- else {
>- NoViableAltException nvae =
>- new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
>-
>- throw nvae;
>- }
>+ alt12 = dfa12.predict(input);
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:10: T11
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:10: T__11
> {
>- mT11(); 
>+ mT__11(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:14: T12
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:16: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:18: T13
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:22: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:22: RULE_ID
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:28: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:30: RULE_INT
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:36: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:39: RULE_STRING
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:45: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:51: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:57: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:67: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:73: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:83: RULE_WS
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:89: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:91: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:1:97: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -811,6 +694,144 @@
> }
> 
> 
>+ protected DFA12 dfa12 = new DFA12(this);
>+ static final String DFA12_eotS =
>+ "\1\uffff\1\15\1\uffff\1\12\2\uffff\3\12\2\uffff\2\15\7\uffff\3"+
>+ "\15\1\31\1\32\2\uffff";
>+ static final String DFA12_eofS =
>+ "\33\uffff";
>+ static final String DFA12_minS =
>+ "\1\0\1\156\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\164\1\151\7"+
>+ "\uffff\1\162\1\164\1\171\2\60\2\uffff";
>+ static final String DFA12_maxS =
>+ "\1\uffff\1\170\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164"+
>+ "\1\151\7\uffff\1\162\1\164\1\171\2\172\2\uffff";
>+ static final String DFA12_acceptS =
>+ "\2\uffff\1\2\1\uffff\1\4\1\5\3\uffff\1\11\1\12\2\uffff\1\4\1\2"+
>+ "\1\5\1\6\1\7\1\10\1\11\5\uffff\1\3\1\1";
>+ static final String DFA12_specialS =
>+ "\1\2\5\uffff\1\0\1\1\23\uffff}>";
>+ static final String[] DFA12_transitionS = {
>+ "\11\12\2\11\2\12\1\11\22\12\1\11\1\12\1\6\4\12\1\7\4\12\1\2"+
>+ "\2\12\1\10\12\5\7\12\32\4\3\12\1\3\1\4\1\12\4\4\1\1\25\4\uff85"+
>+ "\12",
>+ "\1\13\11\uffff\1\14",
>+ "",
>+ "\32\15\4\uffff\1\15\1\uffff\32\15",
>+ "",
>+ "",
>+ "\0\20",
>+ "\0\20",
>+ "\1\21\4\uffff\1\22",
>+ "",
>+ "",
>+ "\1\24",
>+ "\1\25",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\26",
>+ "\1\27",
>+ "\1\30",
>+ "\12\15\7\uffff\32\15\4\uffff\1\15\1\uffff\32\15",
>+ "\12\15\7\uffff\32\15\4\uffff\1\15\1\uffff\32\15",
>+ "",
>+ ""
>+ };
>+
>+ static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
>+ static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
>+ static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
>+ static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
>+ static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
>+ static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
>+ static final short[][] DFA12_transition;
>+
>+ static {
>+ int numStates = DFA12_transitionS.length;
>+ DFA12_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
>+ }
>+ }
>+
>+ class DFA12 extends DFA {
>+
>+ public DFA12(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 12;
>+ this.eot = DFA12_eot;
>+ this.eof = DFA12_eof;
>+ this.min = DFA12_min;
>+ this.max = DFA12_max;
>+ this.accept = DFA12_accept;
>+ this.special = DFA12_special;
>+ this.transition = DFA12_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__11 | T__12 | T__13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA12_6 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_6>='\u0000' && LA12_6<='\uFFFF')) ) {s = 16;}
>+
>+ else s = 10;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA12_7 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_7>='\u0000' && LA12_7<='\uFFFF')) ) {s = 16;}
>+
>+ else s = 10;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA12_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA12_0=='e') ) {s = 1;}
>+
>+ else if ( (LA12_0==',') ) {s = 2;}
>+
>+ else if ( (LA12_0=='^') ) {s = 3;}
>+
>+ else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='d')||(LA12_0>='f' && LA12_0<='z')) ) {s = 4;}
>+
>+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 5;}
>+
>+ else if ( (LA12_0=='\"') ) {s = 6;}
>+
>+ else if ( (LA12_0=='\'') ) {s = 7;}
>+
>+ else if ( (LA12_0=='/') ) {s = 8;}
>+
>+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 9;}
>+
>+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 10;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 12, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
> 
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.tokens	(working copy)
>@@ -1,5 +1,8 @@
> RULE_ID=4
> RULE_STRING=6
>+T__12=12
>+T__11=11
>+T__13=13
> RULE_ANY_OTHER=10
> RULE_INT=5
> RULE_WS=9
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g	(working copy)
>@@ -19,18 +19,15 @@
> @parser::header {
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.connectionpointreference.editor.xtext.services.UMLConnectionPointReferenceGrammarAccess;
> 
> }
>@@ -39,17 +36,10 @@
> 
> 	private UMLConnectionPointReferenceGrammarAccess grammarAccess;
> 	
>- public InternalUMLConnectionPointReferenceParser(TokenStream input, IAstFactory factory, UMLConnectionPointReferenceGrammarAccess grammarAccess) {
>+ public InternalUMLConnectionPointReferenceParser(TokenStream input, UMLConnectionPointReferenceGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -76,7 +66,7 @@
> // Entry rule entryRuleConnectionPointReferenceRule
> entryRuleConnectionPointReferenceRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getConnectionPointReferenceRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getConnectionPointReferenceRuleRule()); }
> 	 iv_ruleConnectionPointReferenceRule=ruleConnectionPointReferenceRule 
> 	 { $current=$iv_ruleConnectionPointReferenceRule.current; } 
> 	 EOF 
>@@ -84,81 +74,75 @@
> 
> // Rule ConnectionPointReferenceRule
> ruleConnectionPointReferenceRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'entry' 
>+ @after { leaveRule(); }:
>+((	otherlv_0='entry' 
> {
>- createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getEntryKeyword_0_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getConnectionPointReferenceRuleAccess().getEntryKeyword_0_0());
> }
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_1_0(), "entry"); 
>+		newLeafNode(otherlv_1, grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_1_0()); 
> 	}
> 
> )
>-)(	',' 
>+)(	otherlv_2=',' 
> {
>- createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_0_2_0(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_0_2_0());
> }
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_3=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_2_1_0(), "entry"); 
>+		newLeafNode(otherlv_3, grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_2_1_0()); 
> 	}
> 
> )
> ))*)
>- |(	'exit' 
>+ |(	otherlv_4='exit' 
> {
>- createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getExitKeyword_1_0(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getConnectionPointReferenceRuleAccess().getExitKeyword_1_0());
> }
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_5=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_1_0(), "exit"); 
>+		newLeafNode(otherlv_5, grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_1_0()); 
> 	}
> 
> )
>-)(	',' 
>+)(	otherlv_6=',' 
> {
>- createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_1_2_0(), null); 
>+ 	newLeafNode(otherlv_6, grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_1_2_0());
> }
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_7=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_2_1_0(), "exit"); 
>+		newLeafNode(otherlv_7, grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_2_1_0()); 
> 	}
> 
> )
>@@ -173,7 +157,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReferenceParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReferenceParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReferenceParser.java	(working copy)
>@@ -1,30 +1,14 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.connectionpointreference.editor.xtext.services.UMLConnectionPointReferenceGrammarAccess;
> 
> 
>@@ -41,6 +25,9 @@
> };
> public static final int RULE_ID=4;
> public static final int RULE_STRING=6;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__13=13;
> public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
> public static final int RULE_WS=9;
>@@ -48,29 +35,30 @@
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=7;
> 
>+ // delegates
>+ // delegators
>+
>+
> public InternalUMLConnectionPointReferenceParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUMLConnectionPointReferenceParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUMLConnectionPointReferenceParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g"; }
> 
> 
> 
> 	private UMLConnectionPointReferenceGrammarAccess grammarAccess;
> 	
>- public InternalUMLConnectionPointReferenceParser(TokenStream input, IAstFactory factory, UMLConnectionPointReferenceGrammarAccess grammarAccess) {
>+ public InternalUMLConnectionPointReferenceParser(TokenStream input, UMLConnectionPointReferenceGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -85,8 +73,8 @@
> 
> 
> 
>- // $ANTLR start entryRuleConnectionPointReferenceRule
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:77:1: entryRuleConnectionPointReferenceRule returns [EObject current=null] : iv_ruleConnectionPointReferenceRule= ruleConnectionPointReferenceRule EOF ;
>+ // $ANTLR start "entryRuleConnectionPointReferenceRule"
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:67:1: entryRuleConnectionPointReferenceRule returns [EObject current=null] : iv_ruleConnectionPointReferenceRule= ruleConnectionPointReferenceRule EOF ;
> public final EObject entryRuleConnectionPointReferenceRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -94,13 +82,14 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:78:2: (iv_ruleConnectionPointReferenceRule= ruleConnectionPointReferenceRule EOF )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:79:2: iv_ruleConnectionPointReferenceRule= ruleConnectionPointReferenceRule EOF
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:68:2: (iv_ruleConnectionPointReferenceRule= ruleConnectionPointReferenceRule EOF )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:69:2: iv_ruleConnectionPointReferenceRule= ruleConnectionPointReferenceRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getConnectionPointReferenceRuleRule(), currentNode); 
>+ newCompositeNode(grammarAccess.getConnectionPointReferenceRuleRule()); 
> pushFollow(FOLLOW_ruleConnectionPointReferenceRule_in_entryRuleConnectionPointReferenceRule75);
> iv_ruleConnectionPointReferenceRule=ruleConnectionPointReferenceRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleConnectionPointReferenceRule; 
> match(input,EOF,FOLLOW_EOF_in_entryRuleConnectionPointReferenceRule85); 
>@@ -117,21 +106,30 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleConnectionPointReferenceRule
>+ // $ANTLR end "entryRuleConnectionPointReferenceRule"
> 
> 
>- // $ANTLR start ruleConnectionPointReferenceRule
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:86:1: ruleConnectionPointReferenceRule returns [EObject current=null] : ( ( 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) | ( 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) )? ;
>+ // $ANTLR start "ruleConnectionPointReferenceRule"
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:76:1: ruleConnectionPointReferenceRule returns [EObject current=null] : ( (otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )* ) | (otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )* ) )? ;
> public final EObject ruleConnectionPointReferenceRule() throws RecognitionException {
> EObject current = null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+ Token otherlv_2=null;
>+ Token otherlv_3=null;
>+ Token otherlv_4=null;
>+ Token otherlv_5=null;
>+ Token otherlv_6=null;
>+ Token otherlv_7=null;
>+
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:91:6: ( ( ( 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) | ( 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) )? )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:92:1: ( ( 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) | ( 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) )?
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:79:28: ( ( (otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )* ) | (otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )* ) )? )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:80:1: ( (otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )* ) | (otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )* ) )?
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:92:1: ( ( 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) | ( 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* ) )?
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:80:1: ( (otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )* ) | (otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )* ) )?
> int alt3=3;
> int LA3_0 = input.LA(1);
> 
>@@ -143,30 +141,29 @@
> }
> switch (alt3) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:92:2: ( 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:80:2: (otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )* )
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:92:2: ( 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:92:4: 'entry' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:80:2: (otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )* )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:80:4: otherlv_0= 'entry' ( (otherlv_1= RULE_ID ) ) (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )*
> {
>- match(input,11,FOLLOW_11_in_ruleConnectionPointReferenceRule121); 
>+ otherlv_0=(Token)match(input,11,FOLLOW_11_in_ruleConnectionPointReferenceRule123); 
> 
>- createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getEntryKeyword_0_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getConnectionPointReferenceRuleAccess().getEntryKeyword_0_0());
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:96:1: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:97:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:84:1: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:85:1: (otherlv_1= RULE_ID )
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:97:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:98:3: RULE_ID
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:85:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:86:3: otherlv_1= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule139); 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule143); 
> 
>- 		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_1_0(), "entry"); 
>+ 		newLeafNode(otherlv_1, grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_1_0()); 
> 	
> 
> }
>@@ -174,7 +171,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:110:2: ( ',' ( ( RULE_ID ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:97:2: (otherlv_2= ',' ( (otherlv_3= RULE_ID ) ) )*
> loop1:
> do {
> int alt1=2;
>@@ -187,27 +184,26 @@
> 
> switch (alt1) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:110:4: ',' ( ( RULE_ID ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:97:4: otherlv_2= ',' ( (otherlv_3= RULE_ID ) )
> 	 {
>- 	 match(input,12,FOLLOW_12_in_ruleConnectionPointReferenceRule150); 
>+ 	 otherlv_2=(Token)match(input,12,FOLLOW_12_in_ruleConnectionPointReferenceRule156); 
> 
>- 	 createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_0_2_0(), null); 
>+ 	 	newLeafNode(otherlv_2, grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_0_2_0());
> 	 
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:114:1: ( ( RULE_ID ) )
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:115:1: ( RULE_ID )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:101:1: ( (otherlv_3= RULE_ID ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:102:1: (otherlv_3= RULE_ID )
> 	 {
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:115:1: ( RULE_ID )
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:116:3: RULE_ID
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:102:1: (otherlv_3= RULE_ID )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:103:3: otherlv_3= RULE_ID
> 	 {
> 
> 	 			if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode, current);
>+ 	 	 current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 	 }
> 	 
>- 	 match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule168); 
>+ 	 otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule176); 
> 
>- 	 		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_2_1_0(), "entry"); 
>+ 	 		newLeafNode(otherlv_3, grammarAccess.getConnectionPointReferenceRuleAccess().getEntryPseudostateCrossReference_0_2_1_0()); 
> 	 	
> 
> 	 }
>@@ -231,30 +227,29 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:129:6: ( 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:115:6: (otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )* )
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:129:6: ( 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )* )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:129:8: 'exit' ( ( RULE_ID ) ) ( ',' ( ( RULE_ID ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:115:6: (otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )* )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:115:8: otherlv_4= 'exit' ( (otherlv_5= RULE_ID ) ) (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )*
> {
>- match(input,13,FOLLOW_13_in_ruleConnectionPointReferenceRule188); 
>+ otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleConnectionPointReferenceRule198); 
> 
>- createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getExitKeyword_1_0(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getConnectionPointReferenceRuleAccess().getExitKeyword_1_0());
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:133:1: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:134:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:119:1: ( (otherlv_5= RULE_ID ) )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:120:1: (otherlv_5= RULE_ID )
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:134:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:135:3: RULE_ID
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:120:1: (otherlv_5= RULE_ID )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:121:3: otherlv_5= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule206); 
>+ otherlv_5=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule218); 
> 
>- 		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_1_0(), "exit"); 
>+ 		newLeafNode(otherlv_5, grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_1_0()); 
> 	
> 
> }
>@@ -262,7 +257,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:147:2: ( ',' ( ( RULE_ID ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:132:2: (otherlv_6= ',' ( (otherlv_7= RULE_ID ) ) )*
> loop2:
> do {
> int alt2=2;
>@@ -275,27 +270,26 @@
> 
> switch (alt2) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:147:4: ',' ( ( RULE_ID ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:132:4: otherlv_6= ',' ( (otherlv_7= RULE_ID ) )
> 	 {
>- 	 match(input,12,FOLLOW_12_in_ruleConnectionPointReferenceRule217); 
>+ 	 otherlv_6=(Token)match(input,12,FOLLOW_12_in_ruleConnectionPointReferenceRule231); 
> 
>- 	 createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_1_2_0(), null); 
>+ 	 	newLeafNode(otherlv_6, grammarAccess.getConnectionPointReferenceRuleAccess().getCommaKeyword_1_2_0());
> 	 
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:151:1: ( ( RULE_ID ) )
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:152:1: ( RULE_ID )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:136:1: ( (otherlv_7= RULE_ID ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:137:1: (otherlv_7= RULE_ID )
> 	 {
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:152:1: ( RULE_ID )
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:153:3: RULE_ID
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:137:1: (otherlv_7= RULE_ID )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parser/antlr/internal/InternalUMLConnectionPointReference.g:138:3: otherlv_7= RULE_ID
> 	 {
> 
> 	 			if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getConnectionPointReferenceRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode, current);
>+ 	 	 current = createModelElement(grammarAccess.getConnectionPointReferenceRuleRule());
> 	 	 }
> 	 
>- 	 match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule235); 
>+ 	 otherlv_7=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule251); 
> 
>- 	 		createLeafNode(grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_2_1_0(), "exit"); 
>+ 	 		newLeafNode(otherlv_7, grammarAccess.getConnectionPointReferenceRuleAccess().getExitPseudostateCrossReference_1_2_1_0()); 
> 	 	
> 
> 	 }
>@@ -324,9 +318,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -337,20 +329,22 @@
> }
> return current;
> }
>- // $ANTLR end ruleConnectionPointReferenceRule
>+ // $ANTLR end "ruleConnectionPointReferenceRule"
> 
>+ // Delegated rules
>+
> 
> 
> 
> public static final BitSet FOLLOW_ruleConnectionPointReferenceRule_in_entryRuleConnectionPointReferenceRule75 = new BitSet(new long[]{0x0000000000000000L});
> public static final BitSet FOLLOW_EOF_in_entryRuleConnectionPointReferenceRule85 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_11_in_ruleConnectionPointReferenceRule121 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule139 = new BitSet(new long[]{0x0000000000001002L});
>- public static final BitSet FOLLOW_12_in_ruleConnectionPointReferenceRule150 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule168 = new BitSet(new long[]{0x0000000000001002L});
>- public static final BitSet FOLLOW_13_in_ruleConnectionPointReferenceRule188 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule206 = new BitSet(new long[]{0x0000000000001002L});
>- public static final BitSet FOLLOW_12_in_ruleConnectionPointReferenceRule217 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule235 = new BitSet(new long[]{0x0000000000001002L});
>+ public static final BitSet FOLLOW_11_in_ruleConnectionPointReferenceRule123 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule143 = new BitSet(new long[]{0x0000000000001002L});
>+ public static final BitSet FOLLOW_12_in_ruleConnectionPointReferenceRule156 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule176 = new BitSet(new long[]{0x0000000000001002L});
>+ public static final BitSet FOLLOW_13_in_ruleConnectionPointReferenceRule198 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule218 = new BitSet(new long[]{0x0000000000001002L});
>+ public static final BitSet FOLLOW_12_in_ruleConnectionPointReferenceRule231 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleConnectionPointReferenceRule251 = new BitSet(new long[]{0x0000000000001002L});
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore	(working copy)
>@@ -6,8 +6,8 @@
> nsPrefix="uMLConnectionPointReference">
> <eClassifiers xsi:type="ecore:EClass" name="ConnectionPointReferenceRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="entry" unique="false" upperBound="-1"
>- eType="ecore:EClass ../../../../../../../model/UML.ecore#//Pseudostate"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/model/UML.ecore#//Pseudostate"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="exit" unique="false" upperBound="-1"
>- eType="ecore:EClass ../../../../../../../model/UML.ecore#//Pseudostate"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/model/UML.ecore#//Pseudostate"/>
> </eClassifiers>
> </ecore:EPackage>
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parseTreeConstruction/UMLConnectionPointReferenceParsetreeConstructor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parseTreeConstruction/UMLConnectionPointReferenceParsetreeConstructor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/parseTreeConstruction/UMLConnectionPointReferenceParsetreeConstructor.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.parseTreeConstruction;
> 
> import org.eclipse.emf.ecore.*;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/validation/AbstractUMLConnectionPointReferenceJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/validation/AbstractUMLConnectionPointReferenceJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/validation/AbstractUMLConnectionPointReferenceJavaValidator.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.validation;
> 
> import java.util.ArrayList;
>@@ -23,7 +10,7 @@
> @ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUMLConnectionPointReferenceJavaValidator extends AbstractDeclarativeValidator {
> 
>-@Override
>+	@Override
> 	protected List<EPackage> getEPackages() {
> 	 List<EPackage> result = new ArrayList<EPackage>();
> 	 result.add(org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.UMLConnectionPointReferencePackage.eINSTANCE);
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReferenceStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReferenceStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReferenceStandaloneSetupGenerated.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
> 
> package org.eclipse.papyrus.connectionpointreference.editor.xtext;
> 
>@@ -52,6 +39,5 @@
> 
> 
> 
>-
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.genmodel	(working copy)
>@@ -8,12 +8,12 @@
> modelName="UMLConnectionPointReference" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.connectionpointreference.editor.xtext.edit"
> editorPluginID="org.eclipse.papyrus.connectionpointreference.editor.xtext.editor"
>- usedGenPackages="../../../../../../../model/UML.genmodel#//uml">
>+ usedGenPackages="platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/model/UML.genmodel#//uml">
> <genPackages prefix="UMLConnectionPointReference" basePackage="org.eclipse.papyrus.connectionpointreference.editor.xtext"
>- resource="XML" disposableProviderFactory="true" ecorePackage="UMLConnectionPointReference.ecore#/">
>- <genClasses ecoreClass="UMLConnectionPointReference.ecore#//ConnectionPointReferenceRule">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UMLConnectionPointReference.ecore#//ConnectionPointReferenceRule/entry"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UMLConnectionPointReference.ecore#//ConnectionPointReferenceRule/exit"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore#/">
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore#//ConnectionPointReferenceRule">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore#//ConnectionPointReferenceRule/entry"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.connectionpointreference.editor.xtext/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.ecore#//ConnectionPointReferenceRule/exit"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/AbstractUMLConnectionPointReferenceRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/AbstractUMLConnectionPointReferenceRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/AbstractUMLConnectionPointReferenceRuntimeModule.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+ * generated by Xtext
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext;
> 
> import java.util.Properties;
>@@ -55,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.UMLConnectionPointReferenceParser.class;
> 	}
> 
>@@ -101,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -109,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>@@ -136,7 +131,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
> 	}
> 
> }
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/UMLConnectionPointReferenceFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/UMLConnectionPointReferenceFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/UMLConnectionPointReferenceFactoryImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.impl;
> 
> import org.eclipse.emf.ecore.EClass;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/ConnectionPointReferenceRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/ConnectionPointReferenceRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/ConnectionPointReferenceRuleImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.impl;
> 
> import java.util.Collection;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/UMLConnectionPointReferencePackageImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/UMLConnectionPointReferencePackageImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/impl/UMLConnectionPointReferencePackageImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.impl;
> 
> import org.eclipse.emf.ecore.EClass;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/ConnectionPointReferenceRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/ConnectionPointReferenceRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/ConnectionPointReferenceRule.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference;
> 
> import org.eclipse.emf.common.util.EList;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/UMLConnectionPointReferencePackage.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/UMLConnectionPointReferencePackage.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/UMLConnectionPointReferencePackage.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference;
> 
> import org.eclipse.emf.ecore.EClass;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceResourceFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceResourceFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceResourceFactoryImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.util;
> 
> import org.eclipse.emf.common.util.URI;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceXMLProcessor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceXMLProcessor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceXMLProcessor.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.util;
> 
> import java.util.Map;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceSwitch.java	(working copy)
>@@ -1,22 +1,15 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>-package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.util;
> 
>-import java.util.List;
>+ */
>+package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.util;
> 
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
> 
> import org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.*;
> 
>@@ -33,7 +26,7 @@
> * @see org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.UMLConnectionPointReferencePackage
> * @generated
> */
>-public class UMLConnectionPointReferenceSwitch<T>
>+public class UMLConnectionPointReferenceSwitch<T> extends Switch<T>
> {
> /**
> * The cached model package
>@@ -58,15 +51,17 @@
> }
> 
> /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * Checks whether this is a switch for the given package.
> * 
> * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
> * @generated
> */
>- public T doSwitch(EObject theEObject)
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
> {
>- return doSwitch(theEObject.eClass(), theEObject);
>+ return ePackage == modelPackage;
> }
> 
> /**
>@@ -76,29 +71,7 @@
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>- protected T doSwitch(EClass theEClass, EObject theEObject)
>- {
>- if (theEClass.eContainer() == modelPackage)
>- {
>- return doSwitch(theEClass.getClassifierID(), theEObject);
>- }
>- else
>- {
>- List<EClass> eSuperTypes = theEClass.getESuperTypes();
>- return
>- eSuperTypes.isEmpty() ?
>- defaultCase(theEObject) :
>- doSwitch(eSuperTypes.get(0), theEObject);
>- }
>- }
>-
>- /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>- * 
>- * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>- * @generated
>- */
>+ @Override
> protected T doSwitch(int classifierID, EObject theEObject)
> {
> switch (classifierID)
>@@ -141,6 +114,7 @@
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
> */
>+ @Override
> public T defaultCase(EObject object)
> {
> return null;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceAdapterFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceAdapterFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceAdapterFactory.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.util;
> 
> import org.eclipse.emf.common.notify.Adapter;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceResourceImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceResourceImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/util/UMLConnectionPointReferenceResourceImpl.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference.util;
> 
> import org.eclipse.emf.common.util.URI;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/UMLConnectionPointReferenceFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/UMLConnectionPointReferenceFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/uMLConnectionPointReference/UMLConnectionPointReferenceFactory.java	(working copy)
>@@ -1,16 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>+/**
>+ * <copyright>
>+ * </copyright>
> *
>- *****************************************************************************/
>+
>+ */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.uMLConnectionPointReference;
> 
> import org.eclipse.emf.ecore.EFactory;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/services/UMLConnectionPointReferenceGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/services/UMLConnectionPointReferenceGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/services/UMLConnectionPointReferenceGrammarAccess.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> 
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.services;
> 
>@@ -169,8 +159,8 @@
> 	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaTerminals.getSTRINGRule();
> 	} 
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/UMLConnectionPointReference.xmi	(working copy)
>@@ -122,6 +122,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -147,6 +148,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>#P org.eclipse.papyrus.transition.editor.xtext
>Index: model/VSL.genmodel
>===================================================================
>--- model/VSL.genmodel	(revision 4043)
>+++ model/VSL.genmodel	(working copy)
>@@ -1,144 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<genmodel:GenModel xmi:version="2.0"
>- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
>- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.marte.vsl/src-gen"
>- editDirectory="/org.eclipse.papyrus.marte.vsl.edit/src" editorDirectory="/org.eclipse.papyrus.marte.vsl.editor/src"
>- modelPluginID="org.eclipse.papyrus.marte.vsl" forceOverwrite="true" modelName="VSL"
>- updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
>- complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.marte.vsl.edit"
>- editorPluginID="org.eclipse.papyrus.marte.vsl.editor" usedGenPackages="../../../../../../model/UML.genmodel#//uml">
>- <genPackages prefix="VSL" basePackage="org.eclipse.papyrus.marte.vsl" resource="XML"
>- disposableProviderFactory="true" ecorePackage="VSL.ecore#/">
>- <genClasses ecoreClass="VSL.ecore#//Model">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Model/imports"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Model/context"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Model/value"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Import">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//Import/importURI"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Context">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//Context/context"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Expression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Expression/exp"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//AndOrXorExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//AndOrXorExpression/exp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//AndOrXorExpression/op"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//EqualityExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//EqualityExpression/exp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//EqualityExpression/op"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//RelationalExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//RelationalExpression/exp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//RelationalExpression/op"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//ConditionalExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//ConditionalExpression/exp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//ConditionalExpression/op"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//AdditiveExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//AdditiveExpression/exp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//AdditiveExpression/op"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//MultiplicativeExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//MultiplicativeExpression/exp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//MultiplicativeExpression/op"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//UnaryExpression">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//UnaryExpression/op"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//UnaryExpression/unary"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//UnaryExpression/exp"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//PrimaryExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//PrimaryExpression/prefix"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//PrimaryExpression/suffix"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//ValueSpecification"/>
>- <genClasses ecoreClass="VSL.ecore#//OperationCallExpression">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//OperationCallExpression/operation"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//OperationCallExpression/arguments"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Literal">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//Literal/value"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Name">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Name/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//Name/id"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//QualifiedName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//QualifiedName/path"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//QualifiedName/remaining"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Interval">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//Interval/isLowerIncluded"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Interval/lower"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Interval/upper"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//Interval/isUpperIncluded"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//CollectionOrTuple">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//CollectionOrTuple/listOfValues"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Tuple">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Tuple/listOfValueNamePairs"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//Choice">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//Choice/chosenAlternative"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//Choice/value"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//ListOfValues">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//ListOfValues/values"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//ListOfValueNamePairs">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//ListOfValueNamePairs/valueNamePairs"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//ValueNamePair">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//ValueNamePair/property"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//ValueNamePair/value"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//TimeExpression"/>
>- <genClasses ecoreClass="VSL.ecore#//InstantObsExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//InstantObsExpression/id"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//InstantObsExpression/index"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//InstantObsExpression/condition"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//InstantObsName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//InstantObsName/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//InstantObsName/instantId"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//DurationObsExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//DurationObsExpression/id"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//DurationObsExpression/index"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//DurationObsExpression/condition"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//DurationObsName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//DurationObsName/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//DurationObsName/durationId"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//JitterExp">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//JitterExp/firstInstant"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//JitterExp/secondInstant"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//VariableDeclaration">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//VariableDeclaration/variableDeclaration"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VSL.ecore#//VariableDeclaration/name"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//VariableDeclaration/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VSL.ecore#//VariableDeclaration/initValue"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//DataTypeName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//DataTypeName/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference VSL.ecore#//DataTypeName/type"/>
>- </genClasses>
>- <genClasses ecoreClass="VSL.ecore#//NumberLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//IntegerLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//UnlimitedLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//RealLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//DateTimeLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//BooleanLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//NullLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//DefaultLiteralRule"/>
>- <genClasses ecoreClass="VSL.ecore#//StringLiteralRule"/>
>- </genPackages>
>-</genmodel:GenModel>
>Index: model/VSL.ecore
>===================================================================
>--- model/VSL.ecore	(revision 4043)
>+++ model/VSL.ecore	(working copy)
>@@ -1,181 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<ecore:EPackage xmi:version="2.0"
>- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="vSL"
>- nsURI="http://www.eclipse.org/papyrus/marte/vsl/VSL" nsPrefix="vSL">
>- <eClassifiers xsi:type="ecore:EClass" name="Model">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="imports" eType="#//Import"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="context" eType="#//Context"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Import">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="importURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Context">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="context" eType="ecore:EClass ../../../../../../model/UML.ecore#//NamedElement"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" eType="#//AndOrXorExpression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AndOrXorExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" upperBound="-1" eType="#//EqualityExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" unique="false" upperBound="-1"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="EqualityExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" upperBound="-1" eType="#//RelationalExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" unique="false" upperBound="-1"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="RelationalExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" upperBound="-1" eType="#//ConditionalExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" unique="false" upperBound="-1"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ConditionalExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" upperBound="-1" eType="#//AdditiveExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" unique="false" upperBound="-1"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AdditiveExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" upperBound="-1" eType="#//MultiplicativeExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" unique="false" upperBound="-1"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="MultiplicativeExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" upperBound="-1" eType="#//UnaryExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" unique="false" upperBound="-1"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="UnaryExpression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="unary" eType="#//UnaryExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exp" eType="#//PrimaryExpression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimaryExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="prefix" eType="#//ValueSpecification"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="suffix" eType="#//OperationCallExpression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ValueSpecification"/>
>- <eClassifiers xsi:type="ecore:EClass" name="OperationCallExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="operation" eType="ecore:EClass ../../../../../../model/UML.ecore#//Operation"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" eType="#//ListOfValues"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Literal" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Name" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//QualifiedName"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="id" eType="ecore:EClass ../../../../../../model/UML.ecore#//NamedElement"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="QualifiedName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass ../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="#//QualifiedName"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Interval" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isLowerIncluded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="lower" eType="#//Expression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="upper" eType="#//Expression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isUpperIncluded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="CollectionOrTuple" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="listOfValues" eType="#//ListOfValues"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Tuple" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="listOfValueNamePairs" eType="#//ListOfValueNamePairs"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Choice" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="chosenAlternative" eType="ecore:EClass ../../../../../../model/UML.ecore#//Property"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ListOfValues">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ListOfValueNamePairs">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="valueNamePairs" upperBound="-1"
>- eType="#//ValueNamePair" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ValueNamePair">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass ../../../../../../model/UML.ecore#//Property"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TimeExpression" eSuperTypes="#//ValueSpecification"/>
>- <eClassifiers xsi:type="ecore:EClass" name="InstantObsExpression" eSuperTypes="#//TimeExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="id" eType="#//InstantObsName"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//Expression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Expression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="InstantObsName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" unique="false" upperBound="-1"
>- eType="ecore:EClass ../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="instantId" eType="ecore:EClass ../../../../../../model/UML.ecore#//TimeObservation"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="DurationObsExpression" eSuperTypes="#//TimeExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="id" eType="#//DurationObsName"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//Expression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Expression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="DurationObsName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" unique="false" upperBound="-1"
>- eType="ecore:EClass ../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="durationId" eType="ecore:EClass ../../../../../../model/UML.ecore#//DurationObservation"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="JitterExp" eSuperTypes="#//TimeExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="firstInstant" eType="#//InstantObsExpression"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="secondInstant" eType="#//InstantObsExpression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="VariableDeclaration" eSuperTypes="#//ValueSpecification">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="variableDeclaration" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//DataTypeName"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="initValue" eType="#//Expression"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="DataTypeName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" unique="false" upperBound="-1"
>- eType="ecore:EClass ../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../../../../model/UML.ecore#//DataType"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="NumberLiteralRule" eSuperTypes="#//Literal"/>
>- <eClassifiers xsi:type="ecore:EClass" name="IntegerLiteralRule" eSuperTypes="#//NumberLiteralRule"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnlimitedLiteralRule" eSuperTypes="#//NumberLiteralRule"/>
>- <eClassifiers xsi:type="ecore:EClass" name="RealLiteralRule" eSuperTypes="#//NumberLiteralRule"/>
>- <eClassifiers xsi:type="ecore:EClass" name="DateTimeLiteralRule" eSuperTypes="#//Literal"/>
>- <eClassifiers xsi:type="ecore:EClass" name="BooleanLiteralRule" eSuperTypes="#//Literal"/>
>- <eClassifiers xsi:type="ecore:EClass" name="NullLiteralRule" eSuperTypes="#//Literal"/>
>- <eClassifiers xsi:type="ecore:EClass" name="DefaultLiteralRule" eSuperTypes="#//Literal"/>
>- <eClassifiers xsi:type="ecore:EClass" name="StringLiteralRule" eSuperTypes="#//Literal"/>
>-</ecore:EPackage>
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -20,7 +20,7 @@
> org.antlr.runtime,
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0"
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.transition.editor.xtext,
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore	(working copy)
>@@ -5,32 +5,33 @@
> nsURI="http://www.eclipse.org/papyrus/transition/editor/xtext/UmlTransition" nsPrefix="umlTransition">
> <eClassifiers xsi:type="ecore:EClass" name="TransitionRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
>- eType="#//EventRule" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="#//GuardRule"
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EventRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="effect" eType="#//EffectRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//GuardRule"
>+ containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="effect" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EffectRule"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="EventRule"/>
>- <eClassifiers xsi:type="ecore:EClass" name="CallOrSignalEventRule" eSuperTypes="#//EventRule">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="operationOrSignal" eType="ecore:EClass ../../../../../../../model/UML.ecore#//NamedElement"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="CallOrSignalEventRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EventRule">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="operationOrSignal" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.transition.editor.xtext/model/UML.ecore#//NamedElement"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AnyReceiveEventRule" eSuperTypes="#//EventRule">
>+ <eClassifiers xsi:type="ecore:EClass" name="AnyReceiveEventRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EventRule">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAReceiveEvent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TimeEventRule" eSuperTypes="#//EventRule">
>+ <eClassifiers xsi:type="ecore:EClass" name="TimeEventRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EventRule">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="expr" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="RelativeTimeEventRule" eSuperTypes="#//TimeEventRule"/>
>- <eClassifiers xsi:type="ecore:EClass" name="AbsoluteTimeEventRule" eSuperTypes="#//TimeEventRule"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ChangeEventRule" eSuperTypes="#//EventRule">
>+ <eClassifiers xsi:type="ecore:EClass" name="RelativeTimeEventRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TimeEventRule"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="AbsoluteTimeEventRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TimeEventRule"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ChangeEventRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EventRule">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="exp" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="GuardRule">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="EffectRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//BehaviorKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//BehaviorKind"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="behaviorName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="BehaviorKind">
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.xmi	(working copy)
>@@ -214,6 +214,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -239,6 +240,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.genmodel	(working copy)
>@@ -6,40 +6,40 @@
> modelPluginID="org.eclipse.papyrus.transition.editor.xtext" forceOverwrite="true"
> modelName="UmlTransition" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.transition.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.transition.editor.xtext.editor" usedGenPackages="../../../../../../../model/UML.genmodel#//uml">
>+ editorPluginID="org.eclipse.papyrus.transition.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/model/UML.genmodel#//uml">
> <genPackages prefix="UmlTransition" basePackage="org.eclipse.papyrus.transition.editor.xtext"
>- resource="XML" disposableProviderFactory="true" ecorePackage="UmlTransition.ecore#/">
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlTransition.ecore#//BehaviorKind">
>- <genEnumLiterals ecoreEnumLiteral="UmlTransition.ecore#//BehaviorKind/ACTIVITY"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlTransition.ecore#//BehaviorKind/STATE_MACHINE"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlTransition.ecore#//BehaviorKind/OPAQUE_BEHAVIOR"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#/">
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//BehaviorKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//BehaviorKind/ACTIVITY"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//BehaviorKind/STATE_MACHINE"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//BehaviorKind/OPAQUE_BEHAVIOR"/>
> </genEnums>
>- <genClasses ecoreClass="UmlTransition.ecore#//TransitionRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlTransition.ecore#//TransitionRule/triggers"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlTransition.ecore#//TransitionRule/guard"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlTransition.ecore#//TransitionRule/effect"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TransitionRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TransitionRule/triggers"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TransitionRule/guard"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TransitionRule/effect"/>
> </genClasses>
>- <genClasses ecoreClass="UmlTransition.ecore#//EventRule"/>
>- <genClasses ecoreClass="UmlTransition.ecore#//CallOrSignalEventRule">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlTransition.ecore#//CallOrSignalEventRule/operationOrSignal"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EventRule"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//CallOrSignalEventRule">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//CallOrSignalEventRule/operationOrSignal"/>
> </genClasses>
>- <genClasses ecoreClass="UmlTransition.ecore#//AnyReceiveEventRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlTransition.ecore#//AnyReceiveEventRule/isAReceiveEvent"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//AnyReceiveEventRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//AnyReceiveEventRule/isAReceiveEvent"/>
> </genClasses>
>- <genClasses ecoreClass="UmlTransition.ecore#//TimeEventRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlTransition.ecore#//TimeEventRule/expr"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TimeEventRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//TimeEventRule/expr"/>
> </genClasses>
>- <genClasses ecoreClass="UmlTransition.ecore#//RelativeTimeEventRule"/>
>- <genClasses ecoreClass="UmlTransition.ecore#//AbsoluteTimeEventRule"/>
>- <genClasses ecoreClass="UmlTransition.ecore#//ChangeEventRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlTransition.ecore#//ChangeEventRule/exp"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//RelativeTimeEventRule"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//AbsoluteTimeEventRule"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//ChangeEventRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//ChangeEventRule/exp"/>
> </genClasses>
>- <genClasses ecoreClass="UmlTransition.ecore#//GuardRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlTransition.ecore#//GuardRule/constraint"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//GuardRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//GuardRule/constraint"/>
> </genClasses>
>- <genClasses ecoreClass="UmlTransition.ecore#//EffectRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlTransition.ecore#//EffectRule/kind"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlTransition.ecore#//EffectRule/behaviorName"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EffectRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EffectRule/kind"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransition.ecore#//EffectRule/behaviorName"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/UmlTransitionParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/UmlTransitionParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/UmlTransitionParser.java	(working copy)
>@@ -3,14 +3,9 @@
> */
> package org.eclipse.papyrus.transition.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.papyrus.transition.editor.xtext.services.UmlTransitionGrammarAccess;
> 
> public class UmlTransitionParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>@@ -19,25 +14,13 @@
> 	private UmlTransitionGrammarAccess grammarAccess;
> 	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal.InternalUmlTransitionParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(),re);
>-		}
> 	}
> 	
>+	@Override
> 	protected org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal.InternalUmlTransitionParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal.InternalUmlTransitionParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal.InternalUmlTransitionParser(stream, getGrammarAccess());
> 	}
> 	
> 	@Override 
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransitionParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransitionParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransitionParser.java	(working copy)
>@@ -1,10 +1,8 @@
> package org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -12,7 +10,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.transition.editor.xtext.services.UmlTransitionGrammarAccess;
> 
> 
>@@ -28,37 +25,49 @@
> "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "','", "'all'", "'after'", "'at'", "'when'", "'['", "']'", "'/'", "'Activity'", "'StateMachine'", "'OpaqueBehavior'"
> };
> public static final int RULE_ID=4;
>- public static final int RULE_STRING=5;
> public static final int RULE_ANY_OTHER=10;
>- public static final int RULE_INT=6;
>- public static final int RULE_WS=9;
>- public static final int RULE_SL_COMMENT=8;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
> 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 T__19=19;
>+ public static final int RULE_STRING=5;
>+ 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=9;
>+
>+ // delegates
>+ // delegators
>+
> 
> public InternalUmlTransitionParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlTransitionParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlTransitionParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g"; }
> 
> 
> 
> 	private UmlTransitionGrammarAccess grammarAccess;
> 	
>- public InternalUmlTransitionParser(TokenStream input, IAstFactory factory, UmlTransitionGrammarAccess grammarAccess) {
>+ public InternalUmlTransitionParser(TokenStream input, UmlTransitionGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -73,8 +82,8 @@
> 
> 
> 
>- // $ANTLR start entryRuleTransitionRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:78:1: entryRuleTransitionRule returns [EObject current=null] : iv_ruleTransitionRule= ruleTransitionRule EOF ;
>+ // $ANTLR start "entryRuleTransitionRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:68:1: entryRuleTransitionRule returns [EObject current=null] : iv_ruleTransitionRule= ruleTransitionRule EOF ;
> public final EObject entryRuleTransitionRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -82,13 +91,14 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:79:2: (iv_ruleTransitionRule= ruleTransitionRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:80:2: iv_ruleTransitionRule= ruleTransitionRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:69:2: (iv_ruleTransitionRule= ruleTransitionRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:70:2: iv_ruleTransitionRule= ruleTransitionRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getTransitionRuleRule(), currentNode); 
>+ newCompositeNode(grammarAccess.getTransitionRuleRule()); 
> pushFollow(FOLLOW_ruleTransitionRule_in_entryRuleTransitionRule75);
> iv_ruleTransitionRule=ruleTransitionRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleTransitionRule; 
> match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionRule85); 
>@@ -105,14 +115,15 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleTransitionRule
>+ // $ANTLR end "entryRuleTransitionRule"
> 
> 
>- // $ANTLR start ruleTransitionRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:87:1: ruleTransitionRule returns [EObject current=null] : ( ( ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? ) ;
>+ // $ANTLR start "ruleTransitionRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:77:1: ruleTransitionRule returns [EObject current=null] : ( ( ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? ) ;
> public final EObject ruleTransitionRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_1=null;
> EObject lv_triggers_0_0 = null;
> 
> EObject lv_triggers_2_0 = null;
>@@ -122,16 +133,16 @@
> EObject lv_effect_4_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:92:6: ( ( ( ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:93:1: ( ( ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:80:28: ( ( ( ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:81:1: ( ( ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:93:1: ( ( ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:93:2: ( ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:81:1: ( ( ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )? )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:81:2: ( ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )? ( (lv_guard_3_0= ruleGuardRule ) )? ( (lv_effect_4_0= ruleEffectRule ) )?
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:93:2: ( ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:81:2: ( ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )* )?
> int alt2=2;
> int LA2_0 = input.LA(1);
> 
>@@ -140,37 +151,32 @@
> }
> switch (alt2) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:93:3: ( (lv_triggers_0_0= ruleEventRule ) ) ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:81:3: ( (lv_triggers_0_0= ruleEventRule ) ) (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )*
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:93:3: ( (lv_triggers_0_0= ruleEventRule ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:94:1: (lv_triggers_0_0= ruleEventRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:81:3: ( (lv_triggers_0_0= ruleEventRule ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:82:1: (lv_triggers_0_0= ruleEventRule )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:94:1: (lv_triggers_0_0= ruleEventRule )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:95:3: lv_triggers_0_0= ruleEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:82:1: (lv_triggers_0_0= ruleEventRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:83:3: lv_triggers_0_0= ruleEventRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_0_0()); 
> 	 
> pushFollow(FOLLOW_ruleEventRule_in_ruleTransitionRule132);
> lv_triggers_0_0=ruleEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		add(
>- 	 			current, 
>- 	 			"triggers",
>- 	 		lv_triggers_0_0, 
>- 	 		"EventRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			current, 
>+ 			"triggers",
>+ 		lv_triggers_0_0, 
>+ 		"EventRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -178,7 +184,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:117:2: ( ',' ( (lv_triggers_2_0= ruleEventRule ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:99:2: (otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) ) )*
> loop1:
> do {
> int alt1=2;
>@@ -191,41 +197,36 @@
> 
> switch (alt1) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:117:4: ',' ( (lv_triggers_2_0= ruleEventRule ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:99:4: otherlv_1= ',' ( (lv_triggers_2_0= ruleEventRule ) )
> 	 {
>- 	 match(input,11,FOLLOW_11_in_ruleTransitionRule143); 
>+ 	 otherlv_1=(Token)match(input,11,FOLLOW_11_in_ruleTransitionRule145); 
> 
>- 	 createLeafNode(grammarAccess.getTransitionRuleAccess().getCommaKeyword_0_1_0(), null); 
>+ 	 	newLeafNode(otherlv_1, grammarAccess.getTransitionRuleAccess().getCommaKeyword_0_1_0());
> 	 
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:121:1: ( (lv_triggers_2_0= ruleEventRule ) )
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:122:1: (lv_triggers_2_0= ruleEventRule )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:103:1: ( (lv_triggers_2_0= ruleEventRule ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:104:1: (lv_triggers_2_0= ruleEventRule )
> 	 {
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:122:1: (lv_triggers_2_0= ruleEventRule )
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:123:3: lv_triggers_2_0= ruleEventRule
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:104:1: (lv_triggers_2_0= ruleEventRule )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:105:3: lv_triggers_2_0= ruleEventRule
> 	 {
> 	 
>- 	 	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_1_1_0(), currentNode); 
>+ 	 	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_1_1_0()); 
> 	 	 
>- 	 pushFollow(FOLLOW_ruleEventRule_in_ruleTransitionRule164);
>+ 	 pushFollow(FOLLOW_ruleEventRule_in_ruleTransitionRule166);
> 	 lv_triggers_2_0=ruleEventRule();
>- 	 _fsp--;
>+
>+ 	 state._fsp--;
> 
> 
> 	 	 if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 	 }
>- 	 	 try {
>- 	 	 		add(
>- 	 	 			current, 
>- 	 	 			"triggers",
>- 	 	 		lv_triggers_2_0, 
>- 	 	 		"EventRule", 
>- 	 	 		currentNode);
>- 	 	 } catch (ValueConverterException vce) {
>- 	 				handleValueConverterException(vce);
>+ 	 	 current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 	 }
>- 	 	 currentNode = currentNode.getParent();
>+ 	 		add(
>+ 	 			current, 
>+ 	 			"triggers",
>+ 	 		lv_triggers_2_0, 
>+ 	 		"EventRule");
>+ 	 	 afterParserOrEnumRuleCall();
> 	 	 
> 
> 	 }
>@@ -248,7 +249,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:145:6: ( (lv_guard_3_0= ruleGuardRule ) )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:121:6: ( (lv_guard_3_0= ruleGuardRule ) )?
> int alt3=2;
> int LA3_0 = input.LA(1);
> 
>@@ -257,34 +258,29 @@
> }
> switch (alt3) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:146:1: (lv_guard_3_0= ruleGuardRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:122:1: (lv_guard_3_0= ruleGuardRule )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:146:1: (lv_guard_3_0= ruleGuardRule )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:147:3: lv_guard_3_0= ruleGuardRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:122:1: (lv_guard_3_0= ruleGuardRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:123:3: lv_guard_3_0= ruleGuardRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getGuardGuardRuleParserRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getGuardGuardRuleParserRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleGuardRule_in_ruleTransitionRule189);
>+ pushFollow(FOLLOW_ruleGuardRule_in_ruleTransitionRule191);
> lv_guard_3_0=ruleGuardRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"guard",
>- 	 		lv_guard_3_0, 
>- 	 		"GuardRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"guard",
>+ 		lv_guard_3_0, 
>+ 		"GuardRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -295,7 +291,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:169:3: ( (lv_effect_4_0= ruleEffectRule ) )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:139:3: ( (lv_effect_4_0= ruleEffectRule ) )?
> int alt4=2;
> int LA4_0 = input.LA(1);
> 
>@@ -304,34 +300,29 @@
> }
> switch (alt4) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:170:1: (lv_effect_4_0= ruleEffectRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:140:1: (lv_effect_4_0= ruleEffectRule )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:170:1: (lv_effect_4_0= ruleEffectRule )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:171:3: lv_effect_4_0= ruleEffectRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:140:1: (lv_effect_4_0= ruleEffectRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:141:3: lv_effect_4_0= ruleEffectRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getEffectEffectRuleParserRuleCall_2_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getEffectEffectRuleParserRuleCall_2_0()); 
> 	 
>- pushFollow(FOLLOW_ruleEffectRule_in_ruleTransitionRule211);
>+ pushFollow(FOLLOW_ruleEffectRule_in_ruleTransitionRule213);
> lv_effect_4_0=ruleEffectRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"effect",
>- 	 		lv_effect_4_0, 
>- 	 		"EffectRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"effect",
>+ 		lv_effect_4_0, 
>+ 		"EffectRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -348,9 +339,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -361,11 +350,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleTransitionRule
>+ // $ANTLR end "ruleTransitionRule"
> 
> 
>- // $ANTLR start entryRuleEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:201:1: entryRuleEventRule returns [EObject current=null] : iv_ruleEventRule= ruleEventRule EOF ;
>+ // $ANTLR start "entryRuleEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:165:1: entryRuleEventRule returns [EObject current=null] : iv_ruleEventRule= ruleEventRule EOF ;
> public final EObject entryRuleEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -373,16 +362,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:202:2: (iv_ruleEventRule= ruleEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:203:2: iv_ruleEventRule= ruleEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:166:2: (iv_ruleEventRule= ruleEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:167:2: iv_ruleEventRule= ruleEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleEventRule_in_entryRuleEventRule248);
>+ newCompositeNode(grammarAccess.getEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleEventRule_in_entryRuleEventRule250);
> iv_ruleEventRule=ruleEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleEventRule258); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleEventRule260); 
> 
> }
> 
>@@ -396,11 +386,11 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleEventRule
>+ // $ANTLR end "entryRuleEventRule"
> 
> 
>- // $ANTLR start ruleEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:210:1: ruleEventRule returns [EObject current=null] : (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule ) ;
>+ // $ANTLR start "ruleEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:174:1: ruleEventRule returns [EObject current=null] : (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule ) ;
> public final EObject ruleEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -413,13 +403,13 @@
> EObject this_ChangeEventRule_3 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:215:6: ( (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:216:1: (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:177:28: ( (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:178:1: (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:216:1: (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:178:1: (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule )
> int alt5=4;
> switch ( input.LA(1) ) {
> case RULE_ID:
>@@ -445,76 +435,80 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("216:1: (this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule | this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule | this_TimeEventRule_2= ruleTimeEventRule | this_ChangeEventRule_3= ruleChangeEventRule )", 5, 0, input);
>+ new NoViableAltException("", 5, 0, input);
> 
> throw nvae;
> }
> 
> switch (alt5) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:217:5: this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:179:5: this_CallOrSignalEventRule_0= ruleCallOrSignalEventRule
> {
> 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getCallOrSignalEventRuleParserRuleCall_0(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getCallOrSignalEventRuleParserRuleCall_0()); 
> 
>- pushFollow(FOLLOW_ruleCallOrSignalEventRule_in_ruleEventRule305);
>+ pushFollow(FOLLOW_ruleCallOrSignalEventRule_in_ruleEventRule307);
> this_CallOrSignalEventRule_0=ruleCallOrSignalEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> current = this_CallOrSignalEventRule_0; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:227:5: this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:189:5: this_AnyReceiveEventRule_1= ruleAnyReceiveEventRule
> {
> 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getAnyReceiveEventRuleParserRuleCall_1(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getAnyReceiveEventRuleParserRuleCall_1()); 
> 
>- pushFollow(FOLLOW_ruleAnyReceiveEventRule_in_ruleEventRule332);
>+ pushFollow(FOLLOW_ruleAnyReceiveEventRule_in_ruleEventRule334);
> this_AnyReceiveEventRule_1=ruleAnyReceiveEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> current = this_AnyReceiveEventRule_1; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:237:5: this_TimeEventRule_2= ruleTimeEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:199:5: this_TimeEventRule_2= ruleTimeEventRule
> {
> 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getTimeEventRuleParserRuleCall_2(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getTimeEventRuleParserRuleCall_2()); 
> 
>- pushFollow(FOLLOW_ruleTimeEventRule_in_ruleEventRule359);
>+ pushFollow(FOLLOW_ruleTimeEventRule_in_ruleEventRule361);
> this_TimeEventRule_2=ruleTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> current = this_TimeEventRule_2; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:247:5: this_ChangeEventRule_3= ruleChangeEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:209:5: this_ChangeEventRule_3= ruleChangeEventRule
> {
> 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getChangeEventRuleParserRuleCall_3(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getChangeEventRuleParserRuleCall_3()); 
> 
>- pushFollow(FOLLOW_ruleChangeEventRule_in_ruleEventRule386);
>+ pushFollow(FOLLOW_ruleChangeEventRule_in_ruleEventRule388);
> this_ChangeEventRule_3=ruleChangeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> current = this_ChangeEventRule_3; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> 
> 
> }
>@@ -525,9 +519,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -538,11 +530,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleEventRule
>+ // $ANTLR end "ruleEventRule"
> 
> 
>- // $ANTLR start entryRuleCallOrSignalEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:263:1: entryRuleCallOrSignalEventRule returns [EObject current=null] : iv_ruleCallOrSignalEventRule= ruleCallOrSignalEventRule EOF ;
>+ // $ANTLR start "entryRuleCallOrSignalEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:225:1: entryRuleCallOrSignalEventRule returns [EObject current=null] : iv_ruleCallOrSignalEventRule= ruleCallOrSignalEventRule EOF ;
> public final EObject entryRuleCallOrSignalEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -550,16 +542,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:264:2: (iv_ruleCallOrSignalEventRule= ruleCallOrSignalEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:265:2: iv_ruleCallOrSignalEventRule= ruleCallOrSignalEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:226:2: (iv_ruleCallOrSignalEventRule= ruleCallOrSignalEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:227:2: iv_ruleCallOrSignalEventRule= ruleCallOrSignalEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getCallOrSignalEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleCallOrSignalEventRule_in_entryRuleCallOrSignalEventRule421);
>+ newCompositeNode(grammarAccess.getCallOrSignalEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleCallOrSignalEventRule_in_entryRuleCallOrSignalEventRule423);
> iv_ruleCallOrSignalEventRule=ruleCallOrSignalEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleCallOrSignalEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleCallOrSignalEventRule431); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleCallOrSignalEventRule433); 
> 
> }
> 
>@@ -573,35 +566,36 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleCallOrSignalEventRule
>+ // $ANTLR end "entryRuleCallOrSignalEventRule"
> 
> 
>- // $ANTLR start ruleCallOrSignalEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:272:1: ruleCallOrSignalEventRule returns [EObject current=null] : ( ( RULE_ID ) ) ;
>+ // $ANTLR start "ruleCallOrSignalEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:234:1: ruleCallOrSignalEventRule returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
> public final EObject ruleCallOrSignalEventRule() throws RecognitionException {
> EObject current = null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ Token otherlv_0=null;
>+
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:277:6: ( ( ( RULE_ID ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:278:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:237:28: ( ( (otherlv_0= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:238:1: ( (otherlv_0= RULE_ID ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:278:1: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:279:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:238:1: ( (otherlv_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:239:1: (otherlv_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:279:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:280:3: RULE_ID
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:239:1: (otherlv_0= RULE_ID )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:240:3: otherlv_0= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getCallOrSignalEventRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getCallOrSignalEventRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCallOrSignalEventRule473); 
>+ otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCallOrSignalEventRule477); 
> 
>- 		createLeafNode(grammarAccess.getCallOrSignalEventRuleAccess().getOperationOrSignalNamedElementCrossReference_0(), "operationOrSignal"); 
>+ 		newLeafNode(otherlv_0, grammarAccess.getCallOrSignalEventRuleAccess().getOperationOrSignalNamedElementCrossReference_0()); 
> 	
> 
> }
>@@ -612,9 +606,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -625,11 +617,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleCallOrSignalEventRule
>+ // $ANTLR end "ruleCallOrSignalEventRule"
> 
> 
>- // $ANTLR start entryRuleAnyReceiveEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:300:1: entryRuleAnyReceiveEventRule returns [EObject current=null] : iv_ruleAnyReceiveEventRule= ruleAnyReceiveEventRule EOF ;
>+ // $ANTLR start "entryRuleAnyReceiveEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:259:1: entryRuleAnyReceiveEventRule returns [EObject current=null] : iv_ruleAnyReceiveEventRule= ruleAnyReceiveEventRule EOF ;
> public final EObject entryRuleAnyReceiveEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -637,16 +629,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:301:2: (iv_ruleAnyReceiveEventRule= ruleAnyReceiveEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:302:2: iv_ruleAnyReceiveEventRule= ruleAnyReceiveEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:260:2: (iv_ruleAnyReceiveEventRule= ruleAnyReceiveEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:261:2: iv_ruleAnyReceiveEventRule= ruleAnyReceiveEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getAnyReceiveEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleAnyReceiveEventRule_in_entryRuleAnyReceiveEventRule508);
>+ newCompositeNode(grammarAccess.getAnyReceiveEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleAnyReceiveEventRule_in_entryRuleAnyReceiveEventRule512);
> iv_ruleAnyReceiveEventRule=ruleAnyReceiveEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleAnyReceiveEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleAnyReceiveEventRule518); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleAnyReceiveEventRule522); 
> 
> }
> 
>@@ -660,44 +653,37 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleAnyReceiveEventRule
>+ // $ANTLR end "entryRuleAnyReceiveEventRule"
> 
> 
>- // $ANTLR start ruleAnyReceiveEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:309:1: ruleAnyReceiveEventRule returns [EObject current=null] : ( (lv_isAReceiveEvent_0_0= 'all' ) ) ;
>+ // $ANTLR start "ruleAnyReceiveEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:268:1: ruleAnyReceiveEventRule returns [EObject current=null] : ( (lv_isAReceiveEvent_0_0= 'all' ) ) ;
> public final EObject ruleAnyReceiveEventRule() throws RecognitionException {
> EObject current = null;
> 
> Token lv_isAReceiveEvent_0_0=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:314:6: ( ( (lv_isAReceiveEvent_0_0= 'all' ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:315:1: ( (lv_isAReceiveEvent_0_0= 'all' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:271:28: ( ( (lv_isAReceiveEvent_0_0= 'all' ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:272:1: ( (lv_isAReceiveEvent_0_0= 'all' ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:315:1: ( (lv_isAReceiveEvent_0_0= 'all' ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:316:1: (lv_isAReceiveEvent_0_0= 'all' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:272:1: ( (lv_isAReceiveEvent_0_0= 'all' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:273:1: (lv_isAReceiveEvent_0_0= 'all' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:316:1: (lv_isAReceiveEvent_0_0= 'all' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:317:3: lv_isAReceiveEvent_0_0= 'all'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:273:1: (lv_isAReceiveEvent_0_0= 'all' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:274:3: lv_isAReceiveEvent_0_0= 'all'
> {
>- lv_isAReceiveEvent_0_0=(Token)input.LT(1);
>- match(input,12,FOLLOW_12_in_ruleAnyReceiveEventRule560); 
>+ lv_isAReceiveEvent_0_0=(Token)match(input,12,FOLLOW_12_in_ruleAnyReceiveEventRule564); 
> 
>- createLeafNode(grammarAccess.getAnyReceiveEventRuleAccess().getIsAReceiveEventAllKeyword_0(), "isAReceiveEvent"); 
>+ newLeafNode(lv_isAReceiveEvent_0_0, grammarAccess.getAnyReceiveEventRuleAccess().getIsAReceiveEventAllKeyword_0());
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getAnyReceiveEventRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 
>- 	 try {
>- 	 		set(current, "isAReceiveEvent", lv_isAReceiveEvent_0_0, "all", lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getAnyReceiveEventRuleRule());
> 	 }
>+ 		setWithLastConsumed(current, "isAReceiveEvent", lv_isAReceiveEvent_0_0, "all");
> 	 
> 
> }
>@@ -708,9 +694,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -721,11 +705,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleAnyReceiveEventRule
>+ // $ANTLR end "ruleAnyReceiveEventRule"
> 
> 
>- // $ANTLR start entryRuleTimeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:344:1: entryRuleTimeEventRule returns [EObject current=null] : iv_ruleTimeEventRule= ruleTimeEventRule EOF ;
>+ // $ANTLR start "entryRuleTimeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:295:1: entryRuleTimeEventRule returns [EObject current=null] : iv_ruleTimeEventRule= ruleTimeEventRule EOF ;
> public final EObject entryRuleTimeEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -733,16 +717,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:345:2: (iv_ruleTimeEventRule= ruleTimeEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:346:2: iv_ruleTimeEventRule= ruleTimeEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:296:2: (iv_ruleTimeEventRule= ruleTimeEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:297:2: iv_ruleTimeEventRule= ruleTimeEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getTimeEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleTimeEventRule_in_entryRuleTimeEventRule608);
>+ newCompositeNode(grammarAccess.getTimeEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleTimeEventRule_in_entryRuleTimeEventRule612);
> iv_ruleTimeEventRule=ruleTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleTimeEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleTimeEventRule618); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleTimeEventRule622); 
> 
> }
> 
>@@ -756,11 +741,11 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleTimeEventRule
>+ // $ANTLR end "entryRuleTimeEventRule"
> 
> 
>- // $ANTLR start ruleTimeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:353:1: ruleTimeEventRule returns [EObject current=null] : (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule ) ;
>+ // $ANTLR start "ruleTimeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:304:1: ruleTimeEventRule returns [EObject current=null] : (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule ) ;
> public final EObject ruleTimeEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -769,13 +754,13 @@
> EObject this_AbsoluteTimeEventRule_1 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:358:6: ( (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:359:1: (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:307:28: ( (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:308:1: (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:359:1: (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:308:1: (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -787,41 +772,43 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("359:1: (this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule | this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:360:5: this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:309:5: this_RelativeTimeEventRule_0= ruleRelativeTimeEventRule
> {
> 
>- currentNode=createCompositeNode(grammarAccess.getTimeEventRuleAccess().getRelativeTimeEventRuleParserRuleCall_0(), currentNode); 
>+ newCompositeNode(grammarAccess.getTimeEventRuleAccess().getRelativeTimeEventRuleParserRuleCall_0()); 
> 
>- pushFollow(FOLLOW_ruleRelativeTimeEventRule_in_ruleTimeEventRule665);
>+ pushFollow(FOLLOW_ruleRelativeTimeEventRule_in_ruleTimeEventRule669);
> this_RelativeTimeEventRule_0=ruleRelativeTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> current = this_RelativeTimeEventRule_0; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:370:5: this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:319:5: this_AbsoluteTimeEventRule_1= ruleAbsoluteTimeEventRule
> {
> 
>- currentNode=createCompositeNode(grammarAccess.getTimeEventRuleAccess().getAbsoluteTimeEventRuleParserRuleCall_1(), currentNode); 
>+ newCompositeNode(grammarAccess.getTimeEventRuleAccess().getAbsoluteTimeEventRuleParserRuleCall_1()); 
> 
>- pushFollow(FOLLOW_ruleAbsoluteTimeEventRule_in_ruleTimeEventRule692);
>+ pushFollow(FOLLOW_ruleAbsoluteTimeEventRule_in_ruleTimeEventRule696);
> this_AbsoluteTimeEventRule_1=ruleAbsoluteTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> current = this_AbsoluteTimeEventRule_1; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> 
> 
> }
>@@ -832,9 +819,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -845,11 +830,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleTimeEventRule
>+ // $ANTLR end "ruleTimeEventRule"
> 
> 
>- // $ANTLR start entryRuleRelativeTimeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:386:1: entryRuleRelativeTimeEventRule returns [EObject current=null] : iv_ruleRelativeTimeEventRule= ruleRelativeTimeEventRule EOF ;
>+ // $ANTLR start "entryRuleRelativeTimeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:335:1: entryRuleRelativeTimeEventRule returns [EObject current=null] : iv_ruleRelativeTimeEventRule= ruleRelativeTimeEventRule EOF ;
> public final EObject entryRuleRelativeTimeEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -857,16 +842,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:387:2: (iv_ruleRelativeTimeEventRule= ruleRelativeTimeEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:388:2: iv_ruleRelativeTimeEventRule= ruleRelativeTimeEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:336:2: (iv_ruleRelativeTimeEventRule= ruleRelativeTimeEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:337:2: iv_ruleRelativeTimeEventRule= ruleRelativeTimeEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getRelativeTimeEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleRelativeTimeEventRule_in_entryRuleRelativeTimeEventRule727);
>+ newCompositeNode(grammarAccess.getRelativeTimeEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleRelativeTimeEventRule_in_entryRuleRelativeTimeEventRule731);
> iv_ruleRelativeTimeEventRule=ruleRelativeTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleRelativeTimeEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleRelativeTimeEventRule737); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleRelativeTimeEventRule741); 
> 
> }
> 
>@@ -880,55 +866,49 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleRelativeTimeEventRule
>+ // $ANTLR end "entryRuleRelativeTimeEventRule"
> 
> 
>- // $ANTLR start ruleRelativeTimeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:395:1: ruleRelativeTimeEventRule returns [EObject current=null] : ( 'after' ( (lv_expr_1_0= RULE_STRING ) ) ) ;
>+ // $ANTLR start "ruleRelativeTimeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:344:1: ruleRelativeTimeEventRule returns [EObject current=null] : (otherlv_0= 'after' ( (lv_expr_1_0= RULE_STRING ) ) ) ;
> public final EObject ruleRelativeTimeEventRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_expr_1_0=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:400:6: ( ( 'after' ( (lv_expr_1_0= RULE_STRING ) ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:401:1: ( 'after' ( (lv_expr_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:347:28: ( (otherlv_0= 'after' ( (lv_expr_1_0= RULE_STRING ) ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:348:1: (otherlv_0= 'after' ( (lv_expr_1_0= RULE_STRING ) ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:401:1: ( 'after' ( (lv_expr_1_0= RULE_STRING ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:401:3: 'after' ( (lv_expr_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:348:1: (otherlv_0= 'after' ( (lv_expr_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:348:3: otherlv_0= 'after' ( (lv_expr_1_0= RULE_STRING ) )
> {
>- match(input,13,FOLLOW_13_in_ruleRelativeTimeEventRule772); 
>+ otherlv_0=(Token)match(input,13,FOLLOW_13_in_ruleRelativeTimeEventRule778); 
> 
>- createLeafNode(grammarAccess.getRelativeTimeEventRuleAccess().getAfterKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getRelativeTimeEventRuleAccess().getAfterKeyword_0());
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:405:1: ( (lv_expr_1_0= RULE_STRING ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:406:1: (lv_expr_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:352:1: ( (lv_expr_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:353:1: (lv_expr_1_0= RULE_STRING )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:406:1: (lv_expr_1_0= RULE_STRING )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:407:3: lv_expr_1_0= RULE_STRING
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:353:1: (lv_expr_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:354:3: lv_expr_1_0= RULE_STRING
> {
>- lv_expr_1_0=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRelativeTimeEventRule789); 
>+ lv_expr_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRelativeTimeEventRule795); 
> 
>- 			createLeafNode(grammarAccess.getRelativeTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0(), "expr"); 
>+ 			newLeafNode(lv_expr_1_0, grammarAccess.getRelativeTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getRelativeTimeEventRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"expr",
>- 	 		lv_expr_1_0, 
>- 	 		"STRING", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getRelativeTimeEventRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"expr",
>+ 		lv_expr_1_0, 
>+ 		"STRING");
> 	 
> 
> }
>@@ -942,9 +922,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -955,11 +933,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleRelativeTimeEventRule
>+ // $ANTLR end "ruleRelativeTimeEventRule"
> 
> 
>- // $ANTLR start entryRuleAbsoluteTimeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:437:1: entryRuleAbsoluteTimeEventRule returns [EObject current=null] : iv_ruleAbsoluteTimeEventRule= ruleAbsoluteTimeEventRule EOF ;
>+ // $ANTLR start "entryRuleAbsoluteTimeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:378:1: entryRuleAbsoluteTimeEventRule returns [EObject current=null] : iv_ruleAbsoluteTimeEventRule= ruleAbsoluteTimeEventRule EOF ;
> public final EObject entryRuleAbsoluteTimeEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -967,16 +945,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:438:2: (iv_ruleAbsoluteTimeEventRule= ruleAbsoluteTimeEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:439:2: iv_ruleAbsoluteTimeEventRule= ruleAbsoluteTimeEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:379:2: (iv_ruleAbsoluteTimeEventRule= ruleAbsoluteTimeEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:380:2: iv_ruleAbsoluteTimeEventRule= ruleAbsoluteTimeEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getAbsoluteTimeEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleAbsoluteTimeEventRule_in_entryRuleAbsoluteTimeEventRule830);
>+ newCompositeNode(grammarAccess.getAbsoluteTimeEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleAbsoluteTimeEventRule_in_entryRuleAbsoluteTimeEventRule836);
> iv_ruleAbsoluteTimeEventRule=ruleAbsoluteTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleAbsoluteTimeEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleAbsoluteTimeEventRule840); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleAbsoluteTimeEventRule846); 
> 
> }
> 
>@@ -990,55 +969,49 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleAbsoluteTimeEventRule
>+ // $ANTLR end "entryRuleAbsoluteTimeEventRule"
> 
> 
>- // $ANTLR start ruleAbsoluteTimeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:446:1: ruleAbsoluteTimeEventRule returns [EObject current=null] : ( 'at' ( (lv_expr_1_0= RULE_STRING ) ) ) ;
>+ // $ANTLR start "ruleAbsoluteTimeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:387:1: ruleAbsoluteTimeEventRule returns [EObject current=null] : (otherlv_0= 'at' ( (lv_expr_1_0= RULE_STRING ) ) ) ;
> public final EObject ruleAbsoluteTimeEventRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_expr_1_0=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:451:6: ( ( 'at' ( (lv_expr_1_0= RULE_STRING ) ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:452:1: ( 'at' ( (lv_expr_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:390:28: ( (otherlv_0= 'at' ( (lv_expr_1_0= RULE_STRING ) ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:391:1: (otherlv_0= 'at' ( (lv_expr_1_0= RULE_STRING ) ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:452:1: ( 'at' ( (lv_expr_1_0= RULE_STRING ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:452:3: 'at' ( (lv_expr_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:391:1: (otherlv_0= 'at' ( (lv_expr_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:391:3: otherlv_0= 'at' ( (lv_expr_1_0= RULE_STRING ) )
> {
>- match(input,14,FOLLOW_14_in_ruleAbsoluteTimeEventRule875); 
>+ otherlv_0=(Token)match(input,14,FOLLOW_14_in_ruleAbsoluteTimeEventRule883); 
> 
>- createLeafNode(grammarAccess.getAbsoluteTimeEventRuleAccess().getAtKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getAbsoluteTimeEventRuleAccess().getAtKeyword_0());
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:456:1: ( (lv_expr_1_0= RULE_STRING ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:457:1: (lv_expr_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:395:1: ( (lv_expr_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:396:1: (lv_expr_1_0= RULE_STRING )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:457:1: (lv_expr_1_0= RULE_STRING )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:458:3: lv_expr_1_0= RULE_STRING
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:396:1: (lv_expr_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:397:3: lv_expr_1_0= RULE_STRING
> {
>- lv_expr_1_0=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleAbsoluteTimeEventRule892); 
>+ lv_expr_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleAbsoluteTimeEventRule900); 
> 
>- 			createLeafNode(grammarAccess.getAbsoluteTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0(), "expr"); 
>+ 			newLeafNode(lv_expr_1_0, grammarAccess.getAbsoluteTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getAbsoluteTimeEventRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getAbsoluteTimeEventRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"expr",
>- 	 		lv_expr_1_0, 
>- 	 		"STRING", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"expr",
>+ 		lv_expr_1_0, 
>+ 		"STRING");
> 	 
> 
> }
>@@ -1052,9 +1025,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1065,11 +1036,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleAbsoluteTimeEventRule
>+ // $ANTLR end "ruleAbsoluteTimeEventRule"
> 
> 
>- // $ANTLR start entryRuleChangeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:488:1: entryRuleChangeEventRule returns [EObject current=null] : iv_ruleChangeEventRule= ruleChangeEventRule EOF ;
>+ // $ANTLR start "entryRuleChangeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:421:1: entryRuleChangeEventRule returns [EObject current=null] : iv_ruleChangeEventRule= ruleChangeEventRule EOF ;
> public final EObject entryRuleChangeEventRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1077,16 +1048,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:489:2: (iv_ruleChangeEventRule= ruleChangeEventRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:490:2: iv_ruleChangeEventRule= ruleChangeEventRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:422:2: (iv_ruleChangeEventRule= ruleChangeEventRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:423:2: iv_ruleChangeEventRule= ruleChangeEventRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getChangeEventRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleChangeEventRule_in_entryRuleChangeEventRule933);
>+ newCompositeNode(grammarAccess.getChangeEventRuleRule()); 
>+ pushFollow(FOLLOW_ruleChangeEventRule_in_entryRuleChangeEventRule941);
> iv_ruleChangeEventRule=ruleChangeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleChangeEventRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleChangeEventRule943); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleChangeEventRule951); 
> 
> }
> 
>@@ -1100,55 +1072,49 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleChangeEventRule
>+ // $ANTLR end "entryRuleChangeEventRule"
> 
> 
>- // $ANTLR start ruleChangeEventRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:497:1: ruleChangeEventRule returns [EObject current=null] : ( 'when' ( (lv_exp_1_0= RULE_STRING ) ) ) ;
>+ // $ANTLR start "ruleChangeEventRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:430:1: ruleChangeEventRule returns [EObject current=null] : (otherlv_0= 'when' ( (lv_exp_1_0= RULE_STRING ) ) ) ;
> public final EObject ruleChangeEventRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_exp_1_0=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:502:6: ( ( 'when' ( (lv_exp_1_0= RULE_STRING ) ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:503:1: ( 'when' ( (lv_exp_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:433:28: ( (otherlv_0= 'when' ( (lv_exp_1_0= RULE_STRING ) ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:434:1: (otherlv_0= 'when' ( (lv_exp_1_0= RULE_STRING ) ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:503:1: ( 'when' ( (lv_exp_1_0= RULE_STRING ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:503:3: 'when' ( (lv_exp_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:434:1: (otherlv_0= 'when' ( (lv_exp_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:434:3: otherlv_0= 'when' ( (lv_exp_1_0= RULE_STRING ) )
> {
>- match(input,15,FOLLOW_15_in_ruleChangeEventRule978); 
>+ otherlv_0=(Token)match(input,15,FOLLOW_15_in_ruleChangeEventRule988); 
> 
>- createLeafNode(grammarAccess.getChangeEventRuleAccess().getWhenKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getChangeEventRuleAccess().getWhenKeyword_0());
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:507:1: ( (lv_exp_1_0= RULE_STRING ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:508:1: (lv_exp_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:438:1: ( (lv_exp_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:439:1: (lv_exp_1_0= RULE_STRING )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:508:1: (lv_exp_1_0= RULE_STRING )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:509:3: lv_exp_1_0= RULE_STRING
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:439:1: (lv_exp_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:440:3: lv_exp_1_0= RULE_STRING
> {
>- lv_exp_1_0=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleChangeEventRule995); 
>+ lv_exp_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleChangeEventRule1005); 
> 
>- 			createLeafNode(grammarAccess.getChangeEventRuleAccess().getExpSTRINGTerminalRuleCall_1_0(), "exp"); 
>+ 			newLeafNode(lv_exp_1_0, grammarAccess.getChangeEventRuleAccess().getExpSTRINGTerminalRuleCall_1_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getChangeEventRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"exp",
>- 	 		lv_exp_1_0, 
>- 	 		"STRING", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getChangeEventRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"exp",
>+ 		lv_exp_1_0, 
>+ 		"STRING");
> 	 
> 
> }
>@@ -1162,9 +1128,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1175,11 +1139,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleChangeEventRule
>+ // $ANTLR end "ruleChangeEventRule"
> 
> 
>- // $ANTLR start entryRuleGuardRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:539:1: entryRuleGuardRule returns [EObject current=null] : iv_ruleGuardRule= ruleGuardRule EOF ;
>+ // $ANTLR start "entryRuleGuardRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:464:1: entryRuleGuardRule returns [EObject current=null] : iv_ruleGuardRule= ruleGuardRule EOF ;
> public final EObject entryRuleGuardRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1187,16 +1151,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:540:2: (iv_ruleGuardRule= ruleGuardRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:541:2: iv_ruleGuardRule= ruleGuardRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:465:2: (iv_ruleGuardRule= ruleGuardRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:466:2: iv_ruleGuardRule= ruleGuardRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getGuardRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleGuardRule_in_entryRuleGuardRule1036);
>+ newCompositeNode(grammarAccess.getGuardRuleRule()); 
>+ pushFollow(FOLLOW_ruleGuardRule_in_entryRuleGuardRule1046);
> iv_ruleGuardRule=ruleGuardRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleGuardRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleGuardRule1046); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleGuardRule1056); 
> 
> }
> 
>@@ -1210,55 +1175,50 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleGuardRule
>+ // $ANTLR end "entryRuleGuardRule"
> 
> 
>- // $ANTLR start ruleGuardRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:548:1: ruleGuardRule returns [EObject current=null] : ( '[' ( (lv_constraint_1_0= RULE_STRING ) ) ']' ) ;
>+ // $ANTLR start "ruleGuardRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:473:1: ruleGuardRule returns [EObject current=null] : (otherlv_0= '[' ( (lv_constraint_1_0= RULE_STRING ) ) otherlv_2= ']' ) ;
> public final EObject ruleGuardRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_constraint_1_0=null;
>+ Token otherlv_2=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:553:6: ( ( '[' ( (lv_constraint_1_0= RULE_STRING ) ) ']' ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:554:1: ( '[' ( (lv_constraint_1_0= RULE_STRING ) ) ']' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:476:28: ( (otherlv_0= '[' ( (lv_constraint_1_0= RULE_STRING ) ) otherlv_2= ']' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:477:1: (otherlv_0= '[' ( (lv_constraint_1_0= RULE_STRING ) ) otherlv_2= ']' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:554:1: ( '[' ( (lv_constraint_1_0= RULE_STRING ) ) ']' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:554:3: '[' ( (lv_constraint_1_0= RULE_STRING ) ) ']'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:477:1: (otherlv_0= '[' ( (lv_constraint_1_0= RULE_STRING ) ) otherlv_2= ']' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:477:3: otherlv_0= '[' ( (lv_constraint_1_0= RULE_STRING ) ) otherlv_2= ']'
> {
>- match(input,16,FOLLOW_16_in_ruleGuardRule1081); 
>+ otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleGuardRule1093); 
> 
>- createLeafNode(grammarAccess.getGuardRuleAccess().getLeftSquareBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getGuardRuleAccess().getLeftSquareBracketKeyword_0());
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:558:1: ( (lv_constraint_1_0= RULE_STRING ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:559:1: (lv_constraint_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:481:1: ( (lv_constraint_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:482:1: (lv_constraint_1_0= RULE_STRING )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:559:1: (lv_constraint_1_0= RULE_STRING )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:560:3: lv_constraint_1_0= RULE_STRING
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:482:1: (lv_constraint_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:483:3: lv_constraint_1_0= RULE_STRING
> {
>- lv_constraint_1_0=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGuardRule1098); 
>+ lv_constraint_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGuardRule1110); 
> 
>- 			createLeafNode(grammarAccess.getGuardRuleAccess().getConstraintSTRINGTerminalRuleCall_1_0(), "constraint"); 
>+ 			newLeafNode(lv_constraint_1_0, grammarAccess.getGuardRuleAccess().getConstraintSTRINGTerminalRuleCall_1_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getGuardRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"constraint",
>- 	 		lv_constraint_1_0, 
>- 	 		"STRING", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getGuardRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"constraint",
>+ 		lv_constraint_1_0, 
>+ 		"STRING");
> 	 
> 
> }
>@@ -1266,9 +1226,9 @@
> 
> }
> 
>- match(input,17,FOLLOW_17_in_ruleGuardRule1113); 
>+ otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleGuardRule1127); 
> 
>- createLeafNode(grammarAccess.getGuardRuleAccess().getRightSquareBracketKeyword_2(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getGuardRuleAccess().getRightSquareBracketKeyword_2());
> 
> 
> }
>@@ -1276,9 +1236,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1289,11 +1247,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleGuardRule
>+ // $ANTLR end "ruleGuardRule"
> 
> 
>- // $ANTLR start entryRuleEffectRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:594:1: entryRuleEffectRule returns [EObject current=null] : iv_ruleEffectRule= ruleEffectRule EOF ;
>+ // $ANTLR start "entryRuleEffectRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:511:1: entryRuleEffectRule returns [EObject current=null] : iv_ruleEffectRule= ruleEffectRule EOF ;
> public final EObject entryRuleEffectRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1301,16 +1259,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:595:2: (iv_ruleEffectRule= ruleEffectRule EOF )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:596:2: iv_ruleEffectRule= ruleEffectRule EOF
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:512:2: (iv_ruleEffectRule= ruleEffectRule EOF )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:513:2: iv_ruleEffectRule= ruleEffectRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getEffectRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule1149);
>+ newCompositeNode(grammarAccess.getEffectRuleRule()); 
>+ pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule1163);
> iv_ruleEffectRule=ruleEffectRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleEffectRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleEffectRule1159); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleEffectRule1173); 
> 
> }
> 
>@@ -1324,60 +1283,56 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleEffectRule
>+ // $ANTLR end "entryRuleEffectRule"
> 
> 
>- // $ANTLR start ruleEffectRule
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:603:1: ruleEffectRule returns [EObject current=null] : ( '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleEffectRule"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:520:1: ruleEffectRule returns [EObject current=null] : (otherlv_0= '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ;
> public final EObject ruleEffectRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_behaviorName_2_0=null;
> Enumerator lv_kind_1_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:608:6: ( ( '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:609:1: ( '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:523:28: ( (otherlv_0= '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:524:1: (otherlv_0= '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:609:1: ( '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:609:3: '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:524:1: (otherlv_0= '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:524:3: otherlv_0= '/' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
> {
>- match(input,18,FOLLOW_18_in_ruleEffectRule1194); 
>+ otherlv_0=(Token)match(input,18,FOLLOW_18_in_ruleEffectRule1210); 
> 
>- createLeafNode(grammarAccess.getEffectRuleAccess().getSolidusKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getEffectRuleAccess().getSolidusKeyword_0());
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:613:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:614:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:528:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:529:1: (lv_kind_1_0= ruleBehaviorKind )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:614:1: (lv_kind_1_0= ruleBehaviorKind )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:615:3: lv_kind_1_0= ruleBehaviorKind
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:529:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:530:3: lv_kind_1_0= ruleBehaviorKind
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getEffectRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getEffectRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleBehaviorKind_in_ruleEffectRule1215);
>+ pushFollow(FOLLOW_ruleBehaviorKind_in_ruleEffectRule1231);
> lv_kind_1_0=ruleBehaviorKind();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getEffectRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"kind",
>- 	 		lv_kind_1_0, 
>- 	 		"BehaviorKind", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getEffectRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1385,32 +1340,25 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:637:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:638:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:546:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:547:1: (lv_behaviorName_2_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:638:1: (lv_behaviorName_2_0= RULE_ID )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:639:3: lv_behaviorName_2_0= RULE_ID
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:547:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:548:3: lv_behaviorName_2_0= RULE_ID
> {
>- lv_behaviorName_2_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEffectRule1232); 
>+ lv_behaviorName_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEffectRule1248); 
> 
>- 			createLeafNode(grammarAccess.getEffectRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+ 			newLeafNode(lv_behaviorName_2_0, grammarAccess.getEffectRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getEffectRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"behaviorName",
>- 	 		lv_behaviorName_2_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getEffectRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -1424,9 +1372,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1437,20 +1383,24 @@
> }
> return current;
> }
>- // $ANTLR end ruleEffectRule
>+ // $ANTLR end "ruleEffectRule"
> 
> 
>- // $ANTLR start ruleBehaviorKind
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:669:1: ruleBehaviorKind returns [Enumerator current=null] : ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) ) ;
>+ // $ANTLR start "ruleBehaviorKind"
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:572:1: ruleBehaviorKind returns [Enumerator current=null] : ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) ;
> public final Enumerator ruleBehaviorKind() throws RecognitionException {
> Enumerator current = null;
> 
>- setCurrentLookahead(); resetLookahead(); 
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+
>+ enterRule(); 
> try {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:673:6: ( ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:674:1: ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:574:28: ( ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:575:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:674:1: ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:575:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) )
> int alt7=3;
> switch ( input.LA(1) ) {
> case 19:
>@@ -1470,22 +1420,22 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("674:1: ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) )", 7, 0, input);
>+ new NoViableAltException("", 7, 0, input);
> 
> throw nvae;
> }
> 
> switch (alt7) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:674:2: ( 'Activity' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:575:2: (enumLiteral_0= 'Activity' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:674:2: ( 'Activity' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:674:4: 'Activity'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:575:2: (enumLiteral_0= 'Activity' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:575:4: enumLiteral_0= 'Activity'
> {
>- match(input,19,FOLLOW_19_in_ruleBehaviorKind1285); 
>+ enumLiteral_0=(Token)match(input,19,FOLLOW_19_in_ruleBehaviorKind1303); 
> 
> current = grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0()); 
> 
> 
> }
>@@ -1494,15 +1444,15 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:680:6: ( 'StateMachine' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:581:6: (enumLiteral_1= 'StateMachine' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:680:6: ( 'StateMachine' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:680:8: 'StateMachine'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:581:6: (enumLiteral_1= 'StateMachine' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:581:8: enumLiteral_1= 'StateMachine'
> {
>- match(input,20,FOLLOW_20_in_ruleBehaviorKind1300); 
>+ enumLiteral_1=(Token)match(input,20,FOLLOW_20_in_ruleBehaviorKind1320); 
> 
> current = grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1()); 
> 
> 
> }
>@@ -1511,15 +1461,15 @@
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:686:6: ( 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:587:6: (enumLiteral_2= 'OpaqueBehavior' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:686:6: ( 'OpaqueBehavior' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:686:8: 'OpaqueBehavior'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:587:6: (enumLiteral_2= 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:587:8: enumLiteral_2= 'OpaqueBehavior'
> {
>- match(input,21,FOLLOW_21_in_ruleBehaviorKind1315); 
>+ enumLiteral_2=(Token)match(input,21,FOLLOW_21_in_ruleBehaviorKind1337); 
> 
> current = grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2()); 
> 
> 
> }
>@@ -1533,9 +1483,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1546,58 +1494,60 @@
> }
> return current;
> }
>- // $ANTLR end ruleBehaviorKind
>+ // $ANTLR end "ruleBehaviorKind"
> 
>+ // Delegated rules
>+
> 
> 
> 
> public static final BitSet FOLLOW_ruleTransitionRule_in_entryRuleTransitionRule75 = new BitSet(new long[]{0x0000000000000000L});
> public static final BitSet FOLLOW_EOF_in_entryRuleTransitionRule85 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_ruleEventRule_in_ruleTransitionRule132 = new BitSet(new long[]{0x0000000000050802L});
>- public static final BitSet FOLLOW_11_in_ruleTransitionRule143 = new BitSet(new long[]{0x000000000000F010L});
>- public static final BitSet FOLLOW_ruleEventRule_in_ruleTransitionRule164 = new BitSet(new long[]{0x0000000000050802L});
>- public static final BitSet FOLLOW_ruleGuardRule_in_ruleTransitionRule189 = new BitSet(new long[]{0x0000000000040002L});
>- public static final BitSet FOLLOW_ruleEffectRule_in_ruleTransitionRule211 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleEventRule_in_entryRuleEventRule248 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleEventRule258 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleCallOrSignalEventRule_in_ruleEventRule305 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleAnyReceiveEventRule_in_ruleEventRule332 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleTimeEventRule_in_ruleEventRule359 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleChangeEventRule_in_ruleEventRule386 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleCallOrSignalEventRule_in_entryRuleCallOrSignalEventRule421 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleCallOrSignalEventRule431 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleCallOrSignalEventRule473 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleAnyReceiveEventRule_in_entryRuleAnyReceiveEventRule508 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleAnyReceiveEventRule518 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_12_in_ruleAnyReceiveEventRule560 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleTimeEventRule_in_entryRuleTimeEventRule608 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleTimeEventRule618 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleRelativeTimeEventRule_in_ruleTimeEventRule665 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleAbsoluteTimeEventRule_in_ruleTimeEventRule692 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleRelativeTimeEventRule_in_entryRuleRelativeTimeEventRule727 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleRelativeTimeEventRule737 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_13_in_ruleRelativeTimeEventRule772 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleRelativeTimeEventRule789 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleAbsoluteTimeEventRule_in_entryRuleAbsoluteTimeEventRule830 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleAbsoluteTimeEventRule840 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_14_in_ruleAbsoluteTimeEventRule875 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleAbsoluteTimeEventRule892 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleChangeEventRule_in_entryRuleChangeEventRule933 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleChangeEventRule943 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_15_in_ruleChangeEventRule978 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleChangeEventRule995 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleGuardRule_in_entryRuleGuardRule1036 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleGuardRule1046 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_16_in_ruleGuardRule1081 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleGuardRule1098 = new BitSet(new long[]{0x0000000000020000L});
>- public static final BitSet FOLLOW_17_in_ruleGuardRule1113 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleEffectRule_in_entryRuleEffectRule1149 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleEffectRule1159 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_18_in_ruleEffectRule1194 = new BitSet(new long[]{0x0000000000380000L});
>- public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleEffectRule1215 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleEffectRule1232 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_19_in_ruleBehaviorKind1285 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_20_in_ruleBehaviorKind1300 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_21_in_ruleBehaviorKind1315 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_11_in_ruleTransitionRule145 = new BitSet(new long[]{0x000000000000F010L});
>+ public static final BitSet FOLLOW_ruleEventRule_in_ruleTransitionRule166 = new BitSet(new long[]{0x0000000000050802L});
>+ public static final BitSet FOLLOW_ruleGuardRule_in_ruleTransitionRule191 = new BitSet(new long[]{0x0000000000040002L});
>+ public static final BitSet FOLLOW_ruleEffectRule_in_ruleTransitionRule213 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleEventRule_in_entryRuleEventRule250 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleEventRule260 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleCallOrSignalEventRule_in_ruleEventRule307 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleAnyReceiveEventRule_in_ruleEventRule334 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTimeEventRule_in_ruleEventRule361 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleChangeEventRule_in_ruleEventRule388 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleCallOrSignalEventRule_in_entryRuleCallOrSignalEventRule423 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleCallOrSignalEventRule433 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleCallOrSignalEventRule477 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleAnyReceiveEventRule_in_entryRuleAnyReceiveEventRule512 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleAnyReceiveEventRule522 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_12_in_ruleAnyReceiveEventRule564 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTimeEventRule_in_entryRuleTimeEventRule612 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleTimeEventRule622 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleRelativeTimeEventRule_in_ruleTimeEventRule669 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleAbsoluteTimeEventRule_in_ruleTimeEventRule696 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleRelativeTimeEventRule_in_entryRuleRelativeTimeEventRule731 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleRelativeTimeEventRule741 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_13_in_ruleRelativeTimeEventRule778 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleRelativeTimeEventRule795 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleAbsoluteTimeEventRule_in_entryRuleAbsoluteTimeEventRule836 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleAbsoluteTimeEventRule846 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_14_in_ruleAbsoluteTimeEventRule883 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleAbsoluteTimeEventRule900 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleChangeEventRule_in_entryRuleChangeEventRule941 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleChangeEventRule951 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_15_in_ruleChangeEventRule988 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleChangeEventRule1005 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleGuardRule_in_entryRuleGuardRule1046 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleGuardRule1056 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_16_in_ruleGuardRule1093 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleGuardRule1110 = new BitSet(new long[]{0x0000000000020000L});
>+ public static final BitSet FOLLOW_17_in_ruleGuardRule1127 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleEffectRule_in_entryRuleEffectRule1163 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleEffectRule1173 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_18_in_ruleEffectRule1210 = new BitSet(new long[]{0x0000000000380000L});
>+ public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleEffectRule1231 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleEffectRule1248 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_19_in_ruleBehaviorKind1303 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_20_in_ruleBehaviorKind1320 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_21_in_ruleBehaviorKind1337 = new BitSet(new long[]{0x0000000000000002L});
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.tokens	(working copy)
>@@ -1,10 +1,21 @@
> RULE_ID=4
>-RULE_STRING=5
> RULE_ANY_OTHER=10
>-RULE_INT=6
>-RULE_WS=9
>+T__21=21
>+T__20=20
> RULE_SL_COMMENT=8
> RULE_ML_COMMENT=7
>+T__19=19
>+RULE_STRING=5
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__11=11
>+T__14=14
>+T__13=13
>+RULE_INT=6
>+RULE_WS=9
> 'after'=13
> 'when'=15
> '/'=18
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransitionLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransitionLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransitionLexer.java	(working copy)
>@@ -13,244 +13,274 @@
> @SuppressWarnings("all")
> public class InternalUmlTransitionLexer extends Lexer {
> public static final int RULE_ID=4;
>+ public static final int T__21=21;
> public static final int RULE_ANY_OTHER=10;
>- public static final int Tokens=22;
>+ public static final int T__20=20;
> public static final int EOF=-1;
> public static final int RULE_SL_COMMENT=8;
>- public static final int T21=21;
>- public static final int T20=20;
> public static final int RULE_ML_COMMENT=7;
>+ public static final int T__19=19;
> public static final int RULE_STRING=5;
>+ 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
> public static final int RULE_INT=6;
>- public static final int T11=11;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
> public static final int RULE_WS=9;
>- public static final int T15=15;
>- public static final int T16=16;
>- public static final int T17=17;
>- public static final int T18=18;
>- public static final int T19=19;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlTransitionLexer() {;} 
> public InternalUmlTransitionLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlTransitionLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g"; }
> 
>- // $ANTLR start T11
>- public final void mT11() throws RecognitionException {
>+ // $ANTLR start "T__11"
>+ public final void mT__11() throws RecognitionException {
> try {
>- int _type = T11;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:10:5: ( ',' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:10:7: ','
>+ int _type = T__11;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:11:7: ( ',' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:11:9: ','
> {
> match(','); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T11
>+ // $ANTLR end "T__11"
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:11:5: ( 'all' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:11:7: 'all'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:12:7: ( 'all' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:12:9: 'all'
> {
> match("all"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:12:5: ( 'after' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:12:7: 'after'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:13:7: ( 'after' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:13:9: 'after'
> {
> match("after"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:13:5: ( 'at' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:13:7: 'at'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:14:7: ( 'at' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:14:9: 'at'
> {
> match("at"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:14:5: ( 'when' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:14:7: 'when'
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:15:7: ( 'when' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:15:9: 'when'
> {
> match("when"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:15:5: ( '[' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:15:7: '['
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:16:7: ( '[' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:16:9: '['
> {
> match('['); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start T17
>- public final void mT17() throws RecognitionException {
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
> try {
>- int _type = T17;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:16:5: ( ']' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:16:7: ']'
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:17:7: ( ']' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:17:9: ']'
> {
> match(']'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T17
>+ // $ANTLR end "T__17"
> 
>- // $ANTLR start T18
>- public final void mT18() throws RecognitionException {
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
> try {
>- int _type = T18;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:17:5: ( '/' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:17:7: '/'
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:18:7: ( '/' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:18:9: '/'
> {
> match('/'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T18
>+ // $ANTLR end "T__18"
> 
>- // $ANTLR start T19
>- public final void mT19() throws RecognitionException {
>+ // $ANTLR start "T__19"
>+ public final void mT__19() throws RecognitionException {
> try {
>- int _type = T19;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:18:5: ( 'Activity' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:18:7: 'Activity'
>+ int _type = T__19;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:19:7: ( 'Activity' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:19:9: 'Activity'
> {
> match("Activity"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T19
>+ // $ANTLR end "T__19"
> 
>- // $ANTLR start T20
>- public final void mT20() throws RecognitionException {
>+ // $ANTLR start "T__20"
>+ public final void mT__20() throws RecognitionException {
> try {
>- int _type = T20;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:19:5: ( 'StateMachine' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:19:7: 'StateMachine'
>+ int _type = T__20;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:20:7: ( 'StateMachine' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:20:9: 'StateMachine'
> {
> match("StateMachine"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T20
>+ // $ANTLR end "T__20"
> 
>- // $ANTLR start T21
>- public final void mT21() throws RecognitionException {
>+ // $ANTLR start "T__21"
>+ public final void mT__21() throws RecognitionException {
> try {
>- int _type = T21;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:20:5: ( 'OpaqueBehavior' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:20:7: 'OpaqueBehavior'
>+ int _type = T__21;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:21:7: ( 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:21:9: 'OpaqueBehavior'
> {
> match("OpaqueBehavior"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T21
>+ // $ANTLR end "T__21"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:695:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:695:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:596:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:596:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:695:11: ( '^' )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:596:11: ( '^' )?
> int alt1=2;
> int LA1_0 = input.LA(1);
> 
>@@ -259,7 +289,7 @@
> }
> switch (alt1) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:695:11: '^'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:596:11: '^'
> {
> match('^'); 
> 
>@@ -273,12 +303,11 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:695:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:596:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop2:
> do {
> int alt2=2;
>@@ -298,10 +327,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -315,21 +343,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:697:10: ( ( '0' .. '9' )+ )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:697:12: ( '0' .. '9' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:598:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:598:12: ( '0' .. '9' )+
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:697:12: ( '0' .. '9' )+
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:598:12: ( '0' .. '9' )+
> int cnt3=0;
> loop3:
> do {
>@@ -343,7 +373,7 @@
> 
> switch (alt3) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:697:13: '0' .. '9'
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:598:13: '0' .. '9'
> 	 {
> 	 matchRange('0','9'); 
> 
>@@ -362,21 +392,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -388,16 +420,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("699:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop4:
> do {
> int alt4=3;
>@@ -406,41 +438,39 @@
> if ( (LA4_0=='\\') ) {
> alt4=1;
> }
>- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
>+ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
> alt4=2;
> }
> 
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -456,10 +486,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -468,41 +498,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:699:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:600:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -523,23 +551,25 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:701:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:701:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:602:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:602:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
> match("/*"); 
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:701:24: ( options {greedy=false; } : . )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:602:24: ( options {greedy=false; } : . )*
> loop7:
> do {
> int alt7=2;
>@@ -551,20 +581,20 @@
> if ( (LA7_1=='/') ) {
> alt7=2;
> }
>- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
>+ else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> switch (alt7) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:701:52: .
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:602:52: .
> 	 {
> 	 matchAny(); 
> 
>@@ -581,46 +611,47 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
> match("//"); 
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:24: (~ ( ( '\\n' | '\\r' ) ) )*
> loop8:
> do {
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
>+ if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
> 
> switch (alt8) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:24: ~ ( ( '\\n' | '\\r' ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -631,7 +662,7 @@
> }
> } while (true);
> 
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:40: ( ( '\\r' )? '\\n' )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:40: ( ( '\\r' )? '\\n' )?
> int alt10=2;
> int LA10_0 = input.LA(1);
> 
>@@ -640,9 +671,9 @@
> }
> switch (alt10) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:41: ( '\\r' )? '\\n'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:41: ( '\\r' )? '\\n'
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:41: ( '\\r' )?
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:41: ( '\\r' )?
> int alt9=2;
> int LA9_0 = input.LA(1);
> 
>@@ -651,7 +682,7 @@
> }
> switch (alt9) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:703:41: '\\r'
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:604:41: '\\r'
> {
> match('\r'); 
> 
>@@ -670,21 +701,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:705:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:705:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:606:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:606:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:705:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:606:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> int cnt11=0;
> loop11:
> do {
>@@ -705,10 +738,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -726,531 +758,160 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:707:16: ( . )
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:707:18: .
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:608:16: ( . )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:608:18: .
> {
> matchAny(); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt12=18;
>- int LA12_0 = input.LA(1);
>-
>- if ( (LA12_0==',') ) {
>- alt12=1;
>- }
>- else if ( (LA12_0=='a') ) {
>- switch ( input.LA(2) ) {
>- case 'f':
>- {
>- int LA12_18 = input.LA(3);
>-
>- if ( (LA12_18=='t') ) {
>- int LA12_34 = input.LA(4);
>-
>- if ( (LA12_34=='e') ) {
>- int LA12_41 = input.LA(5);
>-
>- if ( (LA12_41=='r') ) {
>- int LA12_47 = input.LA(6);
>-
>- if ( ((LA12_47>='0' && LA12_47<='9')||(LA12_47>='A' && LA12_47<='Z')||LA12_47=='_'||(LA12_47>='a' && LA12_47<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=3;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- break;
>- case 't':
>- {
>- int LA12_19 = input.LA(3);
>-
>- if ( ((LA12_19>='0' && LA12_19<='9')||(LA12_19>='A' && LA12_19<='Z')||LA12_19=='_'||(LA12_19>='a' && LA12_19<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=4;}
>- }
>- break;
>- case 'l':
>- {
>- int LA12_20 = input.LA(3);
>-
>- if ( (LA12_20=='l') ) {
>- int LA12_36 = input.LA(4);
>-
>- if ( ((LA12_36>='0' && LA12_36<='9')||(LA12_36>='A' && LA12_36<='Z')||LA12_36=='_'||(LA12_36>='a' && LA12_36<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=2;}
>- }
>- else {
>- alt12=12;}
>- }
>- break;
>- default:
>- alt12=12;}
>-
>- }
>- else if ( (LA12_0=='w') ) {
>- int LA12_3 = input.LA(2);
>-
>- if ( (LA12_3=='h') ) {
>- int LA12_22 = input.LA(3);
>-
>- if ( (LA12_22=='e') ) {
>- int LA12_37 = input.LA(4);
>-
>- if ( (LA12_37=='n') ) {
>- int LA12_43 = input.LA(5);
>-
>- if ( ((LA12_43>='0' && LA12_43<='9')||(LA12_43>='A' && LA12_43<='Z')||LA12_43=='_'||(LA12_43>='a' && LA12_43<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=5;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='[') ) {
>- alt12=6;
>- }
>- else if ( (LA12_0==']') ) {
>- alt12=7;
>- }
>- else if ( (LA12_0=='/') ) {
>- switch ( input.LA(2) ) {
>- case '*':
>- {
>- alt12=15;
>- }
>- break;
>- case '/':
>- {
>- alt12=16;
>- }
>- break;
>- default:
>- alt12=8;}
>-
>- }
>- else if ( (LA12_0=='A') ) {
>- int LA12_7 = input.LA(2);
>-
>- if ( (LA12_7=='c') ) {
>- int LA12_28 = input.LA(3);
>-
>- if ( (LA12_28=='t') ) {
>- int LA12_38 = input.LA(4);
>-
>- if ( (LA12_38=='i') ) {
>- int LA12_44 = input.LA(5);
>-
>- if ( (LA12_44=='v') ) {
>- int LA12_49 = input.LA(6);
>-
>- if ( (LA12_49=='i') ) {
>- int LA12_53 = input.LA(7);
>-
>- if ( (LA12_53=='t') ) {
>- int LA12_56 = input.LA(8);
>-
>- if ( (LA12_56=='y') ) {
>- int LA12_59 = input.LA(9);
>-
>- if ( ((LA12_59>='0' && LA12_59<='9')||(LA12_59>='A' && LA12_59<='Z')||LA12_59=='_'||(LA12_59>='a' && LA12_59<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='S') ) {
>- int LA12_8 = input.LA(2);
>-
>- if ( (LA12_8=='t') ) {
>- int LA12_29 = input.LA(3);
>-
>- if ( (LA12_29=='a') ) {
>- int LA12_39 = input.LA(4);
>-
>- if ( (LA12_39=='t') ) {
>- int LA12_45 = input.LA(5);
>-
>- if ( (LA12_45=='e') ) {
>- int LA12_50 = input.LA(6);
>-
>- if ( (LA12_50=='M') ) {
>- int LA12_54 = input.LA(7);
>-
>- if ( (LA12_54=='a') ) {
>- int LA12_57 = input.LA(8);
>-
>- if ( (LA12_57=='c') ) {
>- int LA12_60 = input.LA(9);
>-
>- if ( (LA12_60=='h') ) {
>- int LA12_63 = input.LA(10);
>-
>- if ( (LA12_63=='i') ) {
>- int LA12_65 = input.LA(11);
>-
>- if ( (LA12_65=='n') ) {
>- int LA12_67 = input.LA(12);
>-
>- if ( (LA12_67=='e') ) {
>- int LA12_69 = input.LA(13);
>-
>- if ( ((LA12_69>='0' && LA12_69<='9')||(LA12_69>='A' && LA12_69<='Z')||LA12_69=='_'||(LA12_69>='a' && LA12_69<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=10;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='O') ) {
>- int LA12_9 = input.LA(2);
>-
>- if ( (LA12_9=='p') ) {
>- int LA12_30 = input.LA(3);
>-
>- if ( (LA12_30=='a') ) {
>- int LA12_40 = input.LA(4);
>-
>- if ( (LA12_40=='q') ) {
>- int LA12_46 = input.LA(5);
>-
>- if ( (LA12_46=='u') ) {
>- int LA12_51 = input.LA(6);
>-
>- if ( (LA12_51=='e') ) {
>- int LA12_55 = input.LA(7);
>-
>- if ( (LA12_55=='B') ) {
>- int LA12_58 = input.LA(8);
>-
>- if ( (LA12_58=='e') ) {
>- int LA12_61 = input.LA(9);
>-
>- if ( (LA12_61=='h') ) {
>- int LA12_64 = input.LA(10);
>-
>- if ( (LA12_64=='a') ) {
>- int LA12_66 = input.LA(11);
>-
>- if ( (LA12_66=='v') ) {
>- int LA12_68 = input.LA(12);
>-
>- if ( (LA12_68=='i') ) {
>- int LA12_70 = input.LA(13);
>-
>- if ( (LA12_70=='o') ) {
>- int LA12_72 = input.LA(14);
>-
>- if ( (LA12_72=='r') ) {
>- int LA12_73 = input.LA(15);
>-
>- if ( ((LA12_73>='0' && LA12_73<='9')||(LA12_73>='A' && LA12_73<='Z')||LA12_73=='_'||(LA12_73>='a' && LA12_73<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=11;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='^') ) {
>- int LA12_10 = input.LA(2);
>-
>- if ( ((LA12_10>='A' && LA12_10<='Z')||LA12_10=='_'||(LA12_10>='a' && LA12_10<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=18;}
>- }
>- else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='b' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {
>- alt12=12;
>- }
>- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
>- alt12=13;
>- }
>- else if ( (LA12_0=='\"') ) {
>- int LA12_13 = input.LA(2);
>-
>- if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFE')) ) {
>- alt12=14;
>- }
>- else {
>- alt12=18;}
>- }
>- else if ( (LA12_0=='\'') ) {
>- int LA12_14 = input.LA(2);
>-
>- if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFE')) ) {
>- alt12=14;
>- }
>- else {
>- alt12=18;}
>- }
>- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
>- alt12=17;
>- }
>- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
>- alt12=18;
>- }
>- else {
>- NoViableAltException nvae =
>- new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
>-
>- throw nvae;
>- }
>+ alt12 = dfa12.predict(input);
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:10: T11
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:10: T__11
> {
>- mT11(); 
>+ mT__11(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:14: T12
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:16: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:18: T13
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:22: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:22: T14
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:28: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:26: T15
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:34: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:30: T16
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:40: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:34: T17
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:46: T__17
> {
>- mT17(); 
>+ mT__17(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:38: T18
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:52: T__18
> {
>- mT18(); 
>+ mT__18(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:42: T19
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:58: T__19
> {
>- mT19(); 
>+ mT__19(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:46: T20
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:64: T__20
> {
>- mT20(); 
>+ mT__20(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:50: T21
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:70: T__21
> {
>- mT21(); 
>+ mT__21(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:54: RULE_ID
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:76: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:62: RULE_INT
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:84: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 14 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:71: RULE_STRING
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:93: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 15 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:83: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:105: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 16 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:99: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:121: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 17 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:115: RULE_WS
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:137: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 18 :
>- // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:123: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.transition.editor.xtext/src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g:1:145: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -1262,6 +923,217 @@
> }
> 
> 
>+ protected DFA12 dfa12 = new DFA12(this);
>+ static final String DFA12_eotS =
>+ "\2\uffff\2\25\2\uffff\1\33\3\25\1\20\2\uffff\2\20\3\uffff\2\25"+
>+ "\1\44\1\uffff\1\25\5\uffff\3\25\3\uffff\1\51\1\25\1\uffff\4\25\1"+
>+ "\uffff\1\25\1\60\3\25\1\64\1\uffff\3\25\1\uffff\6\25\1\76\2\25\1"+
>+ "\uffff\6\25\1\107\1\25\1\uffff\1\25\1\112\1\uffff";
>+ static final String DFA12_eofS =
>+ "\113\uffff";
>+ static final String DFA12_minS =
>+ "\1\0\1\uffff\1\146\1\150\2\uffff\1\52\1\143\1\164\1\160\1\101\2"+
>+ "\uffff\2\0\3\uffff\1\154\1\164\1\60\1\uffff\1\145\5\uffff\1\164"+
>+ "\2\141\3\uffff\1\60\1\145\1\uffff\1\156\1\151\1\164\1\161\1\uffff"+
>+ "\1\162\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 DFA12_maxS =
>+ "\1\uffff\1\uffff\1\164\1\150\2\uffff\1\57\1\143\1\164\1\160\1\172"+
>+ "\2\uffff\2\uffff\3\uffff\1\154\1\164\1\172\1\uffff\1\145\5\uffff"+
>+ "\1\164\2\141\3\uffff\1\172\1\145\1\uffff\1\156\1\151\1\164\1\161"+
>+ "\1\uffff\1\162\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 DFA12_acceptS =
>+ "\1\uffff\1\1\2\uffff\1\6\1\7\5\uffff\1\14\1\15\2\uffff\1\21\1\22"+
>+ "\1\1\3\uffff\1\14\1\uffff\1\6\1\7\1\17\1\20\1\10\3\uffff\1\15\1"+
>+ "\16\1\21\2\uffff\1\4\4\uffff\1\2\6\uffff\1\5\3\uffff\1\3\11\uffff"+
>+ "\1\11\10\uffff\1\12\2\uffff\1\13";
>+ static final String DFA12_specialS =
>+ "\1\1\14\uffff\1\2\1\0\74\uffff}>";
>+ static final String[] DFA12_transitionS = {
>+ "\11\20\2\17\2\20\1\17\22\20\1\17\1\20\1\15\4\20\1\16\4\20\1"+
>+ "\1\2\20\1\6\12\14\7\20\1\7\15\13\1\11\3\13\1\10\7\13\1\4\1\20"+
>+ "\1\5\1\12\1\13\1\20\1\2\25\13\1\3\3\13\uff85\20",
>+ "",
>+ "\1\23\5\uffff\1\22\7\uffff\1\24",
>+ "\1\26",
>+ "",
>+ "",
>+ "\1\31\4\uffff\1\32",
>+ "\1\34",
>+ "\1\35",
>+ "\1\36",
>+ "\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "",
>+ "",
>+ "\0\40",
>+ "\0\40",
>+ "",
>+ "",
>+ "",
>+ "\1\42",
>+ "\1\43",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "",
>+ "\1\45",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\46",
>+ "\1\47",
>+ "\1\50",
>+ "",
>+ "",
>+ "",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "\1\52",
>+ "",
>+ "\1\53",
>+ "\1\54",
>+ "\1\55",
>+ "\1\56",
>+ "",
>+ "\1\57",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "\1\61",
>+ "\1\62",
>+ "\1\63",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "",
>+ "\1\65",
>+ "\1\66",
>+ "\1\67",
>+ "",
>+ "\1\70",
>+ "\1\71",
>+ "\1\72",
>+ "\1\73",
>+ "\1\74",
>+ "\1\75",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "\1\77",
>+ "\1\100",
>+ "",
>+ "\1\101",
>+ "\1\102",
>+ "\1\103",
>+ "\1\104",
>+ "\1\105",
>+ "\1\106",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ "\1\110",
>+ "",
>+ "\1\111",
>+ "\12\25\7\uffff\32\25\4\uffff\1\25\1\uffff\32\25",
>+ ""
>+ };
>+
>+ static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
>+ static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
>+ static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
>+ static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
>+ static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
>+ static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
>+ static final short[][] DFA12_transition;
>+
>+ static {
>+ int numStates = DFA12_transitionS.length;
>+ DFA12_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
>+ }
>+ }
>+
>+ class DFA12 extends DFA {
>+
>+ public DFA12(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 12;
>+ this.eot = DFA12_eot;
>+ this.eof = DFA12_eof;
>+ this.min = DFA12_min;
>+ this.max = DFA12_max;
>+ this.accept = DFA12_accept;
>+ this.special = DFA12_special;
>+ this.transition = DFA12_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA12_14 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFF')) ) {s = 32;}
>+
>+ else s = 16;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA12_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA12_0==',') ) {s = 1;}
>+
>+ else if ( (LA12_0=='a') ) {s = 2;}
>+
>+ else if ( (LA12_0=='w') ) {s = 3;}
>+
>+ else if ( (LA12_0=='[') ) {s = 4;}
>+
>+ else if ( (LA12_0==']') ) {s = 5;}
>+
>+ else if ( (LA12_0=='/') ) {s = 6;}
>+
>+ else if ( (LA12_0=='A') ) {s = 7;}
>+
>+ else if ( (LA12_0=='S') ) {s = 8;}
>+
>+ else if ( (LA12_0=='O') ) {s = 9;}
>+
>+ else if ( (LA12_0=='^') ) {s = 10;}
>+
>+ else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='b' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {s = 11;}
>+
>+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 12;}
>+
>+ else if ( (LA12_0=='\"') ) {s = 13;}
>+
>+ else if ( (LA12_0=='\'') ) {s = 14;}
>+
>+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 15;}
>+
>+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 16;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA12_13 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFF')) ) {s = 32;}
>+
>+ else s = 16;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 12, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
> 
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.g	(working copy)
>@@ -19,11 +19,9 @@
> @parser::header {
> package org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -31,7 +29,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.transition.editor.xtext.services.UmlTransitionGrammarAccess;
> 
> }
>@@ -40,17 +37,10 @@
> 
> 	private UmlTransitionGrammarAccess grammarAccess;
> 	
>- public InternalUmlTransitionParser(TokenStream input, IAstFactory factory, UmlTransitionGrammarAccess grammarAccess) {
>+ public InternalUmlTransitionParser(TokenStream input, UmlTransitionGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/transition/editor/xtext/parser/antlr/internal/InternalUmlTransition.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -77,7 +67,7 @@
> // Entry rule entryRuleTransitionRule
> entryRuleTransitionRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getTransitionRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getTransitionRuleRule()); }
> 	 iv_ruleTransitionRule=ruleTransitionRule 
> 	 { $current=$iv_ruleTransitionRule.current; } 
> 	 EOF 
>@@ -85,108 +75,82 @@
> 
> // Rule TransitionRule
> ruleTransitionRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_0_0()); 
> 	 }
> 		lv_triggers_0_0=ruleEventRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"triggers",
>-	 		lv_triggers_0_0, 
>-	 		"EventRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"triggers",
>+ 		lv_triggers_0_0, 
>+ 		"EventRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)(	',' 
>+)(	otherlv_1=',' 
> {
>- createLeafNode(grammarAccess.getTransitionRuleAccess().getCommaKeyword_0_1_0(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getTransitionRuleAccess().getCommaKeyword_0_1_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_1_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_1_1_0()); 
> 	 }
> 		lv_triggers_2_0=ruleEventRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"triggers",
>-	 		lv_triggers_2_0, 
>-	 		"EventRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"triggers",
>+ 		lv_triggers_2_0, 
>+ 		"EventRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> ))*)?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getGuardGuardRuleParserRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getGuardGuardRuleParserRuleCall_1_0()); 
> 	 }
> 		lv_guard_3_0=ruleGuardRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"guard",
>-	 		lv_guard_3_0, 
>-	 		"GuardRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"guard",
>+ 		lv_guard_3_0, 
>+ 		"GuardRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTransitionRuleAccess().getEffectEffectRuleParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTransitionRuleAccess().getEffectEffectRuleParserRuleCall_2_0()); 
> 	 }
> 		lv_effect_4_0=ruleEffectRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTransitionRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"effect",
>-	 		lv_effect_4_0, 
>-	 		"EffectRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getTransitionRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"effect",
>+ 		lv_effect_4_0, 
>+ 		"EffectRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -200,7 +164,7 @@
> // Entry rule entryRuleEventRule
> entryRuleEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getEventRuleRule()); }
> 	 iv_ruleEventRule=ruleEventRule 
> 	 { $current=$iv_ruleEventRule.current; } 
> 	 EOF 
>@@ -208,49 +172,47 @@
> 
> // Rule EventRule
> ruleEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> { 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getCallOrSignalEventRuleParserRuleCall_0(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getCallOrSignalEventRuleParserRuleCall_0()); 
> }
> this_CallOrSignalEventRule_0=ruleCallOrSignalEventRule
> { 
> $current = $this_CallOrSignalEventRule_0.current; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> }
> 
> |
> { 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getAnyReceiveEventRuleParserRuleCall_1(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getAnyReceiveEventRuleParserRuleCall_1()); 
> }
> this_AnyReceiveEventRule_1=ruleAnyReceiveEventRule
> { 
> $current = $this_AnyReceiveEventRule_1.current; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> }
> 
> |
> { 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getTimeEventRuleParserRuleCall_2(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getTimeEventRuleParserRuleCall_2()); 
> }
> this_TimeEventRule_2=ruleTimeEventRule
> { 
> $current = $this_TimeEventRule_2.current; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> }
> 
> |
> { 
>- currentNode=createCompositeNode(grammarAccess.getEventRuleAccess().getChangeEventRuleParserRuleCall_3(), currentNode); 
>+ newCompositeNode(grammarAccess.getEventRuleAccess().getChangeEventRuleParserRuleCall_3()); 
> }
> this_ChangeEventRule_3=ruleChangeEventRule
> { 
> $current = $this_ChangeEventRule_3.current; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> }
> )
> ;
>@@ -262,7 +224,7 @@
> // Entry rule entryRuleCallOrSignalEventRule
> entryRuleCallOrSignalEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getCallOrSignalEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getCallOrSignalEventRuleRule()); }
> 	 iv_ruleCallOrSignalEventRule=ruleCallOrSignalEventRule 
> 	 { $current=$iv_ruleCallOrSignalEventRule.current; } 
> 	 EOF 
>@@ -270,22 +232,19 @@
> 
> // Rule CallOrSignalEventRule
> ruleCallOrSignalEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getCallOrSignalEventRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getCallOrSignalEventRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_0=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getCallOrSignalEventRuleAccess().getOperationOrSignalNamedElementCrossReference_0(), "operationOrSignal"); 
>+		newLeafNode(otherlv_0, grammarAccess.getCallOrSignalEventRuleAccess().getOperationOrSignalNamedElementCrossReference_0()); 
> 	}
> 
> )
>@@ -299,7 +258,7 @@
> // Entry rule entryRuleAnyReceiveEventRule
> entryRuleAnyReceiveEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getAnyReceiveEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getAnyReceiveEventRuleRule()); }
> 	 iv_ruleAnyReceiveEventRule=ruleAnyReceiveEventRule 
> 	 { $current=$iv_ruleAnyReceiveEventRule.current; } 
> 	 EOF 
>@@ -307,29 +266,21 @@
> 
> // Rule AnyReceiveEventRule
> ruleAnyReceiveEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		lv_isAReceiveEvent_0_0=	'all' 
> {
>- createLeafNode(grammarAccess.getAnyReceiveEventRuleAccess().getIsAReceiveEventAllKeyword_0(), "isAReceiveEvent"); 
>+ newLeafNode(lv_isAReceiveEvent_0_0, grammarAccess.getAnyReceiveEventRuleAccess().getIsAReceiveEventAllKeyword_0());
> }
> 
> 	 {
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getAnyReceiveEventRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 
>-	 try {
>-	 		set($current, "isAReceiveEvent", lv_isAReceiveEvent_0_0, "all", lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getAnyReceiveEventRuleRule());
> 	 }
>+ 		setWithLastConsumed($current, "isAReceiveEvent", lv_isAReceiveEvent_0_0, "all");
> 	 }
> 
> )
>@@ -343,7 +294,7 @@
> // Entry rule entryRuleTimeEventRule
> entryRuleTimeEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getTimeEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getTimeEventRuleRule()); }
> 	 iv_ruleTimeEventRule=ruleTimeEventRule 
> 	 { $current=$iv_ruleTimeEventRule.current; } 
> 	 EOF 
>@@ -351,29 +302,27 @@
> 
> // Rule TimeEventRule
> ruleTimeEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> { 
>- currentNode=createCompositeNode(grammarAccess.getTimeEventRuleAccess().getRelativeTimeEventRuleParserRuleCall_0(), currentNode); 
>+ newCompositeNode(grammarAccess.getTimeEventRuleAccess().getRelativeTimeEventRuleParserRuleCall_0()); 
> }
> this_RelativeTimeEventRule_0=ruleRelativeTimeEventRule
> { 
> $current = $this_RelativeTimeEventRule_0.current; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> }
> 
> |
> { 
>- currentNode=createCompositeNode(grammarAccess.getTimeEventRuleAccess().getAbsoluteTimeEventRuleParserRuleCall_1(), currentNode); 
>+ newCompositeNode(grammarAccess.getTimeEventRuleAccess().getAbsoluteTimeEventRuleParserRuleCall_1()); 
> }
> this_AbsoluteTimeEventRule_1=ruleAbsoluteTimeEventRule
> { 
> $current = $this_AbsoluteTimeEventRule_1.current; 
>- currentNode = currentNode.getParent();
>+ afterParserOrEnumRuleCall();
> }
> )
> ;
>@@ -385,7 +334,7 @@
> // Entry rule entryRuleRelativeTimeEventRule
> entryRuleRelativeTimeEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getRelativeTimeEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getRelativeTimeEventRuleRule()); }
> 	 iv_ruleRelativeTimeEventRule=ruleRelativeTimeEventRule 
> 	 { $current=$iv_ruleRelativeTimeEventRule.current; } 
> 	 EOF 
>@@ -393,36 +342,28 @@
> 
> // Rule RelativeTimeEventRule
> ruleRelativeTimeEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'after' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='after' 
> {
>- createLeafNode(grammarAccess.getRelativeTimeEventRuleAccess().getAfterKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getRelativeTimeEventRuleAccess().getAfterKeyword_0());
> }
> (
> (
> 		lv_expr_1_0=RULE_STRING
> 		{
>-			createLeafNode(grammarAccess.getRelativeTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0(), "expr"); 
>+			newLeafNode(lv_expr_1_0, grammarAccess.getRelativeTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getRelativeTimeEventRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"expr",
>-	 		lv_expr_1_0, 
>-	 		"STRING", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getRelativeTimeEventRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"expr",
>+ 		lv_expr_1_0, 
>+ 		"STRING");
> 	 }
> 
> )
>@@ -436,7 +377,7 @@
> // Entry rule entryRuleAbsoluteTimeEventRule
> entryRuleAbsoluteTimeEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getAbsoluteTimeEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getAbsoluteTimeEventRuleRule()); }
> 	 iv_ruleAbsoluteTimeEventRule=ruleAbsoluteTimeEventRule 
> 	 { $current=$iv_ruleAbsoluteTimeEventRule.current; } 
> 	 EOF 
>@@ -444,36 +385,28 @@
> 
> // Rule AbsoluteTimeEventRule
> ruleAbsoluteTimeEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'at' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='at' 
> {
>- createLeafNode(grammarAccess.getAbsoluteTimeEventRuleAccess().getAtKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getAbsoluteTimeEventRuleAccess().getAtKeyword_0());
> }
> (
> (
> 		lv_expr_1_0=RULE_STRING
> 		{
>-			createLeafNode(grammarAccess.getAbsoluteTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0(), "expr"); 
>+			newLeafNode(lv_expr_1_0, grammarAccess.getAbsoluteTimeEventRuleAccess().getExprSTRINGTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getAbsoluteTimeEventRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"expr",
>-	 		lv_expr_1_0, 
>-	 		"STRING", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getAbsoluteTimeEventRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"expr",
>+ 		lv_expr_1_0, 
>+ 		"STRING");
> 	 }
> 
> )
>@@ -487,7 +420,7 @@
> // Entry rule entryRuleChangeEventRule
> entryRuleChangeEventRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getChangeEventRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getChangeEventRuleRule()); }
> 	 iv_ruleChangeEventRule=ruleChangeEventRule 
> 	 { $current=$iv_ruleChangeEventRule.current; } 
> 	 EOF 
>@@ -495,36 +428,28 @@
> 
> // Rule ChangeEventRule
> ruleChangeEventRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'when' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='when' 
> {
>- createLeafNode(grammarAccess.getChangeEventRuleAccess().getWhenKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getChangeEventRuleAccess().getWhenKeyword_0());
> }
> (
> (
> 		lv_exp_1_0=RULE_STRING
> 		{
>-			createLeafNode(grammarAccess.getChangeEventRuleAccess().getExpSTRINGTerminalRuleCall_1_0(), "exp"); 
>+			newLeafNode(lv_exp_1_0, grammarAccess.getChangeEventRuleAccess().getExpSTRINGTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getChangeEventRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"exp",
>-	 		lv_exp_1_0, 
>-	 		"STRING", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getChangeEventRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"exp",
>+ 		lv_exp_1_0, 
>+ 		"STRING");
> 	 }
> 
> )
>@@ -538,7 +463,7 @@
> // Entry rule entryRuleGuardRule
> entryRuleGuardRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getGuardRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getGuardRuleRule()); }
> 	 iv_ruleGuardRule=ruleGuardRule 
> 	 { $current=$iv_ruleGuardRule.current; } 
> 	 EOF 
>@@ -546,42 +471,34 @@
> 
> // Rule GuardRule
> ruleGuardRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'[' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='[' 
> {
>- createLeafNode(grammarAccess.getGuardRuleAccess().getLeftSquareBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getGuardRuleAccess().getLeftSquareBracketKeyword_0());
> }
> (
> (
> 		lv_constraint_1_0=RULE_STRING
> 		{
>-			createLeafNode(grammarAccess.getGuardRuleAccess().getConstraintSTRINGTerminalRuleCall_1_0(), "constraint"); 
>+			newLeafNode(lv_constraint_1_0, grammarAccess.getGuardRuleAccess().getConstraintSTRINGTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getGuardRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"constraint",
>-	 		lv_constraint_1_0, 
>-	 		"STRING", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getGuardRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"constraint",
>+ 		lv_constraint_1_0, 
>+ 		"STRING");
> 	 }
> 
> )
>-)	']' 
>+)	otherlv_2=']' 
> {
>- createLeafNode(grammarAccess.getGuardRuleAccess().getRightSquareBracketKeyword_2(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getGuardRuleAccess().getRightSquareBracketKeyword_2());
> }
> )
> ;
>@@ -593,7 +510,7 @@
> // Entry rule entryRuleEffectRule
> entryRuleEffectRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getEffectRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getEffectRuleRule()); }
> 	 iv_ruleEffectRule=ruleEffectRule 
> 	 { $current=$iv_ruleEffectRule.current; } 
> 	 EOF 
>@@ -601,36 +518,28 @@
> 
> // Rule EffectRule
> ruleEffectRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'/' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='/' 
> {
>- createLeafNode(grammarAccess.getEffectRuleAccess().getSolidusKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getEffectRuleAccess().getSolidusKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getEffectRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getEffectRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 }
> 		lv_kind_1_0=ruleBehaviorKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getEffectRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"kind",
>-	 		lv_kind_1_0, 
>-	 		"BehaviorKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getEffectRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -638,23 +547,17 @@
> (
> 		lv_behaviorName_2_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getEffectRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+			newLeafNode(lv_behaviorName_2_0, grammarAccess.getEffectRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getEffectRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getEffectRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"behaviorName",
>-	 		lv_behaviorName_2_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 }
> 
> )
>@@ -667,26 +570,24 @@
> 
> // Rule BehaviorKind
> ruleBehaviorKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'Activity' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='Activity' 
> 	{
> $current = grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'StateMachine' 
>+ |(	enumLiteral_1='StateMachine' 
> 	{
> $current = grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'OpaqueBehavior' 
>+ |(	enumLiteral_2='OpaqueBehavior' 
> 	{
> $current = grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2()); 
> }
> ));
> 
>@@ -696,7 +597,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/validation/AbstractUmlTransitionJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/validation/AbstractUmlTransitionJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/validation/AbstractUmlTransitionJavaValidator.java	(working copy)
>@@ -10,7 +10,7 @@
> @ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlTransitionJavaValidator extends AbstractDeclarativeValidator {
> 
>-@Override
>+	@Override
> 	protected List<EPackage> getEPackages() {
> 	 List<EPackage> result = new ArrayList<EPackage>();
> 	 result.add(org.eclipse.papyrus.transition.editor.xtext.umlTransition.UmlTransitionPackage.eINSTANCE);
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/AbstractUmlTransitionRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/AbstractUmlTransitionRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/AbstractUmlTransitionRuntimeModule.java	(working copy)
>@@ -45,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.transition.editor.xtext.parser.antlr.UmlTransitionParser.class;
> 	}
> 
>@@ -91,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -99,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/umlTransition/util/UmlTransitionSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/umlTransition/util/UmlTransitionSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/umlTransition/util/UmlTransitionSwitch.java	(working copy)
>@@ -6,10 +6,10 @@
> */
> package org.eclipse.papyrus.transition.editor.xtext.umlTransition.util;
> 
>-import java.util.List;
>-
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
> 
> import org.eclipse.papyrus.transition.editor.xtext.umlTransition.*;
> 
>@@ -26,7 +26,7 @@
> * @see org.eclipse.papyrus.transition.editor.xtext.umlTransition.UmlTransitionPackage
> * @generated
> */
>-public class UmlTransitionSwitch<T>
>+public class UmlTransitionSwitch<T> extends Switch<T>
> {
> /**
> * The cached model package
>@@ -51,38 +51,17 @@
> }
> 
> /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>- * 
>- * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>- * @generated
>- */
>- public T doSwitch(EObject theEObject)
>- {
>- return doSwitch(theEObject.eClass(), theEObject);
>- }
>-
>- /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * Checks whether this is a switch for the given package.
> * 
> * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
> * @generated
> */
>- protected T doSwitch(EClass theEClass, EObject theEObject)
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
> {
>- if (theEClass.eContainer() == modelPackage)
>- {
>- return doSwitch(theEClass.getClassifierID(), theEObject);
>- }
>- else
>- {
>- List<EClass> eSuperTypes = theEClass.getESuperTypes();
>- return
>- eSuperTypes.isEmpty() ?
>- defaultCase(theEObject) :
>- doSwitch(eSuperTypes.get(0), theEObject);
>- }
>+ return ePackage == modelPackage;
> }
> 
> /**
>@@ -92,6 +71,7 @@
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>+ @Override
> protected T doSwitch(int classifierID, EObject theEObject)
> {
> switch (classifierID)
>@@ -349,6 +329,7 @@
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
> */
>+ @Override
> public T defaultCase(EObject object)
> {
> return null;
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransitionStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransitionStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/UmlTransitionStandaloneSetupGenerated.java	(working copy)
>@@ -39,6 +39,5 @@
> 
> 
> 
>-
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/services/UmlTransitionGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/services/UmlTransitionGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/services/UmlTransitionGrammarAccess.java	(working copy)
>@@ -500,8 +500,8 @@
> 	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaTerminals.getSTRINGRule();
> 	} 
>Index: src/org/eclipse/papyrus/transition/editor/xtext/GenerateUmlTransition.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/transition/editor/xtext/GenerateUmlTransition.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/transition/editor/xtext/GenerateUmlTransition.mwe2	(working copy)
>@@ -88,8 +88,7 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// quickfix API 
>#P org.eclipse.papyrus.property.editor.xtext
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/validation/AbstractUmlPropertyJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/validation/AbstractUmlPropertyJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/validation/AbstractUmlPropertyJavaValidator.java	(working copy)
>@@ -10,7 +10,7 @@
> @ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlPropertyJavaValidator extends AbstractDeclarativeValidator {
> 
>-@Override
>+	@Override
> 	protected List<EPackage> getEPackages() {
> 	 List<EPackage> result = new ArrayList<EPackage>();
> 	 result.add(org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage.eINSTANCE);
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi	(working copy)
>@@ -307,6 +307,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -332,6 +333,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/UmlPropertyStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/UmlPropertyStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/UmlPropertyStandaloneSetupGenerated.java	(working copy)
>@@ -39,6 +39,5 @@
> 
> 
> 
>-
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java	(working copy)
>@@ -651,8 +651,8 @@
> 	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaTerminals.getSTRINGRule();
> 	} 
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/AbstractUmlPropertyRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/AbstractUmlPropertyRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/AbstractUmlPropertyRuntimeModule.java	(working copy)
>@@ -45,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.property.editor.xtext.parser.antlr.UmlPropertyParser.class;
> 	}
> 
>@@ -91,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -99,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>@@ -126,7 +131,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
> 	}
> 
> }
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore	(working copy)
>@@ -4,16 +4,16 @@
> xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="umlProperty"
> nsURI="http://www.eclipse.org/papyrus/property/editor/xtext/UmlProperty" nsPrefix="umlProperty">
> <eClassifiers xsi:type="ecore:EClass" name="PropertyRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="#//VisibilityKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//VisibilityKind"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDerived" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//TypeRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//TypeRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//MultiplicityRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//MultiplicityRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="modifiers" eType="#//ModifiersRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="modifiers" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifiersRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//DefaultValueRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//DefaultValueRule"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">
>@@ -23,31 +23,33 @@
> <eLiterals name="package" value="3" literal="~"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="TypeRule">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//QualifiedName"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//QualifiedName"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Classifier"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/model/UML.ecore#//Classifier"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="QualifiedName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="#//QualifiedName"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/model/UML.ecore#//Namespace"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//QualifiedName"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="MultiplicityRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" upperBound="-1"
>- eType="#//BoundSpecification" containment="true"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//BoundSpecification"
>+ containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="BoundSpecification">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ModifiersRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
>- eType="#//ModifierSpecification" containment="true"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierSpecification"
>+ containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ModifierSpecification">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//ModifierKind"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="redefines" eType="#//RedefinesRule"
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="redefines" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//RedefinesRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="subsets" eType="#//SubsetsRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="subsets" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//SubsetsRule"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="ModifierKind">
>@@ -57,10 +59,10 @@
> <eLiterals name="unique" value="3" literal="unique"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="RedefinesRule">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Property"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/model/UML.ecore#//Property"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="SubsetsRule">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Property"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.property.editor.xtext/model/UML.ecore#//Property"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="DefaultValueRule">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel	(working copy)
>@@ -6,60 +6,60 @@
> modelPluginID="org.eclipse.papyrus.property.editor.xtext" forceOverwrite="true"
> modelName="UmlProperty" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.property.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.property.editor.xtext.editor" usedGenPackages="../../../../../../../model/UML.genmodel#//uml">
>+ editorPluginID="org.eclipse.papyrus.property.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.property.editor.xtext/model/UML.genmodel#//uml">
> <genPackages prefix="UmlProperty" basePackage="org.eclipse.papyrus.property.editor.xtext"
>- resource="XML" disposableProviderFactory="true" ecorePackage="UmlProperty.ecore#/">
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlProperty.ecore#//VisibilityKind">
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//VisibilityKind/public"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//VisibilityKind/private"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//VisibilityKind/protected"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//VisibilityKind/package"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#/">
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//VisibilityKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//VisibilityKind/public"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//VisibilityKind/private"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//VisibilityKind/protected"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//VisibilityKind/package"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlProperty.ecore#//ModifierKind">
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//ModifierKind/readOnly"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//ModifierKind/union"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//ModifierKind/ordered"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlProperty.ecore#//ModifierKind/unique"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierKind/readOnly"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierKind/union"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierKind/ordered"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierKind/unique"/>
> </genEnums>
>- <genClasses ecoreClass="UmlProperty.ecore#//PropertyRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//PropertyRule/visibility"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//PropertyRule/isDerived"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//PropertyRule/name"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//PropertyRule/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//PropertyRule/multiplicity"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//PropertyRule/modifiers"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//PropertyRule/default"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/visibility"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/isDerived"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/name"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/multiplicity"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/modifiers"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//PropertyRule/default"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//TypeRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//TypeRule/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//TypeRule/type"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//TypeRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//TypeRule/path"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//TypeRule/type"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//QualifiedName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//QualifiedName/path"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//QualifiedName/remaining"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//QualifiedName">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//QualifiedName/path"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//QualifiedName/remaining"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//MultiplicityRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//MultiplicityRule/bounds"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//MultiplicityRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//MultiplicityRule/bounds"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//BoundSpecification">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//BoundSpecification/value"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//BoundSpecification">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//BoundSpecification/value"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//ModifiersRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//ModifiersRule/values"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifiersRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifiersRule/values"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//ModifierSpecification">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//ModifierSpecification/value"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//ModifierSpecification/redefines"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//ModifierSpecification/subsets"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierSpecification">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierSpecification/value"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierSpecification/redefines"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//ModifierSpecification/subsets"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//RedefinesRule">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//RedefinesRule/property"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//RedefinesRule">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//RedefinesRule/property"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//SubsetsRule">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//SubsetsRule/property"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//SubsetsRule">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//SubsetsRule/property"/>
> </genClasses>
>- <genClasses ecoreClass="UmlProperty.ecore#//DefaultValueRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//DefaultValueRule/default"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//DefaultValueRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore#//DefaultValueRule/default"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java	(working copy)
>@@ -6,10 +6,10 @@
> */
> package org.eclipse.papyrus.property.editor.xtext.umlProperty.util;
> 
>-import java.util.List;
>-
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
> 
> import org.eclipse.papyrus.property.editor.xtext.umlProperty.*;
> 
>@@ -26,7 +26,7 @@
> * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage
> * @generated
> */
>-public class UmlPropertySwitch<T>
>+public class UmlPropertySwitch<T> extends Switch<T>
> {
> /**
> * The cached model package
>@@ -51,38 +51,17 @@
> }
> 
> /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>- * 
>- * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>- * @generated
>- */
>- public T doSwitch(EObject theEObject)
>- {
>- return doSwitch(theEObject.eClass(), theEObject);
>- }
>-
>- /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * Checks whether this is a switch for the given package.
> * 
> * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
> * @generated
> */
>- protected T doSwitch(EClass theEClass, EObject theEObject)
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
> {
>- if (theEClass.eContainer() == modelPackage)
>- {
>- return doSwitch(theEClass.getClassifierID(), theEObject);
>- }
>- else
>- {
>- List<EClass> eSuperTypes = theEClass.getESuperTypes();
>- return
>- eSuperTypes.isEmpty() ?
>- defaultCase(theEObject) :
>- doSwitch(eSuperTypes.get(0), theEObject);
>- }
>+ return ePackage == modelPackage;
> }
> 
> /**
>@@ -92,6 +71,7 @@
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>+ @Override
> protected T doSwitch(int classifierID, EObject theEObject)
> {
> switch (classifierID)
>@@ -341,6 +321,7 @@
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
> */
>+ @Override
> public T defaultCase(EObject object)
> {
> return null;
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g	(working copy)
>@@ -19,11 +19,9 @@
> @parser::header {
> package org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -31,7 +29,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.property.editor.xtext.services.UmlPropertyGrammarAccess;
> 
> }
>@@ -40,17 +37,10 @@
> 
> 	private UmlPropertyGrammarAccess grammarAccess;
> 	
>- public InternalUmlPropertyParser(TokenStream input, IAstFactory factory, UmlPropertyGrammarAccess grammarAccess) {
>+ public InternalUmlPropertyParser(TokenStream input, UmlPropertyGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -77,7 +67,7 @@
> // Entry rule entryRulePropertyRule
> entryRulePropertyRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getPropertyRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getPropertyRuleRule()); }
> 	 iv_rulePropertyRule=rulePropertyRule 
> 	 { $current=$iv_rulePropertyRule.current; } 
> 	 EOF 
>@@ -85,32 +75,24 @@
> 
> // Rule PropertyRule
> rulePropertyRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 	 }
> 		lv_visibility_0_0=ruleVisibilityKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"visibility",
>-	 		lv_visibility_0_0, 
>-	 		"VisibilityKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"visibility",
>+ 		lv_visibility_0_0, 
>+ 		"VisibilityKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -118,20 +100,14 @@
> (
> 		lv_isDerived_1_0=	'/' 
> {
>- createLeafNode(grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0(), "isDerived"); 
>+ newLeafNode(lv_isDerived_1_0, grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0());
> }
> 
> 	 {
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 
>-	 try {
>-	 		set($current, "isDerived", lv_isDerived_1_0, "/", lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getPropertyRuleRule());
> 	 }
>+ 		setWithLastConsumed($current, "isDerived", lv_isDerived_1_0, "/");
> 	 }
> 
> )
>@@ -139,128 +115,98 @@
> (
> 		lv_name_2_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getPropertyRuleAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
>+			newLeafNode(lv_name_2_0, grammarAccess.getPropertyRuleAccess().getNameIDTerminalRuleCall_2_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getPropertyRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"name",
>-	 		lv_name_2_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"name",
>+ 		lv_name_2_0, 
>+ 		"ID");
> 	 }
> 
> )
>-)	':' 
>+)	otherlv_3=':' 
> {
>- createLeafNode(grammarAccess.getPropertyRuleAccess().getColonKeyword_3(), null); 
>+ 	newLeafNode(otherlv_3, grammarAccess.getPropertyRuleAccess().getColonKeyword_3());
> }
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
> 	 }
> 		lv_type_4_0=ruleTypeRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"type",
>-	 		lv_type_4_0, 
>-	 		"TypeRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"type",
>+ 		lv_type_4_0, 
>+ 		"TypeRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )
>- |	'<Undefined>' 
>+ |	otherlv_5='<Undefined>' 
> {
>- createLeafNode(grammarAccess.getPropertyRuleAccess().getUndefinedKeyword_4_1(), null); 
>+ 	newLeafNode(otherlv_5, grammarAccess.getPropertyRuleAccess().getUndefinedKeyword_4_1());
> }
> )(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
> 	 }
> 		lv_multiplicity_6_0=ruleMultiplicityRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"multiplicity",
>-	 		lv_multiplicity_6_0, 
>-	 		"MultiplicityRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"multiplicity",
>+ 		lv_multiplicity_6_0, 
>+ 		"MultiplicityRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
> 	 }
> 		lv_modifiers_7_0=ruleModifiersRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"modifiers",
>-	 		lv_modifiers_7_0, 
>-	 		"ModifiersRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"modifiers",
>+ 		lv_modifiers_7_0, 
>+ 		"ModifiersRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); 
> 	 }
> 		lv_default_8_0=ruleDefaultValueRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"default",
>-	 		lv_default_8_0, 
>-	 		"DefaultValueRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"default",
>+ 		lv_default_8_0, 
>+ 		"DefaultValueRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -274,7 +220,7 @@
> // Entry rule entryRuleTypeRule
> entryRuleTypeRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getTypeRuleRule()); }
> 	 iv_ruleTypeRule=ruleTypeRule 
> 	 { $current=$iv_ruleTypeRule.current; } 
> 	 EOF 
>@@ -282,32 +228,24 @@
> 
> // Rule TypeRule
> ruleTypeRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 	 }
> 		lv_path_0_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getTypeRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"path",
>-	 		lv_path_0_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -315,13 +253,12 @@
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getTypeRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getTypeRuleAccess().getTypeClassifierCrossReference_1_0(), "type"); 
>+		newLeafNode(otherlv_1, grammarAccess.getTypeRuleAccess().getTypeClassifierCrossReference_1_0()); 
> 	}
> 
> )
>@@ -335,7 +272,7 @@
> // Entry rule entryRuleQualifiedName
> entryRuleQualifiedName returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getQualifiedNameRule()); }
> 	 iv_ruleQualifiedName=ruleQualifiedName 
> 	 { $current=$iv_ruleQualifiedName.current; } 
> 	 EOF 
>@@ -343,50 +280,41 @@
> 
> // Rule QualifiedName
> ruleQualifiedName returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_0=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	}
> 
> )
>-)	'::' 
>+)	otherlv_1='::' 
> {
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 }
> 		lv_remaining_2_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"remaining",
>-	 		lv_remaining_2_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -400,7 +328,7 @@
> // Entry rule entryRuleMultiplicityRule
> entryRuleMultiplicityRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getMultiplicityRuleRule()); }
> 	 iv_ruleMultiplicityRule=ruleMultiplicityRule 
> 	 { $current=$iv_ruleMultiplicityRule.current; } 
> 	 EOF 
>@@ -408,70 +336,56 @@
> 
> // Rule MultiplicityRule
> ruleMultiplicityRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'[' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='[' 
> {
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
> 	 }
> 		lv_bounds_1_0=ruleBoundSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"bounds",
>-	 		lv_bounds_1_0, 
>-	 		"BoundSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"bounds",
>+ 		lv_bounds_1_0, 
>+ 		"BoundSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)(	'..' 
>+)(	otherlv_2='..' 
> {
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
> 	 }
> 		lv_bounds_3_0=ruleBoundSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"bounds",
>-	 		lv_bounds_3_0, 
>-	 		"BoundSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"bounds",
>+ 		lv_bounds_3_0, 
>+ 		"BoundSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-))?	']' 
>+))?	otherlv_4=']' 
> {
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3());
> }
> )
> ;
>@@ -483,7 +397,7 @@
> // Entry rule entryRuleBoundSpecification
> entryRuleBoundSpecification returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getBoundSpecificationRule()); }
> 	 iv_ruleBoundSpecification=ruleBoundSpecification 
> 	 { $current=$iv_ruleBoundSpecification.current; } 
> 	 EOF 
>@@ -491,32 +405,24 @@
> 
> // Rule BoundSpecification
> ruleBoundSpecification returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		lv_value_0_0=RULE_UNLIMITEDLITERAL
> 		{
>-			createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value"); 
>+			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getBoundSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"value",
>-	 		lv_value_0_0, 
>-	 		"UnlimitedLiteral", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
> 	 }
> 
> )
>@@ -530,7 +436,7 @@
> // Entry rule entryRuleModifiersRule
> entryRuleModifiersRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getModifiersRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getModifiersRuleRule()); }
> 	 iv_ruleModifiersRule=ruleModifiersRule 
> 	 { $current=$iv_ruleModifiersRule.current; } 
> 	 EOF 
>@@ -538,70 +444,56 @@
> 
> // Rule ModifiersRule
> ruleModifiersRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'{' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='{' 
> {
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
> 	 }
> 		lv_values_1_0=ruleModifierSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"values",
>-	 		lv_values_1_0, 
>-	 		"ModifierSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"values",
>+ 		lv_values_1_0, 
>+ 		"ModifierSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)(	',' 
>+)(	otherlv_2=',' 
> {
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
> 	 }
> 		lv_values_3_0=ruleModifierSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"values",
>-	 		lv_values_3_0, 
>-	 		"ModifierSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"values",
>+ 		lv_values_3_0, 
>+ 		"ModifierSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-))*	'}' 
>+))*	otherlv_4='}' 
> {
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3());
> }
> )
> ;
>@@ -613,7 +505,7 @@
> // Entry rule entryRuleModifierSpecification
> entryRuleModifierSpecification returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getModifierSpecificationRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getModifierSpecificationRule()); }
> 	 iv_ruleModifierSpecification=ruleModifierSpecification 
> 	 { $current=$iv_ruleModifierSpecification.current; } 
> 	 EOF 
>@@ -621,32 +513,24 @@
> 
> // Rule ModifierSpecification
> ruleModifierSpecification returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); 
> 	 }
> 		lv_value_0_0=ruleModifierKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"value",
>-	 		lv_value_0_0, 
>-	 		"ModifierKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"ModifierKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -654,24 +538,18 @@
> |(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); 
> 	 }
> 		lv_redefines_1_0=ruleRedefinesRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"redefines",
>-	 		lv_redefines_1_0, 
>-	 		"RedefinesRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"redefines",
>+ 		lv_redefines_1_0, 
>+ 		"RedefinesRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -679,24 +557,18 @@
> |(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); 
> 	 }
> 		lv_subsets_2_0=ruleSubsetsRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"subsets",
>-	 		lv_subsets_2_0, 
>-	 		"SubsetsRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"subsets",
>+ 		lv_subsets_2_0, 
>+ 		"SubsetsRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -710,7 +582,7 @@
> // Entry rule entryRuleRedefinesRule
> entryRuleRedefinesRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getRedefinesRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getRedefinesRuleRule()); }
> 	 iv_ruleRedefinesRule=ruleRedefinesRule 
> 	 { $current=$iv_ruleRedefinesRule.current; } 
> 	 EOF 
>@@ -718,26 +590,23 @@
> 
> // Rule RedefinesRule
> ruleRedefinesRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'redefines' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='redefines' 
> {
>- createLeafNode(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0());
> }
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getRedefinesRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getRedefinesRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
>+		newLeafNode(otherlv_1, grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0()); 
> 	}
> 
> )
>@@ -751,7 +620,7 @@
> // Entry rule entryRuleSubsetsRule
> entryRuleSubsetsRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getSubsetsRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getSubsetsRuleRule()); }
> 	 iv_ruleSubsetsRule=ruleSubsetsRule 
> 	 { $current=$iv_ruleSubsetsRule.current; } 
> 	 EOF 
>@@ -759,26 +628,23 @@
> 
> // Rule SubsetsRule
> ruleSubsetsRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'subsets' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='subsets' 
> {
>- createLeafNode(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0());
> }
> (
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getSubsetsRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getSubsetsRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
>+		newLeafNode(otherlv_1, grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0()); 
> 	}
> 
> )
>@@ -792,7 +658,7 @@
> // Entry rule entryRuleDefaultValueRule
> entryRuleDefaultValueRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getDefaultValueRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getDefaultValueRuleRule()); }
> 	 iv_ruleDefaultValueRule=ruleDefaultValueRule 
> 	 { $current=$iv_ruleDefaultValueRule.current; } 
> 	 EOF 
>@@ -800,36 +666,28 @@
> 
> // Rule DefaultValueRule
> ruleDefaultValueRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'=' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='=' 
> {
>- createLeafNode(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0());
> }
> (
> (
> 		lv_default_1_0=RULE_STRING
> 		{
>-			createLeafNode(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0(), "default"); 
>+			newLeafNode(lv_default_1_0, grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getDefaultValueRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getDefaultValueRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"default",
>-	 		lv_default_1_0, 
>-	 		"STRING", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"default",
>+ 		lv_default_1_0, 
>+ 		"STRING");
> 	 }
> 
> )
>@@ -842,32 +700,30 @@
> 
> // Rule VisibilityKind
> ruleVisibilityKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'+' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='+' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'-' 
>+ |(	enumLiteral_1='-' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'#' 
>+ |(	enumLiteral_2='#' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'~' 
>+ |(	enumLiteral_3='~' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -875,32 +731,30 @@
> 
> // Rule ModifierKind
> ruleModifierKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'readOnly' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='readOnly' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'union' 
>+ |(	enumLiteral_1='union' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'ordered' 
>+ |(	enumLiteral_2='ordered' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'unique' 
>+ |(	enumLiteral_3='unique' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -912,7 +766,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java	(working copy)
>@@ -13,437 +13,487 @@
> @SuppressWarnings("all")
> public class InternalUmlPropertyLexer extends Lexer {
> public static final int RULE_ID=4;
>+ public static final int T__29=29;
> public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
> public static final int RULE_ANY_OTHER=11;
>- public static final int T29=29;
>- public static final int T28=28;
>- public static final int T27=27;
>- public static final int T26=26;
>- public static final int T25=25;
>- public static final int Tokens=33;
>- public static final int T24=24;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
> public static final int EOF=-1;
> public static final int RULE_SL_COMMENT=9;
>- public static final int T23=23;
>- public static final int T22=22;
>- public static final int T21=21;
>- public static final int T20=20;
> public static final int RULE_ML_COMMENT=8;
>+ public static final int T__19=19;
>+ public static final int T__30=30;
>+ public static final int T__31=31;
>+ public static final int T__32=32;
> 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__17=17;
>+ 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=7;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
> public static final int RULE_WS=10;
>- public static final int T15=15;
>- public static final int T16=16;
>- public static final int T17=17;
>- public static final int T18=18;
>- public static final int T30=30;
>- public static final int T19=19;
>- public static final int T32=32;
>- public static final int T31=31;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlPropertyLexer() {;} 
> public InternalUmlPropertyLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlPropertyLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g"; }
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:10:5: ( '/' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:10:7: '/'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:11:7: ( '/' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:11:9: '/'
> {
> match('/'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:11:5: ( ':' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:11:7: ':'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:12:7: ( ':' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:12:9: ':'
> {
> match(':'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:12:5: ( '<Undefined>' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:12:7: '<Undefined>'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:13:7: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:13:9: '<Undefined>'
> {
> match("<Undefined>"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:13:5: ( '::' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:13:7: '::'
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:14:7: ( '::' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:14:9: '::'
> {
> match("::"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:14:5: ( '[' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:14:7: '['
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:15:7: ( '[' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:15:9: '['
> {
> match('['); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start T17
>- public final void mT17() throws RecognitionException {
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
> try {
>- int _type = T17;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:15:5: ( '..' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:15:7: '..'
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:16:7: ( '..' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:16:9: '..'
> {
> match(".."); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T17
>+ // $ANTLR end "T__17"
> 
>- // $ANTLR start T18
>- public final void mT18() throws RecognitionException {
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
> try {
>- int _type = T18;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:16:5: ( ']' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:16:7: ']'
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:17:7: ( ']' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:17:9: ']'
> {
> match(']'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T18
>+ // $ANTLR end "T__18"
> 
>- // $ANTLR start T19
>- public final void mT19() throws RecognitionException {
>+ // $ANTLR start "T__19"
>+ public final void mT__19() throws RecognitionException {
> try {
>- int _type = T19;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:17:5: ( '{' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:17:7: '{'
>+ int _type = T__19;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:18:7: ( '{' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:18:9: '{'
> {
> match('{'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T19
>+ // $ANTLR end "T__19"
> 
>- // $ANTLR start T20
>- public final void mT20() throws RecognitionException {
>+ // $ANTLR start "T__20"
>+ public final void mT__20() throws RecognitionException {
> try {
>- int _type = T20;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:18:5: ( ',' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:18:7: ','
>+ int _type = T__20;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:19:7: ( ',' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:19:9: ','
> {
> match(','); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T20
>+ // $ANTLR end "T__20"
> 
>- // $ANTLR start T21
>- public final void mT21() throws RecognitionException {
>+ // $ANTLR start "T__21"
>+ public final void mT__21() throws RecognitionException {
> try {
>- int _type = T21;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:19:5: ( '}' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:19:7: '}'
>+ int _type = T__21;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:20:7: ( '}' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:20:9: '}'
> {
> match('}'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T21
>+ // $ANTLR end "T__21"
> 
>- // $ANTLR start T22
>- public final void mT22() throws RecognitionException {
>+ // $ANTLR start "T__22"
>+ public final void mT__22() throws RecognitionException {
> try {
>- int _type = T22;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:20:5: ( 'redefines' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:20:7: 'redefines'
>+ int _type = T__22;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:21:7: ( 'redefines' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:21:9: 'redefines'
> {
> match("redefines"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T22
>+ // $ANTLR end "T__22"
> 
>- // $ANTLR start T23
>- public final void mT23() throws RecognitionException {
>+ // $ANTLR start "T__23"
>+ public final void mT__23() throws RecognitionException {
> try {
>- int _type = T23;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:21:5: ( 'subsets' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:21:7: 'subsets'
>+ int _type = T__23;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:22:7: ( 'subsets' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:22:9: 'subsets'
> {
> match("subsets"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T23
>+ // $ANTLR end "T__23"
> 
>- // $ANTLR start T24
>- public final void mT24() throws RecognitionException {
>+ // $ANTLR start "T__24"
>+ public final void mT__24() throws RecognitionException {
> try {
>- int _type = T24;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:22:5: ( '=' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:22:7: '='
>+ int _type = T__24;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:23:7: ( '=' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:23:9: '='
> {
> match('='); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T24
>+ // $ANTLR end "T__24"
> 
>- // $ANTLR start T25
>- public final void mT25() throws RecognitionException {
>+ // $ANTLR start "T__25"
>+ public final void mT__25() throws RecognitionException {
> try {
>- int _type = T25;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:23:5: ( '+' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:23:7: '+'
>+ int _type = T__25;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:24:7: ( '+' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:24:9: '+'
> {
> match('+'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T25
>+ // $ANTLR end "T__25"
> 
>- // $ANTLR start T26
>- public final void mT26() throws RecognitionException {
>+ // $ANTLR start "T__26"
>+ public final void mT__26() throws RecognitionException {
> try {
>- int _type = T26;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:24:5: ( '-' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:24:7: '-'
>+ int _type = T__26;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:25:7: ( '-' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:25:9: '-'
> {
> match('-'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T26
>+ // $ANTLR end "T__26"
> 
>- // $ANTLR start T27
>- public final void mT27() throws RecognitionException {
>+ // $ANTLR start "T__27"
>+ public final void mT__27() throws RecognitionException {
> try {
>- int _type = T27;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:25:5: ( '#' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:25:7: '#'
>+ int _type = T__27;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:26:7: ( '#' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:26:9: '#'
> {
> match('#'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T27
>+ // $ANTLR end "T__27"
> 
>- // $ANTLR start T28
>- public final void mT28() throws RecognitionException {
>+ // $ANTLR start "T__28"
>+ public final void mT__28() throws RecognitionException {
> try {
>- int _type = T28;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:26:5: ( '~' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:26:7: '~'
>+ int _type = T__28;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:27:7: ( '~' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:27:9: '~'
> {
> match('~'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T28
>+ // $ANTLR end "T__28"
> 
>- // $ANTLR start T29
>- public final void mT29() throws RecognitionException {
>+ // $ANTLR start "T__29"
>+ public final void mT__29() throws RecognitionException {
> try {
>- int _type = T29;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:27:5: ( 'readOnly' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:27:7: 'readOnly'
>+ int _type = T__29;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:28:7: ( 'readOnly' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:28:9: 'readOnly'
> {
> match("readOnly"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T29
>+ // $ANTLR end "T__29"
> 
>- // $ANTLR start T30
>- public final void mT30() throws RecognitionException {
>+ // $ANTLR start "T__30"
>+ public final void mT__30() throws RecognitionException {
> try {
>- int _type = T30;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:28:5: ( 'union' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:28:7: 'union'
>+ int _type = T__30;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:29:7: ( 'union' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:29:9: 'union'
> {
> match("union"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T30
>+ // $ANTLR end "T__30"
> 
>- // $ANTLR start T31
>- public final void mT31() throws RecognitionException {
>+ // $ANTLR start "T__31"
>+ public final void mT__31() throws RecognitionException {
> try {
>- int _type = T31;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:29:5: ( 'ordered' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:29:7: 'ordered'
>+ int _type = T__31;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:30:7: ( 'ordered' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:30:9: 'ordered'
> {
> match("ordered"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T31
>+ // $ANTLR end "T__31"
> 
>- // $ANTLR start T32
>- public final void mT32() throws RecognitionException {
>+ // $ANTLR start "T__32"
>+ public final void mT__32() throws RecognitionException {
> try {
>- int _type = T32;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:30:5: ( 'unique' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:30:7: 'unique'
>+ int _type = T__32;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:31:7: ( 'unique' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:31:9: 'unique'
> {
> match("unique"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T32
>+ // $ANTLR end "T__32"
> 
>- // $ANTLR start RULE_UNLIMITEDLITERAL
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
> public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
> try {
> int _type = RULE_UNLIMITEDLITERAL;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
> int alt2=2;
> int LA2_0 = input.LA(1);
> 
>@@ -455,16 +505,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("909:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ new NoViableAltException("", 2, 0, input);
> 
> throw nvae;
> }
> switch (alt2) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:26: '0' .. '9' ( '0' .. '9' )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:26: '0' .. '9' ( '0' .. '9' )*
> {
> matchRange('0','9'); 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:35: ( '0' .. '9' )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:35: ( '0' .. '9' )*
> loop1:
> do {
> int alt1=2;
>@@ -477,7 +527,7 @@
> 
> switch (alt1) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:36: '0' .. '9'
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:36: '0' .. '9'
> 	 {
> 	 matchRange('0','9'); 
> 
>@@ -493,7 +543,7 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:47: '*'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:763:47: '*'
> {
> match('*'); 
> 
>@@ -505,21 +555,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_UNLIMITEDLITERAL
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:765:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:765:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:11: ( '^' )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:765:11: ( '^' )?
> int alt3=2;
> int LA3_0 = input.LA(1);
> 
>@@ -528,7 +580,7 @@
> }
> switch (alt3) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:11: '^'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:765:11: '^'
> {
> match('^'); 
> 
>@@ -542,12 +594,11 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:765:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop4:
> do {
> int alt4=2;
>@@ -567,10 +618,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -584,21 +634,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:913:10: ( ( '0' .. '9' )+ )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:913:12: ( '0' .. '9' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:12: ( '0' .. '9' )+
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:913:12: ( '0' .. '9' )+
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:12: ( '0' .. '9' )+
> int cnt5=0;
> loop5:
> do {
>@@ -612,7 +664,7 @@
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:913:13: '0' .. '9'
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:13: '0' .. '9'
> 	 {
> 	 matchRange('0','9'); 
> 
>@@ -631,21 +683,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>@@ -657,16 +711,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("915:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ new NoViableAltException("", 8, 0, input);
> 
> throw nvae;
> }
> switch (alt8) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop6:
> do {
> int alt6=3;
>@@ -675,41 +729,39 @@
> if ( (LA6_0=='\\') ) {
> alt6=1;
> }
>- else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFE')) ) {
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
> alt6=2;
> }
> 
> 
> switch (alt6) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -725,10 +777,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop7:
> do {
> int alt7=3;
>@@ -737,41 +789,39 @@
> if ( (LA7_0=='\\') ) {
> alt7=1;
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
> alt7=2;
> }
> 
> 
> switch (alt7) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:769:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -792,23 +842,25 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:917:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:917:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:771:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:771:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
> match("/*"); 
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:917:24: ( options {greedy=false; } : . )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:771:24: ( options {greedy=false; } : . )*
> loop9:
> do {
> int alt9=2;
>@@ -820,20 +872,20 @@
> if ( (LA9_1=='/') ) {
> alt9=2;
> }
>- else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFE')) ) {
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
> alt9=1;
> }
> 
> 
> }
>- else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFE')) ) {
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
> alt9=1;
> }
> 
> 
> switch (alt9) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:917:52: .
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:771:52: .
> 	 {
> 	 matchAny(); 
> 
>@@ -850,46 +902,47 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
> match("//"); 
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:24: (~ ( ( '\\n' | '\\r' ) ) )*
> loop10:
> do {
> int alt10=2;
> int LA10_0 = input.LA(1);
> 
>- if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFE')) ) {
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
> alt10=1;
> }
> 
> 
> switch (alt10) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:24: ~ ( ( '\\n' | '\\r' ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -900,7 +953,7 @@
> }
> } while (true);
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:40: ( ( '\\r' )? '\\n' )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:40: ( ( '\\r' )? '\\n' )?
> int alt12=2;
> int LA12_0 = input.LA(1);
> 
>@@ -909,9 +962,9 @@
> }
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:41: ( '\\r' )? '\\n'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:41: ( '\\r' )? '\\n'
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:41: ( '\\r' )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:41: ( '\\r' )?
> int alt11=2;
> int LA11_0 = input.LA(1);
> 
>@@ -920,7 +973,7 @@
> }
> switch (alt11) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:41: '\\r'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:41: '\\r'
> {
> match('\r'); 
> 
>@@ -939,21 +992,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:921:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:921:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:775:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:775:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:921:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:775:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> int cnt13=0;
> loop13:
> do {
>@@ -974,10 +1029,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -995,234 +1049,237 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:923:16: ( . )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:923:18: .
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:777:16: ( . )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:777:18: .
> {
> matchAny(); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:8: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt14=29;
> alt14 = dfa14.predict(input);
> switch (alt14) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:10: T12
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:10: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:14: T13
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:16: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:18: T14
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:22: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:22: T15
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:28: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:26: T16
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:34: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:30: T17
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:40: T__17
> {
>- mT17(); 
>+ mT__17(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:34: T18
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:46: T__18
> {
>- mT18(); 
>+ mT__18(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:38: T19
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:52: T__19
> {
>- mT19(); 
>+ mT__19(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:42: T20
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:58: T__20
> {
>- mT20(); 
>+ mT__20(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:46: T21
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:64: T__21
> {
>- mT21(); 
>+ mT__21(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:50: T22
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:70: T__22
> {
>- mT22(); 
>+ mT__22(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:54: T23
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:76: T__23
> {
>- mT23(); 
>+ mT__23(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:58: T24
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:82: T__24
> {
>- mT24(); 
>+ mT__24(); 
> 
> }
> break;
> case 14 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:62: T25
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:88: T__25
> {
>- mT25(); 
>+ mT__25(); 
> 
> }
> break;
> case 15 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:66: T26
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:94: T__26
> {
>- mT26(); 
>+ mT__26(); 
> 
> }
> break;
> case 16 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:70: T27
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:100: T__27
> {
>- mT27(); 
>+ mT__27(); 
> 
> }
> break;
> case 17 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:74: T28
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:106: T__28
> {
>- mT28(); 
>+ mT__28(); 
> 
> }
> break;
> case 18 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:78: T29
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:112: T__29
> {
>- mT29(); 
>+ mT__29(); 
> 
> }
> break;
> case 19 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:82: T30
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:118: T__30
> {
>- mT30(); 
>+ mT__30(); 
> 
> }
> break;
> case 20 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:86: T31
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:124: T__31
> {
>- mT31(); 
>+ mT__31(); 
> 
> }
> break;
> case 21 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:90: T32
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:130: T__32
> {
>- mT32(); 
>+ mT__32(); 
> 
> }
> break;
> case 22 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:94: RULE_UNLIMITEDLITERAL
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:136: RULE_UNLIMITEDLITERAL
> {
> mRULE_UNLIMITEDLITERAL(); 
> 
> }
> break;
> case 23 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:116: RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:158: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 24 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:124: RULE_INT
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:166: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 25 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:133: RULE_STRING
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:175: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 26 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:145: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:187: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 27 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:161: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:203: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 28 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:177: RULE_WS
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:219: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 29 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:185: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:227: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -1236,9 +1293,9 @@
> 
> protected DFA14 dfa14 = new DFA14(this);
> static final String DFA14_eotS =
>- "\1\uffff\1\35\1\37\1\32\1\uffff\1\32\4\uffff\2\50\5\uffff\2\50\1"+
>- "\61\1\uffff\1\32\1\uffff\2\32\16\uffff\1\50\1\uffff\1\50\5\uffff"+
>- "\2\50\1\uffff\1\61\2\uffff\17\50\1\112\4\50\1\117\1\uffff\3\50\1"+
>+ "\1\uffff\1\35\1\37\1\32\1\uffff\1\32\4\uffff\2\50\5\uffff\2\50"+
>+ "\1\61\1\uffff\1\32\1\uffff\2\32\16\uffff\1\50\1\uffff\1\50\5\uffff"+
>+ "\2\50\1\uffff\1\61\2\uffff\16\50\1\111\5\50\1\uffff\1\117\3\50\1"+
> "\123\1\uffff\1\124\1\50\1\126\2\uffff\1\127\2\uffff";
> static final String DFA14_eofS =
> "\130\uffff";
>@@ -1246,29 +1303,29 @@
> "\1\0\1\52\1\72\1\125\1\uffff\1\56\4\uffff\1\145\1\165\5\uffff\1"+
> "\156\1\162\1\60\1\uffff\1\101\1\uffff\2\0\16\uffff\1\141\1\uffff"+
> "\1\142\5\uffff\1\151\1\144\1\uffff\1\60\2\uffff\1\145\1\144\1\163"+
>- "\1\157\1\145\1\146\1\117\1\145\1\165\1\156\1\162\1\151\1\156\1\164"+
>- "\1\145\1\60\1\145\1\156\1\154\1\163\1\60\1\uffff\1\144\1\145\1\171"+
>- "\1\60\1\uffff\1\60\1\163\1\60\2\uffff\1\60\2\uffff";
>+ "\1\157\1\145\1\146\1\117\1\145\1\156\1\165\1\162\1\151\1\156\1\164"+
>+ "\1\60\2\145\1\156\1\154\1\163\1\uffff\1\60\1\144\1\145\1\171\1\60"+
>+ "\1\uffff\1\60\1\163\1\60\2\uffff\1\60\2\uffff";
> static final String DFA14_maxS =
>- "\1\ufffe\1\57\1\72\1\125\1\uffff\1\56\4\uffff\1\145\1\165\5\uffff"+
>- "\1\156\1\162\1\71\1\uffff\1\172\1\uffff\2\ufffe\16\uffff\1\144\1"+
>+ "\1\uffff\1\57\1\72\1\125\1\uffff\1\56\4\uffff\1\145\1\165\5\uffff"+
>+ "\1\156\1\162\1\71\1\uffff\1\172\1\uffff\2\uffff\16\uffff\1\144\1"+
> "\uffff\1\142\5\uffff\1\151\1\144\1\uffff\1\71\2\uffff\1\145\1\144"+
>- "\1\163\1\161\1\145\1\146\1\117\1\145\1\165\1\156\1\162\1\151\1\156"+
>- "\1\164\1\145\1\172\1\145\1\156\1\154\1\163\1\172\1\uffff\1\144\1"+
>- "\145\1\171\1\172\1\uffff\1\172\1\163\1\172\2\uffff\1\172\2\uffff";
>+ "\1\163\1\161\1\145\1\146\1\117\1\145\1\156\1\165\1\162\1\151\1\156"+
>+ "\1\164\1\172\2\145\1\156\1\154\1\163\1\uffff\1\172\1\144\1\145\1"+
>+ "\171\1\172\1\uffff\1\172\1\163\1\172\2\uffff\1\172\2\uffff";
> static final String DFA14_acceptS =
>- "\4\uffff\1\5\1\uffff\1\7\1\10\1\11\1\12\2\uffff\1\15\1\16\1\17\1"+
>- "\20\1\21\3\uffff\1\26\1\uffff\1\27\2\uffff\1\34\1\35\1\32\1\33\1"+
>- "\1\1\4\1\2\1\3\1\5\1\6\1\7\1\10\1\11\1\12\1\uffff\1\27\1\uffff\1"+
>- "\15\1\16\1\17\1\20\1\21\2\uffff\1\26\1\uffff\1\31\1\34\25\uffff"+
>- "\1\23\4\uffff\1\25\3\uffff\1\14\1\24\1\uffff\1\22\1\13";
>+ "\4\uffff\1\5\1\uffff\1\7\1\10\1\11\1\12\2\uffff\1\15\1\16\1\17"+
>+ "\1\20\1\21\3\uffff\1\26\1\uffff\1\27\2\uffff\1\34\1\35\1\32\1\33"+
>+ "\1\1\1\4\1\2\1\3\1\5\1\6\1\7\1\10\1\11\1\12\1\uffff\1\27\1\uffff"+
>+ "\1\15\1\16\1\17\1\20\1\21\2\uffff\1\26\1\uffff\1\31\1\34\24\uffff"+
>+ "\1\23\5\uffff\1\25\3\uffff\1\14\1\24\1\uffff\1\22\1\13";
> static final String DFA14_specialS =
>- "\130\uffff}>";
>+ "\1\1\26\uffff\1\0\1\2\77\uffff}>";
> static final String[] DFA14_transitionS = {
> "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\1\17\3\32\1\30\2"+
> "\32\1\24\1\15\1\10\1\16\1\5\1\1\12\23\1\2\1\32\1\3\1\14\3\32"+
> "\32\26\1\4\1\32\1\6\1\25\1\26\1\32\16\26\1\22\2\26\1\12\1\13"+
>- "\1\26\1\21\5\26\1\7\1\32\1\11\1\20\uff80\32",
>+ "\1\26\1\21\5\26\1\7\1\32\1\11\1\20\uff81\32",
> "\1\33\4\uffff\1\34",
> "\1\36",
> "\1\40",
>@@ -1291,8 +1348,8 @@
> "",
> "\32\50\4\uffff\1\50\1\uffff\32\50",
> "",
>- "\uffff\63",
>- "\uffff\63",
>+ "\0\63",
>+ "\0\63",
> "",
> "",
> "",
>@@ -1324,7 +1381,7 @@
> "\1\72",
> "\1\73",
> "\1\74",
>- "\1\76\1\uffff\1\75",
>+ "\1\75\1\uffff\1\76",
> "\1\77",
> "\1\100",
> "\1\101",
>@@ -1335,14 +1392,14 @@
> "\1\106",
> "\1\107",
> "\1\110",
>- "\1\111",
> "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
>+ "\1\112",
> "\1\113",
> "\1\114",
> "\1\115",
> "\1\116",
>- "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
> "",
>+ "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
> "\1\120",
> "\1\121",
> "\1\122",
>@@ -1388,7 +1445,95 @@
> this.transition = DFA14_transition;
> }
> public String getDescription() {
>- return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | 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 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_23 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA14_23>='\u0000' && LA14_23<='\uFFFF')) ) {s = 51;}
>+
>+ else s = 26;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA14_0=='/') ) {s = 1;}
>+
>+ else if ( (LA14_0==':') ) {s = 2;}
>+
>+ else if ( (LA14_0=='<') ) {s = 3;}
>+
>+ else if ( (LA14_0=='[') ) {s = 4;}
>+
>+ else if ( (LA14_0=='.') ) {s = 5;}
>+
>+ else if ( (LA14_0==']') ) {s = 6;}
>+
>+ else if ( (LA14_0=='{') ) {s = 7;}
>+
>+ else if ( (LA14_0==',') ) {s = 8;}
>+
>+ else if ( (LA14_0=='}') ) {s = 9;}
>+
>+ else if ( (LA14_0=='r') ) {s = 10;}
>+
>+ else if ( (LA14_0=='s') ) {s = 11;}
>+
>+ else if ( (LA14_0=='=') ) {s = 12;}
>+
>+ else if ( (LA14_0=='+') ) {s = 13;}
>+
>+ else if ( (LA14_0=='-') ) {s = 14;}
>+
>+ else if ( (LA14_0=='#') ) {s = 15;}
>+
>+ else if ( (LA14_0=='~') ) {s = 16;}
>+
>+ else if ( (LA14_0=='u') ) {s = 17;}
>+
>+ else if ( (LA14_0=='o') ) {s = 18;}
>+
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 19;}
>+
>+ else if ( (LA14_0=='*') ) {s = 20;}
>+
>+ else if ( (LA14_0=='^') ) {s = 21;}
>+
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='n')||(LA14_0>='p' && LA14_0<='q')||LA14_0=='t'||(LA14_0>='v' && LA14_0<='z')) ) {s = 22;}
>+
>+ else if ( (LA14_0=='\"') ) {s = 23;}
>+
>+ else if ( (LA14_0=='\'') ) {s = 24;}
>+
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 25;}
>+
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='$' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||LA14_0==';'||(LA14_0>='>' && LA14_0<='@')||LA14_0=='\\'||LA14_0=='`'||LA14_0=='|'||(LA14_0>='\u007F' && LA14_0<='\uFFFF')) ) {s = 26;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_24 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA14_24>='\u0000' && LA14_24<='\uFFFF')) ) {s = 51;}
>+
>+ else s = 26;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
> }
> }
> 
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens	(working copy)
>@@ -1,11 +1,32 @@
> RULE_ID=4
>-RULE_STRING=6
> RULE_UNLIMITEDLITERAL=5
>+T__29=29
>+T__28=28
>+T__27=27
>+T__26=26
>+T__25=25
>+T__24=24
>+T__23=23
>+T__22=22
> RULE_ANY_OTHER=11
>-RULE_INT=7
>-RULE_WS=10
>+T__21=21
>+T__20=20
> RULE_SL_COMMENT=9
> RULE_ML_COMMENT=8
>+T__30=30
>+T__19=19
>+T__31=31
>+RULE_STRING=6
>+T__32=32
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__14=14
>+T__13=13
>+RULE_INT=7
>+RULE_WS=10
> '..'=17
> 'ordered'=31
> '#'=27
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java	(working copy)
>@@ -1,10 +1,8 @@
> package org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -12,7 +10,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.property.editor.xtext.services.UmlPropertyGrammarAccess;
> 
> 
>@@ -28,38 +25,60 @@
> "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'/'", "':'", "'<Undefined>'", "'::'", "'['", "'..'", "']'", "'{'", "','", "'}'", "'redefines'", "'subsets'", "'='", "'+'", "'-'", "'#'", "'~'", "'readOnly'", "'union'", "'ordered'", "'unique'"
> };
> public static final int RULE_ID=4;
>- public static final int RULE_STRING=6;
> public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__29=29;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
> public static final int RULE_ANY_OTHER=11;
>- public static final int RULE_INT=7;
>- public static final int RULE_WS=10;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
> public static final int RULE_SL_COMMENT=9;
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=8;
>+ public static final int T__30=30;
>+ public static final int T__19=19;
>+ public static final int T__31=31;
>+ public static final int RULE_STRING=6;
>+ public static final int T__32=32;
>+ 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__17=17;
>+ 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=7;
>+ public static final int RULE_WS=10;
>+
>+ // delegates
>+ // delegators
>+
> 
> public InternalUmlPropertyParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlPropertyParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlPropertyParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g"; }
> 
> 
> 
> 	private UmlPropertyGrammarAccess grammarAccess;
> 	
>- public InternalUmlPropertyParser(TokenStream input, IAstFactory factory, UmlPropertyGrammarAccess grammarAccess) {
>+ public InternalUmlPropertyParser(TokenStream input, UmlPropertyGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -74,8 +93,8 @@
> 
> 
> 
>- // $ANTLR start entryRulePropertyRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:78:1: entryRulePropertyRule returns [EObject current=null] : iv_rulePropertyRule= rulePropertyRule EOF ;
>+ // $ANTLR start "entryRulePropertyRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:68:1: entryRulePropertyRule returns [EObject current=null] : iv_rulePropertyRule= rulePropertyRule EOF ;
> public final EObject entryRulePropertyRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -83,13 +102,14 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:79:2: (iv_rulePropertyRule= rulePropertyRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:80:2: iv_rulePropertyRule= rulePropertyRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:69:2: (iv_rulePropertyRule= rulePropertyRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:70:2: iv_rulePropertyRule= rulePropertyRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getPropertyRuleRule(), currentNode); 
>+ newCompositeNode(grammarAccess.getPropertyRuleRule()); 
> pushFollow(FOLLOW_rulePropertyRule_in_entryRulePropertyRule75);
> iv_rulePropertyRule=rulePropertyRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_rulePropertyRule; 
> match(input,EOF,FOLLOW_EOF_in_entryRulePropertyRule85); 
>@@ -106,16 +126,18 @@
> }
> return current;
> }
>- // $ANTLR end entryRulePropertyRule
>+ // $ANTLR end "entryRulePropertyRule"
> 
> 
>- // $ANTLR start rulePropertyRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:87:1: rulePropertyRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? ) ;
>+ // $ANTLR start "rulePropertyRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:77:1: rulePropertyRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? ) ;
> public final EObject rulePropertyRule() throws RecognitionException {
> EObject current = null;
> 
> Token lv_isDerived_1_0=null;
> Token lv_name_2_0=null;
>+ Token otherlv_3=null;
>+ Token otherlv_5=null;
> Enumerator lv_visibility_0_0 = null;
> 
> EObject lv_type_4_0 = null;
>@@ -127,44 +149,39 @@
> EObject lv_default_8_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:92:6: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:93:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:80:28: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:81:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:93:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:93:2: ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:81:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )? )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:81:2: ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_isDerived_1_0= '/' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_default_8_0= ruleDefaultValueRule ) )?
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:93:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:94:1: (lv_visibility_0_0= ruleVisibilityKind )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:81:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:82:1: (lv_visibility_0_0= ruleVisibilityKind )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:94:1: (lv_visibility_0_0= ruleVisibilityKind )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:95:3: lv_visibility_0_0= ruleVisibilityKind
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:82:1: (lv_visibility_0_0= ruleVisibilityKind )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:83:3: lv_visibility_0_0= ruleVisibilityKind
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 	 
> pushFollow(FOLLOW_ruleVisibilityKind_in_rulePropertyRule131);
> lv_visibility_0_0=ruleVisibilityKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"visibility",
>- 	 		lv_visibility_0_0, 
>- 	 		"VisibilityKind", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"visibility",
>+ 		lv_visibility_0_0, 
>+ 		"VisibilityKind");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -172,7 +189,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:117:2: ( (lv_isDerived_1_0= '/' ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:99:2: ( (lv_isDerived_1_0= '/' ) )?
> int alt1=2;
> int LA1_0 = input.LA(1);
> 
>@@ -181,27 +198,20 @@
> }
> switch (alt1) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:118:1: (lv_isDerived_1_0= '/' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:100:1: (lv_isDerived_1_0= '/' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:118:1: (lv_isDerived_1_0= '/' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:119:3: lv_isDerived_1_0= '/'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:100:1: (lv_isDerived_1_0= '/' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:101:3: lv_isDerived_1_0= '/'
> {
>- lv_isDerived_1_0=(Token)input.LT(1);
>- match(input,12,FOLLOW_12_in_rulePropertyRule149); 
>+ lv_isDerived_1_0=(Token)match(input,12,FOLLOW_12_in_rulePropertyRule149); 
> 
>- createLeafNode(grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0(), "isDerived"); 
>+ newLeafNode(lv_isDerived_1_0, grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0());
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 
>- 	 try {
>- 	 		set(current, "isDerived", lv_isDerived_1_0, "/", lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(current, "isDerived", lv_isDerived_1_0, "/");
> 	 
> 
> }
>@@ -212,32 +222,25 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:138:3: ( (lv_name_2_0= RULE_ID ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:139:1: (lv_name_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:114:3: ( (lv_name_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:115:1: (lv_name_2_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:139:1: (lv_name_2_0= RULE_ID )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:140:3: lv_name_2_0= RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:115:1: (lv_name_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:116:3: lv_name_2_0= RULE_ID
> {
>- lv_name_2_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePropertyRule180); 
>+ lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePropertyRule180); 
> 
>- 			createLeafNode(grammarAccess.getPropertyRuleAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
>+ 			newLeafNode(lv_name_2_0, grammarAccess.getPropertyRuleAccess().getNameIDTerminalRuleCall_2_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"name",
>- 	 		lv_name_2_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"name",
>+ 		lv_name_2_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -245,11 +248,11 @@
> 
> }
> 
>- match(input,13,FOLLOW_13_in_rulePropertyRule195); 
>+ otherlv_3=(Token)match(input,13,FOLLOW_13_in_rulePropertyRule197); 
> 
>- createLeafNode(grammarAccess.getPropertyRuleAccess().getColonKeyword_3(), null); 
>+ 	newLeafNode(otherlv_3, grammarAccess.getPropertyRuleAccess().getColonKeyword_3());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:166:1: ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:136:1: ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' )
> int alt2=2;
> int LA2_0 = input.LA(1);
> 
>@@ -261,43 +264,38 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("166:1: ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' )", 2, 0, input);
>+ new NoViableAltException("", 2, 0, input);
> 
> throw nvae;
> }
> switch (alt2) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:166:2: ( (lv_type_4_0= ruleTypeRule ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:136:2: ( (lv_type_4_0= ruleTypeRule ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:166:2: ( (lv_type_4_0= ruleTypeRule ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:167:1: (lv_type_4_0= ruleTypeRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:136:2: ( (lv_type_4_0= ruleTypeRule ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:137:1: (lv_type_4_0= ruleTypeRule )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:167:1: (lv_type_4_0= ruleTypeRule )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:168:3: lv_type_4_0= ruleTypeRule
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:137:1: (lv_type_4_0= ruleTypeRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:138:3: lv_type_4_0= ruleTypeRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
> 	 
>- pushFollow(FOLLOW_ruleTypeRule_in_rulePropertyRule217);
>+ pushFollow(FOLLOW_ruleTypeRule_in_rulePropertyRule219);
> lv_type_4_0=ruleTypeRule();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"type",
>- 	 		lv_type_4_0, 
>- 	 		"TypeRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"type",
>+ 		lv_type_4_0, 
>+ 		"TypeRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -309,11 +307,11 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:191:7: '<Undefined>'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:155:7: otherlv_5= '<Undefined>'
> {
>- match(input,14,FOLLOW_14_in_rulePropertyRule233); 
>+ otherlv_5=(Token)match(input,14,FOLLOW_14_in_rulePropertyRule237); 
> 
>- createLeafNode(grammarAccess.getPropertyRuleAccess().getUndefinedKeyword_4_1(), null); 
>+ 	newLeafNode(otherlv_5, grammarAccess.getPropertyRuleAccess().getUndefinedKeyword_4_1());
> 
> 
> }
>@@ -321,7 +319,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:195:2: ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:159:2: ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )?
> int alt3=2;
> int LA3_0 = input.LA(1);
> 
>@@ -330,34 +328,29 @@
> }
> switch (alt3) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:196:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:160:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:196:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:197:3: lv_multiplicity_6_0= ruleMultiplicityRule
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:160:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:161:3: lv_multiplicity_6_0= ruleMultiplicityRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
> 	 
>- pushFollow(FOLLOW_ruleMultiplicityRule_in_rulePropertyRule255);
>+ pushFollow(FOLLOW_ruleMultiplicityRule_in_rulePropertyRule259);
> lv_multiplicity_6_0=ruleMultiplicityRule();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"multiplicity",
>- 	 		lv_multiplicity_6_0, 
>- 	 		"MultiplicityRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"multiplicity",
>+ 		lv_multiplicity_6_0, 
>+ 		"MultiplicityRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -368,7 +361,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:219:3: ( (lv_modifiers_7_0= ruleModifiersRule ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:177:3: ( (lv_modifiers_7_0= ruleModifiersRule ) )?
> int alt4=2;
> int LA4_0 = input.LA(1);
> 
>@@ -377,34 +370,29 @@
> }
> switch (alt4) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:220:1: (lv_modifiers_7_0= ruleModifiersRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:178:1: (lv_modifiers_7_0= ruleModifiersRule )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:220:1: (lv_modifiers_7_0= ruleModifiersRule )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:221:3: lv_modifiers_7_0= ruleModifiersRule
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:178:1: (lv_modifiers_7_0= ruleModifiersRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:179:3: lv_modifiers_7_0= ruleModifiersRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
> 	 
>- pushFollow(FOLLOW_ruleModifiersRule_in_rulePropertyRule277);
>+ pushFollow(FOLLOW_ruleModifiersRule_in_rulePropertyRule281);
> lv_modifiers_7_0=ruleModifiersRule();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"modifiers",
>- 	 		lv_modifiers_7_0, 
>- 	 		"ModifiersRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"modifiers",
>+ 		lv_modifiers_7_0, 
>+ 		"ModifiersRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -415,7 +403,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:243:3: ( (lv_default_8_0= ruleDefaultValueRule ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:195:3: ( (lv_default_8_0= ruleDefaultValueRule ) )?
> int alt5=2;
> int LA5_0 = input.LA(1);
> 
>@@ -424,34 +412,29 @@
> }
> switch (alt5) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:244:1: (lv_default_8_0= ruleDefaultValueRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:196:1: (lv_default_8_0= ruleDefaultValueRule )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:244:1: (lv_default_8_0= ruleDefaultValueRule )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:245:3: lv_default_8_0= ruleDefaultValueRule
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:196:1: (lv_default_8_0= ruleDefaultValueRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:197:3: lv_default_8_0= ruleDefaultValueRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); 
> 	 
>- pushFollow(FOLLOW_ruleDefaultValueRule_in_rulePropertyRule299);
>+ pushFollow(FOLLOW_ruleDefaultValueRule_in_rulePropertyRule303);
> lv_default_8_0=ruleDefaultValueRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getPropertyRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"default",
>- 	 		lv_default_8_0, 
>- 	 		"DefaultValueRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getPropertyRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"default",
>+ 		lv_default_8_0, 
>+ 		"DefaultValueRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -468,9 +451,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -481,11 +462,11 @@
> }
> return current;
> }
>- // $ANTLR end rulePropertyRule
>+ // $ANTLR end "rulePropertyRule"
> 
> 
>- // $ANTLR start entryRuleTypeRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:275:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
>+ // $ANTLR start "entryRuleTypeRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:221:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
> public final EObject entryRuleTypeRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -493,16 +474,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:276:2: (iv_ruleTypeRule= ruleTypeRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:277:2: iv_ruleTypeRule= ruleTypeRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:222:2: (iv_ruleTypeRule= ruleTypeRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:223:2: iv_ruleTypeRule= ruleTypeRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule336);
>+ newCompositeNode(grammarAccess.getTypeRuleRule()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule340);
> iv_ruleTypeRule=ruleTypeRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleTypeRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule346); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule350); 
> 
> }
> 
>@@ -516,27 +498,28 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleTypeRule
>+ // $ANTLR end "entryRuleTypeRule"
> 
> 
>- // $ANTLR start ruleTypeRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:284:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleTypeRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:230:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) ;
> public final EObject ruleTypeRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_1=null;
> EObject lv_path_0_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:289:6: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:290:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:233:28: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:234:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:290:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:290:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:234:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:234:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:290:2: ( (lv_path_0_0= ruleQualifiedName ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:234:2: ( (lv_path_0_0= ruleQualifiedName ) )?
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -549,34 +532,29 @@
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:291:1: (lv_path_0_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:235:1: (lv_path_0_0= ruleQualifiedName )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:291:1: (lv_path_0_0= ruleQualifiedName )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:292:3: lv_path_0_0= ruleQualifiedName
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:235:1: (lv_path_0_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:236:3: lv_path_0_0= ruleQualifiedName
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 	 
>- pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule392);
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule396);
> lv_path_0_0=ruleQualifiedName();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getTypeRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"path",
>- 	 		lv_path_0_0, 
>- 	 		"QualifiedName", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -587,21 +565,20 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:314:3: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:315:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:252:3: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:253:1: (otherlv_1= RULE_ID )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:315:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:316:3: RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:253:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:254:3: otherlv_1= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getTypeRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRule411); 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRule417); 
> 
>- 		createLeafNode(grammarAccess.getTypeRuleAccess().getTypeClassifierCrossReference_1_0(), "type"); 
>+ 		newLeafNode(otherlv_1, grammarAccess.getTypeRuleAccess().getTypeClassifierCrossReference_1_0()); 
> 	
> 
> }
>@@ -615,9 +592,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -628,11 +603,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleTypeRule
>+ // $ANTLR end "ruleTypeRule"
> 
> 
>- // $ANTLR start entryRuleQualifiedName
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:336:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:273:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
> public final EObject entryRuleQualifiedName() throws RecognitionException {
> EObject current = null;
> 
>@@ -640,16 +615,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:337:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:338:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:274:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:275:2: iv_ruleQualifiedName= ruleQualifiedName EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); 
>- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName447);
>+ newCompositeNode(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName453);
> iv_ruleQualifiedName=ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleQualifiedName; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName457); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName463); 
> 
> }
> 
>@@ -663,41 +639,42 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleQualifiedName
>+ // $ANTLR end "entryRuleQualifiedName"
> 
> 
>- // $ANTLR start ruleQualifiedName
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:345:1: ruleQualifiedName returns [EObject current=null] : ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ;
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:282: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;
> 
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
> EObject lv_remaining_2_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:350:6: ( ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:351:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:285:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:286:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:351:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:351:2: ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:286:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:286:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:351:2: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:352:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:286:2: ( (otherlv_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:287:1: (otherlv_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:352:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:353:3: RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:287:1: (otherlv_0= RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:288:3: otherlv_0= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName500); 
>+ otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName508); 
> 
>- 		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+ 		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	
> 
> }
>@@ -705,11 +682,11 @@
> 
> }
> 
>- match(input,15,FOLLOW_15_in_ruleQualifiedName510); 
>+ otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleQualifiedName520); 
> 
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:369:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:303:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
> int alt7=2;
> int LA7_0 = input.LA(1);
> 
>@@ -722,34 +699,29 @@
> }
> switch (alt7) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:370:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:304:1: (lv_remaining_2_0= ruleQualifiedName )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:370:1: (lv_remaining_2_0= ruleQualifiedName )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:371:3: lv_remaining_2_0= ruleQualifiedName
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:304:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:305:3: lv_remaining_2_0= ruleQualifiedName
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 
>- pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName531);
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName541);
> lv_remaining_2_0=ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"remaining",
>- 	 		lv_remaining_2_0, 
>- 	 		"QualifiedName", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -766,9 +738,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -779,11 +749,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleQualifiedName
>+ // $ANTLR end "ruleQualifiedName"
> 
> 
>- // $ANTLR start entryRuleMultiplicityRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:401:1: entryRuleMultiplicityRule returns [EObject current=null] : iv_ruleMultiplicityRule= ruleMultiplicityRule EOF ;
>+ // $ANTLR start "entryRuleMultiplicityRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:329:1: entryRuleMultiplicityRule returns [EObject current=null] : iv_ruleMultiplicityRule= ruleMultiplicityRule EOF ;
> public final EObject entryRuleMultiplicityRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -791,16 +761,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:402:2: (iv_ruleMultiplicityRule= ruleMultiplicityRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:403:2: iv_ruleMultiplicityRule= ruleMultiplicityRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:330:2: (iv_ruleMultiplicityRule= ruleMultiplicityRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:331:2: iv_ruleMultiplicityRule= ruleMultiplicityRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule568);
>+ newCompositeNode(grammarAccess.getMultiplicityRuleRule()); 
>+ pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule578);
> iv_ruleMultiplicityRule=ruleMultiplicityRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleMultiplicityRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule578); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule588); 
> 
> }
> 
>@@ -814,61 +785,59 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleMultiplicityRule
>+ // $ANTLR end "entryRuleMultiplicityRule"
> 
> 
>- // $ANTLR start ruleMultiplicityRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:410:1: ruleMultiplicityRule returns [EObject current=null] : ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' ) ;
>+ // $ANTLR start "ruleMultiplicityRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:338:1: ruleMultiplicityRule returns [EObject current=null] : (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' ) ;
> public final EObject ruleMultiplicityRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
>+ Token otherlv_2=null;
>+ Token otherlv_4=null;
> EObject lv_bounds_1_0 = null;
> 
> EObject lv_bounds_3_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:415:6: ( ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:416:1: ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:341:28: ( (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:342:1: (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:416:1: ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:416:3: '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:342:1: (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:342:3: otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']'
> {
>- match(input,16,FOLLOW_16_in_ruleMultiplicityRule613); 
>+ otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleMultiplicityRule625); 
> 
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:420:1: ( (lv_bounds_1_0= ruleBoundSpecification ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:421:1: (lv_bounds_1_0= ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:346:1: ( (lv_bounds_1_0= ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:347:1: (lv_bounds_1_0= ruleBoundSpecification )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:421:1: (lv_bounds_1_0= ruleBoundSpecification )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:422:3: lv_bounds_1_0= ruleBoundSpecification
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:347:1: (lv_bounds_1_0= ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:348:3: lv_bounds_1_0= ruleBoundSpecification
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule634);
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule646);
> lv_bounds_1_0=ruleBoundSpecification();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
> 	 }
>- 	 try {
>- 	 		add(
>- 	 			current, 
>- 	 			"bounds",
>- 	 		lv_bounds_1_0, 
>- 	 		"BoundSpecification", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			current, 
>+ 			"bounds",
>+ 		lv_bounds_1_0, 
>+ 		"BoundSpecification");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -876,7 +845,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:444:2: ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )?
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:364:2: (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )?
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>@@ -885,41 +854,36 @@
> }
> switch (alt8) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:444:4: '..' ( (lv_bounds_3_0= ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:364:4: otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) )
> {
>- match(input,17,FOLLOW_17_in_ruleMultiplicityRule645); 
>+ otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleMultiplicityRule659); 
> 
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:448:1: ( (lv_bounds_3_0= ruleBoundSpecification ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:449:1: (lv_bounds_3_0= ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:368:1: ( (lv_bounds_3_0= ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:369:1: (lv_bounds_3_0= ruleBoundSpecification )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:449:1: (lv_bounds_3_0= ruleBoundSpecification )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:450:3: lv_bounds_3_0= ruleBoundSpecification
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:369:1: (lv_bounds_3_0= ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:370:3: lv_bounds_3_0= ruleBoundSpecification
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule666);
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule680);
> lv_bounds_3_0=ruleBoundSpecification();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		add(
>- 	 			current, 
>- 	 			"bounds",
>- 	 		lv_bounds_3_0, 
>- 	 		"BoundSpecification", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			current, 
>+ 			"bounds",
>+ 		lv_bounds_3_0, 
>+ 		"BoundSpecification");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -933,9 +897,9 @@
> 
> }
> 
>- match(input,18,FOLLOW_18_in_ruleMultiplicityRule678); 
>+ otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleMultiplicityRule694); 
> 
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3());
> 
> 
> }
>@@ -943,9 +907,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -956,11 +918,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleMultiplicityRule
>+ // $ANTLR end "ruleMultiplicityRule"
> 
> 
>- // $ANTLR start entryRuleBoundSpecification
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:484:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:398:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
> public final EObject entryRuleBoundSpecification() throws RecognitionException {
> EObject current = null;
> 
>@@ -968,16 +930,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:485:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:486:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:399:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:400:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode); 
>- pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification714);
>+ newCompositeNode(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification730);
> iv_ruleBoundSpecification=ruleBoundSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleBoundSpecification; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification724); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification740); 
> 
> }
> 
>@@ -991,48 +954,41 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleBoundSpecification
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
> 
>- // $ANTLR start ruleBoundSpecification
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:493:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:407:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
> public final EObject ruleBoundSpecification() throws RecognitionException {
> EObject current = null;
> 
> Token lv_value_0_0=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:498:6: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:499:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:410:28: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:411:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:499:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:500:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:411:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:412:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:500:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:501:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:412:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:413:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
> {
>- lv_value_0_0=(Token)input.LT(1);
>- match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification765); 
>+ lv_value_0_0=(Token)match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification781); 
> 
>- 			createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value"); 
>+ 			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getBoundSpecificationRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"value",
>- 	 		lv_value_0_0, 
>- 	 		"UnlimitedLiteral", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
> 	 
> 
> }
>@@ -1043,9 +999,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1056,11 +1010,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleBoundSpecification
>+ // $ANTLR end "ruleBoundSpecification"
> 
> 
>- // $ANTLR start entryRuleModifiersRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:531:1: entryRuleModifiersRule returns [EObject current=null] : iv_ruleModifiersRule= ruleModifiersRule EOF ;
>+ // $ANTLR start "entryRuleModifiersRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:437:1: entryRuleModifiersRule returns [EObject current=null] : iv_ruleModifiersRule= ruleModifiersRule EOF ;
> public final EObject entryRuleModifiersRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1068,16 +1022,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:532:2: (iv_ruleModifiersRule= ruleModifiersRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:533:2: iv_ruleModifiersRule= ruleModifiersRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:438:2: (iv_ruleModifiersRule= ruleModifiersRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:439:2: iv_ruleModifiersRule= ruleModifiersRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getModifiersRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule805);
>+ newCompositeNode(grammarAccess.getModifiersRuleRule()); 
>+ pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule821);
> iv_ruleModifiersRule=ruleModifiersRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleModifiersRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule815); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule831); 
> 
> }
> 
>@@ -1091,61 +1046,59 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleModifiersRule
>+ // $ANTLR end "entryRuleModifiersRule"
> 
> 
>- // $ANTLR start ruleModifiersRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:540:1: ruleModifiersRule returns [EObject current=null] : ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' ) ;
>+ // $ANTLR start "ruleModifiersRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:446:1: ruleModifiersRule returns [EObject current=null] : (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' ) ;
> public final EObject ruleModifiersRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
>+ Token otherlv_2=null;
>+ Token otherlv_4=null;
> EObject lv_values_1_0 = null;
> 
> EObject lv_values_3_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:545:6: ( ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:546:1: ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:449:28: ( (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:450:1: (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:546:1: ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:546:3: '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:450:1: (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:450:3: otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}'
> {
>- match(input,19,FOLLOW_19_in_ruleModifiersRule850); 
>+ otherlv_0=(Token)match(input,19,FOLLOW_19_in_ruleModifiersRule868); 
> 
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:550:1: ( (lv_values_1_0= ruleModifierSpecification ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:551:1: (lv_values_1_0= ruleModifierSpecification )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:454:1: ( (lv_values_1_0= ruleModifierSpecification ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:455:1: (lv_values_1_0= ruleModifierSpecification )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:551:1: (lv_values_1_0= ruleModifierSpecification )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:552:3: lv_values_1_0= ruleModifierSpecification
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:455:1: (lv_values_1_0= ruleModifierSpecification )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:456:3: lv_values_1_0= ruleModifierSpecification
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule871);
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule889);
> lv_values_1_0=ruleModifierSpecification();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
> 	 }
>- 	 try {
>- 	 		add(
>- 	 			current, 
>- 	 			"values",
>- 	 		lv_values_1_0, 
>- 	 		"ModifierSpecification", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			current, 
>+ 			"values",
>+ 		lv_values_1_0, 
>+ 		"ModifierSpecification");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1153,7 +1106,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:574:2: ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )*
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:472:2: (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )*
> loop9:
> do {
> int alt9=2;
>@@ -1166,41 +1119,36 @@
> 
> switch (alt9) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:574:4: ',' ( (lv_values_3_0= ruleModifierSpecification ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:472:4: otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) )
> 	 {
>- 	 match(input,20,FOLLOW_20_in_ruleModifiersRule882); 
>+ 	 otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleModifiersRule902); 
> 
>- 	 createLeafNode(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0(), null); 
>+ 	 	newLeafNode(otherlv_2, grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0());
> 	 
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:578:1: ( (lv_values_3_0= ruleModifierSpecification ) )
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:579:1: (lv_values_3_0= ruleModifierSpecification )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:476:1: ( (lv_values_3_0= ruleModifierSpecification ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:477:1: (lv_values_3_0= ruleModifierSpecification )
> 	 {
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:579:1: (lv_values_3_0= ruleModifierSpecification )
>- 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:580:3: lv_values_3_0= ruleModifierSpecification
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:477:1: (lv_values_3_0= ruleModifierSpecification )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:478:3: lv_values_3_0= ruleModifierSpecification
> 	 {
> 	 
>- 	 	 currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0(), currentNode); 
>+ 	 	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
> 	 	 
>- 	 pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule903);
>+ 	 pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule923);
> 	 lv_values_3_0=ruleModifierSpecification();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 	 if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 	 current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
> 	 	 }
>- 	 	 try {
>- 	 	 		add(
>- 	 	 			current, 
>- 	 	 			"values",
>- 	 	 		lv_values_3_0, 
>- 	 	 		"ModifierSpecification", 
>- 	 	 		currentNode);
>- 	 	 } catch (ValueConverterException vce) {
>- 	 				handleValueConverterException(vce);
>- 	 	 }
>- 	 	 currentNode = currentNode.getParent();
>+ 	 		add(
>+ 	 			current, 
>+ 	 			"values",
>+ 	 		lv_values_3_0, 
>+ 	 		"ModifierSpecification");
>+ 	 	 afterParserOrEnumRuleCall();
> 	 	 
> 
> 	 }
>@@ -1217,9 +1165,9 @@
> }
> } while (true);
> 
>- match(input,21,FOLLOW_21_in_ruleModifiersRule915); 
>+ otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleModifiersRule937); 
> 
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3());
> 
> 
> }
>@@ -1227,9 +1175,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1240,11 +1186,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleModifiersRule
>+ // $ANTLR end "ruleModifiersRule"
> 
> 
>- // $ANTLR start entryRuleModifierSpecification
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:614:1: entryRuleModifierSpecification returns [EObject current=null] : iv_ruleModifierSpecification= ruleModifierSpecification EOF ;
>+ // $ANTLR start "entryRuleModifierSpecification"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:506:1: entryRuleModifierSpecification returns [EObject current=null] : iv_ruleModifierSpecification= ruleModifierSpecification EOF ;
> public final EObject entryRuleModifierSpecification() throws RecognitionException {
> EObject current = null;
> 
>@@ -1252,16 +1198,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:615:2: (iv_ruleModifierSpecification= ruleModifierSpecification EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:616:2: iv_ruleModifierSpecification= ruleModifierSpecification EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:507:2: (iv_ruleModifierSpecification= ruleModifierSpecification EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:508:2: iv_ruleModifierSpecification= ruleModifierSpecification EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getModifierSpecificationRule(), currentNode); 
>- pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification951);
>+ newCompositeNode(grammarAccess.getModifierSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification973);
> iv_ruleModifierSpecification=ruleModifierSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleModifierSpecification; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification961); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification983); 
> 
> }
> 
>@@ -1275,11 +1222,11 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleModifierSpecification
>+ // $ANTLR end "entryRuleModifierSpecification"
> 
> 
>- // $ANTLR start ruleModifierSpecification
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:623:1: ruleModifierSpecification returns [EObject current=null] : ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) ) ;
>+ // $ANTLR start "ruleModifierSpecification"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:515:1: ruleModifierSpecification returns [EObject current=null] : ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) ) ;
> public final EObject ruleModifierSpecification() throws RecognitionException {
> EObject current = null;
> 
>@@ -1290,13 +1237,13 @@
> EObject lv_subsets_2_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:628:6: ( ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:629:1: ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:518:28: ( ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:519:1: ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:629:1: ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:519:1: ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) )
> int alt10=3;
> switch ( input.LA(1) ) {
> case 29:
>@@ -1319,44 +1266,39 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("629:1: ( ( (lv_value_0_0= ruleModifierKind ) ) | ( (lv_redefines_1_0= ruleRedefinesRule ) ) | ( (lv_subsets_2_0= ruleSubsetsRule ) ) )", 10, 0, input);
>+ new NoViableAltException("", 10, 0, input);
> 
> throw nvae;
> }
> 
> switch (alt10) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:629:2: ( (lv_value_0_0= ruleModifierKind ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:519:2: ( (lv_value_0_0= ruleModifierKind ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:629:2: ( (lv_value_0_0= ruleModifierKind ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:630:1: (lv_value_0_0= ruleModifierKind )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:519:2: ( (lv_value_0_0= ruleModifierKind ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:520:1: (lv_value_0_0= ruleModifierKind )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:630:1: (lv_value_0_0= ruleModifierKind )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:631:3: lv_value_0_0= ruleModifierKind
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:520:1: (lv_value_0_0= ruleModifierKind )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:521:3: lv_value_0_0= ruleModifierKind
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); 
> 	 
>- pushFollow(FOLLOW_ruleModifierKind_in_ruleModifierSpecification1007);
>+ pushFollow(FOLLOW_ruleModifierKind_in_ruleModifierSpecification1029);
> lv_value_0_0=ruleModifierKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"value",
>- 	 		lv_value_0_0, 
>- 	 		"ModifierKind", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"ModifierKind");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1368,37 +1310,32 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:654:6: ( (lv_redefines_1_0= ruleRedefinesRule ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:538:6: ( (lv_redefines_1_0= ruleRedefinesRule ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:654:6: ( (lv_redefines_1_0= ruleRedefinesRule ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:655:1: (lv_redefines_1_0= ruleRedefinesRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:538:6: ( (lv_redefines_1_0= ruleRedefinesRule ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:539:1: (lv_redefines_1_0= ruleRedefinesRule )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:655:1: (lv_redefines_1_0= ruleRedefinesRule )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:656:3: lv_redefines_1_0= ruleRedefinesRule
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:539:1: (lv_redefines_1_0= ruleRedefinesRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:540:3: lv_redefines_1_0= ruleRedefinesRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleRedefinesRule_in_ruleModifierSpecification1034);
>+ pushFollow(FOLLOW_ruleRedefinesRule_in_ruleModifierSpecification1056);
> lv_redefines_1_0=ruleRedefinesRule();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"redefines",
>- 	 		lv_redefines_1_0, 
>- 	 		"RedefinesRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"redefines",
>+ 		lv_redefines_1_0, 
>+ 		"RedefinesRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1410,37 +1347,32 @@
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:679:6: ( (lv_subsets_2_0= ruleSubsetsRule ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:557:6: ( (lv_subsets_2_0= ruleSubsetsRule ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:679:6: ( (lv_subsets_2_0= ruleSubsetsRule ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:680:1: (lv_subsets_2_0= ruleSubsetsRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:557:6: ( (lv_subsets_2_0= ruleSubsetsRule ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:558:1: (lv_subsets_2_0= ruleSubsetsRule )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:680:1: (lv_subsets_2_0= ruleSubsetsRule )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:681:3: lv_subsets_2_0= ruleSubsetsRule
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:558:1: (lv_subsets_2_0= ruleSubsetsRule )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:559:3: lv_subsets_2_0= ruleSubsetsRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); 
> 	 
>- pushFollow(FOLLOW_ruleSubsetsRule_in_ruleModifierSpecification1061);
>+ pushFollow(FOLLOW_ruleSubsetsRule_in_ruleModifierSpecification1083);
> lv_subsets_2_0=ruleSubsetsRule();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"subsets",
>- 	 		lv_subsets_2_0, 
>- 	 		"SubsetsRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"subsets",
>+ 		lv_subsets_2_0, 
>+ 		"SubsetsRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1457,9 +1389,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1470,11 +1400,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleModifierSpecification
>+ // $ANTLR end "ruleModifierSpecification"
> 
> 
>- // $ANTLR start entryRuleRedefinesRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:711:1: entryRuleRedefinesRule returns [EObject current=null] : iv_ruleRedefinesRule= ruleRedefinesRule EOF ;
>+ // $ANTLR start "entryRuleRedefinesRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:583:1: entryRuleRedefinesRule returns [EObject current=null] : iv_ruleRedefinesRule= ruleRedefinesRule EOF ;
> public final EObject entryRuleRedefinesRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1482,16 +1412,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:2: (iv_ruleRedefinesRule= ruleRedefinesRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:713:2: iv_ruleRedefinesRule= ruleRedefinesRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:584:2: (iv_ruleRedefinesRule= ruleRedefinesRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:585:2: iv_ruleRedefinesRule= ruleRedefinesRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getRedefinesRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule1097);
>+ newCompositeNode(grammarAccess.getRedefinesRuleRule()); 
>+ pushFollow(FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule1119);
> iv_ruleRedefinesRule=ruleRedefinesRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleRedefinesRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleRedefinesRule1107); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleRedefinesRule1129); 
> 
> }
> 
>@@ -1505,42 +1436,44 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleRedefinesRule
>+ // $ANTLR end "entryRuleRedefinesRule"
> 
> 
>- // $ANTLR start ruleRedefinesRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:720:1: ruleRedefinesRule returns [EObject current=null] : ( 'redefines' ( ( RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleRedefinesRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:592:1: ruleRedefinesRule returns [EObject current=null] : (otherlv_0= 'redefines' ( (otherlv_1= RULE_ID ) ) ) ;
> public final EObject ruleRedefinesRule() throws RecognitionException {
> EObject current = null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:725:6: ( ( 'redefines' ( ( RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:726:1: ( 'redefines' ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:595:28: ( (otherlv_0= 'redefines' ( (otherlv_1= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:596:1: (otherlv_0= 'redefines' ( (otherlv_1= RULE_ID ) ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:726:1: ( 'redefines' ( ( RULE_ID ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:726:3: 'redefines' ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:596:1: (otherlv_0= 'redefines' ( (otherlv_1= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:596:3: otherlv_0= 'redefines' ( (otherlv_1= RULE_ID ) )
> {
>- match(input,22,FOLLOW_22_in_ruleRedefinesRule1142); 
>+ otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleRedefinesRule1166); 
> 
>- createLeafNode(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:730:1: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:731:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:600:1: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:601:1: (otherlv_1= RULE_ID )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:731:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:732:3: RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:601:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:602:3: otherlv_1= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getRedefinesRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getRedefinesRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRedefinesRule1160); 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRedefinesRule1186); 
> 
>- 		createLeafNode(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
>+ 		newLeafNode(otherlv_1, grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0()); 
> 	
> 
> }
>@@ -1554,9 +1487,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1567,11 +1498,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleRedefinesRule
>+ // $ANTLR end "ruleRedefinesRule"
> 
> 
>- // $ANTLR start entryRuleSubsetsRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:752:1: entryRuleSubsetsRule returns [EObject current=null] : iv_ruleSubsetsRule= ruleSubsetsRule EOF ;
>+ // $ANTLR start "entryRuleSubsetsRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:621:1: entryRuleSubsetsRule returns [EObject current=null] : iv_ruleSubsetsRule= ruleSubsetsRule EOF ;
> public final EObject entryRuleSubsetsRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1579,16 +1510,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:753:2: (iv_ruleSubsetsRule= ruleSubsetsRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:754:2: iv_ruleSubsetsRule= ruleSubsetsRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:622:2: (iv_ruleSubsetsRule= ruleSubsetsRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:623:2: iv_ruleSubsetsRule= ruleSubsetsRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getSubsetsRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule1196);
>+ newCompositeNode(grammarAccess.getSubsetsRuleRule()); 
>+ pushFollow(FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule1222);
> iv_ruleSubsetsRule=ruleSubsetsRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleSubsetsRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleSubsetsRule1206); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleSubsetsRule1232); 
> 
> }
> 
>@@ -1602,42 +1534,44 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleSubsetsRule
>+ // $ANTLR end "entryRuleSubsetsRule"
> 
> 
>- // $ANTLR start ruleSubsetsRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:761:1: ruleSubsetsRule returns [EObject current=null] : ( 'subsets' ( ( RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleSubsetsRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:630:1: ruleSubsetsRule returns [EObject current=null] : (otherlv_0= 'subsets' ( (otherlv_1= RULE_ID ) ) ) ;
> public final EObject ruleSubsetsRule() throws RecognitionException {
> EObject current = null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:766:6: ( ( 'subsets' ( ( RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:1: ( 'subsets' ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:633:28: ( (otherlv_0= 'subsets' ( (otherlv_1= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:634:1: (otherlv_0= 'subsets' ( (otherlv_1= RULE_ID ) ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:1: ( 'subsets' ( ( RULE_ID ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:767:3: 'subsets' ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:634:1: (otherlv_0= 'subsets' ( (otherlv_1= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:634:3: otherlv_0= 'subsets' ( (otherlv_1= RULE_ID ) )
> {
>- match(input,23,FOLLOW_23_in_ruleSubsetsRule1241); 
>+ otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleSubsetsRule1269); 
> 
>- createLeafNode(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:771:1: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:772:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:638:1: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:639:1: (otherlv_1= RULE_ID )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:772:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:773:3: RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:639:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:640:3: otherlv_1= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getSubsetsRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getSubsetsRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubsetsRule1259); 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubsetsRule1289); 
> 
>- 		createLeafNode(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
>+ 		newLeafNode(otherlv_1, grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0()); 
> 	
> 
> }
>@@ -1651,9 +1585,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1664,11 +1596,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleSubsetsRule
>+ // $ANTLR end "ruleSubsetsRule"
> 
> 
>- // $ANTLR start entryRuleDefaultValueRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:793:1: entryRuleDefaultValueRule returns [EObject current=null] : iv_ruleDefaultValueRule= ruleDefaultValueRule EOF ;
>+ // $ANTLR start "entryRuleDefaultValueRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:659:1: entryRuleDefaultValueRule returns [EObject current=null] : iv_ruleDefaultValueRule= ruleDefaultValueRule EOF ;
> public final EObject entryRuleDefaultValueRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1676,16 +1608,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:794:2: (iv_ruleDefaultValueRule= ruleDefaultValueRule EOF )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:795:2: iv_ruleDefaultValueRule= ruleDefaultValueRule EOF
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:660:2: (iv_ruleDefaultValueRule= ruleDefaultValueRule EOF )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:661:2: iv_ruleDefaultValueRule= ruleDefaultValueRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getDefaultValueRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule1295);
>+ newCompositeNode(grammarAccess.getDefaultValueRuleRule()); 
>+ pushFollow(FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule1325);
> iv_ruleDefaultValueRule=ruleDefaultValueRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleDefaultValueRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleDefaultValueRule1305); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleDefaultValueRule1335); 
> 
> }
> 
>@@ -1699,55 +1632,49 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleDefaultValueRule
>+ // $ANTLR end "entryRuleDefaultValueRule"
> 
> 
>- // $ANTLR start ruleDefaultValueRule
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:802:1: ruleDefaultValueRule returns [EObject current=null] : ( '=' ( (lv_default_1_0= RULE_STRING ) ) ) ;
>+ // $ANTLR start "ruleDefaultValueRule"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:668:1: ruleDefaultValueRule returns [EObject current=null] : (otherlv_0= '=' ( (lv_default_1_0= RULE_STRING ) ) ) ;
> public final EObject ruleDefaultValueRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_default_1_0=null;
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:807:6: ( ( '=' ( (lv_default_1_0= RULE_STRING ) ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:808:1: ( '=' ( (lv_default_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:671:28: ( (otherlv_0= '=' ( (lv_default_1_0= RULE_STRING ) ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:672:1: (otherlv_0= '=' ( (lv_default_1_0= RULE_STRING ) ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:808:1: ( '=' ( (lv_default_1_0= RULE_STRING ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:808:3: '=' ( (lv_default_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:672:1: (otherlv_0= '=' ( (lv_default_1_0= RULE_STRING ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:672:3: otherlv_0= '=' ( (lv_default_1_0= RULE_STRING ) )
> {
>- match(input,24,FOLLOW_24_in_ruleDefaultValueRule1340); 
>+ otherlv_0=(Token)match(input,24,FOLLOW_24_in_ruleDefaultValueRule1372); 
> 
>- createLeafNode(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0());
> 
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:812:1: ( (lv_default_1_0= RULE_STRING ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:813:1: (lv_default_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:676:1: ( (lv_default_1_0= RULE_STRING ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:677:1: (lv_default_1_0= RULE_STRING )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:813:1: (lv_default_1_0= RULE_STRING )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:814:3: lv_default_1_0= RULE_STRING
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:677:1: (lv_default_1_0= RULE_STRING )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:678:3: lv_default_1_0= RULE_STRING
> {
>- lv_default_1_0=(Token)input.LT(1);
>- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDefaultValueRule1357); 
>+ lv_default_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDefaultValueRule1389); 
> 
>- 			createLeafNode(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0(), "default"); 
>+ 			newLeafNode(lv_default_1_0, grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getDefaultValueRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getDefaultValueRuleRule());
> 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"default",
>- 	 		lv_default_1_0, 
>- 	 		"STRING", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>- 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"default",
>+ 		lv_default_1_0, 
>+ 		"STRING");
> 	 
> 
> }
>@@ -1761,9 +1688,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1774,20 +1699,25 @@
> }
> return current;
> }
>- // $ANTLR end ruleDefaultValueRule
>+ // $ANTLR end "ruleDefaultValueRule"
> 
> 
>- // $ANTLR start ruleVisibilityKind
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:844:1: ruleVisibilityKind returns [Enumerator current=null] : ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) ;
>+ // $ANTLR start "ruleVisibilityKind"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:702:1: ruleVisibilityKind returns [Enumerator current=null] : ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) ) ;
> public final Enumerator ruleVisibilityKind() throws RecognitionException {
> Enumerator current = null;
> 
>- setCurrentLookahead(); resetLookahead(); 
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
>+
>+ enterRule(); 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:848:6: ( ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:849:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:704:28: ( ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:705:1: ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:849:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:705:1: ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) )
> int alt11=4;
> switch ( input.LA(1) ) {
> case 25:
>@@ -1812,22 +1742,22 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("849:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )", 11, 0, input);
>+ new NoViableAltException("", 11, 0, input);
> 
> throw nvae;
> }
> 
> switch (alt11) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:849:2: ( '+' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:705:2: (enumLiteral_0= '+' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:849:2: ( '+' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:849:4: '+'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:705:2: (enumLiteral_0= '+' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:705:4: enumLiteral_0= '+'
> {
>- match(input,25,FOLLOW_25_in_ruleVisibilityKind1410); 
>+ enumLiteral_0=(Token)match(input,25,FOLLOW_25_in_ruleVisibilityKind1444); 
> 
> current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
> 
> 
> }
>@@ -1836,15 +1766,15 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:855:6: ( '-' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:711:6: (enumLiteral_1= '-' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:855:6: ( '-' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:855:8: '-'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:711:6: (enumLiteral_1= '-' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:711:8: enumLiteral_1= '-'
> {
>- match(input,26,FOLLOW_26_in_ruleVisibilityKind1425); 
>+ enumLiteral_1=(Token)match(input,26,FOLLOW_26_in_ruleVisibilityKind1461); 
> 
> current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
> 
> 
> }
>@@ -1853,15 +1783,15 @@
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:861:6: ( '#' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:717:6: (enumLiteral_2= '#' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:861:6: ( '#' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:861:8: '#'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:717:6: (enumLiteral_2= '#' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:717:8: enumLiteral_2= '#'
> {
>- match(input,27,FOLLOW_27_in_ruleVisibilityKind1440); 
>+ enumLiteral_2=(Token)match(input,27,FOLLOW_27_in_ruleVisibilityKind1478); 
> 
> current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
> 
> 
> }
>@@ -1870,15 +1800,15 @@
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:867:6: ( '~' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:723:6: (enumLiteral_3= '~' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:867:6: ( '~' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:867:8: '~'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:723:6: (enumLiteral_3= '~' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:723:8: enumLiteral_3= '~'
> {
>- match(input,28,FOLLOW_28_in_ruleVisibilityKind1455); 
>+ enumLiteral_3=(Token)match(input,28,FOLLOW_28_in_ruleVisibilityKind1495); 
> 
> current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
> 
> 
> }
>@@ -1892,9 +1822,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1905,20 +1833,25 @@
> }
> return current;
> }
>- // $ANTLR end ruleVisibilityKind
>+ // $ANTLR end "ruleVisibilityKind"
> 
> 
>- // $ANTLR start ruleModifierKind
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:877:1: ruleModifierKind returns [Enumerator current=null] : ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) ) ;
>+ // $ANTLR start "ruleModifierKind"
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:733:1: ruleModifierKind returns [Enumerator current=null] : ( (enumLiteral_0= 'readOnly' ) | (enumLiteral_1= 'union' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) ) ;
> public final Enumerator ruleModifierKind() throws RecognitionException {
> Enumerator current = null;
> 
>- setCurrentLookahead(); resetLookahead(); 
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
>+
>+ enterRule(); 
> try {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:881:6: ( ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) ) )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:882:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:735:28: ( ( (enumLiteral_0= 'readOnly' ) | (enumLiteral_1= 'union' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:736:1: ( (enumLiteral_0= 'readOnly' ) | (enumLiteral_1= 'union' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:882:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:736:1: ( (enumLiteral_0= 'readOnly' ) | (enumLiteral_1= 'union' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) )
> int alt12=4;
> switch ( input.LA(1) ) {
> case 29:
>@@ -1943,22 +1876,22 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("882:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )", 12, 0, input);
>+ new NoViableAltException("", 12, 0, input);
> 
> throw nvae;
> }
> 
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:882:2: ( 'readOnly' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:736:2: (enumLiteral_0= 'readOnly' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:882:2: ( 'readOnly' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:882:4: 'readOnly'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:736:2: (enumLiteral_0= 'readOnly' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:736:4: enumLiteral_0= 'readOnly'
> {
>- match(input,29,FOLLOW_29_in_ruleModifierKind1498); 
>+ enumLiteral_0=(Token)match(input,29,FOLLOW_29_in_ruleModifierKind1540); 
> 
> current = grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0()); 
> 
> 
> }
>@@ -1967,15 +1900,15 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:888:6: ( 'union' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:742:6: (enumLiteral_1= 'union' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:888:6: ( 'union' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:888:8: 'union'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:742:6: (enumLiteral_1= 'union' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:742:8: enumLiteral_1= 'union'
> {
>- match(input,30,FOLLOW_30_in_ruleModifierKind1513); 
>+ enumLiteral_1=(Token)match(input,30,FOLLOW_30_in_ruleModifierKind1557); 
> 
> current = grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1()); 
> 
> 
> }
>@@ -1984,15 +1917,15 @@
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:894:6: ( 'ordered' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:748:6: (enumLiteral_2= 'ordered' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:894:6: ( 'ordered' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:894:8: 'ordered'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:748:6: (enumLiteral_2= 'ordered' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:748:8: enumLiteral_2= 'ordered'
> {
>- match(input,31,FOLLOW_31_in_ruleModifierKind1528); 
>+ enumLiteral_2=(Token)match(input,31,FOLLOW_31_in_ruleModifierKind1574); 
> 
> current = grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2()); 
> 
> 
> }
>@@ -2001,15 +1934,15 @@
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:900:6: ( 'unique' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:754:6: (enumLiteral_3= 'unique' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:900:6: ( 'unique' )
>- // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:900:8: 'unique'
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:754:6: (enumLiteral_3= 'unique' )
>+ // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:754:8: enumLiteral_3= 'unique'
> {
>- match(input,32,FOLLOW_32_in_ruleModifierKind1543); 
>+ enumLiteral_3=(Token)match(input,32,FOLLOW_32_in_ruleModifierKind1591); 
> 
> current = grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3()); 
> 
> 
> }
>@@ -2023,9 +1956,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -2036,8 +1967,10 @@
> }
> return current;
> }
>- // $ANTLR end ruleModifierKind
>+ // $ANTLR end "ruleModifierKind"
> 
>+ // Delegated rules
>+
> 
> 
> 
>@@ -2046,62 +1979,62 @@
> public static final BitSet FOLLOW_ruleVisibilityKind_in_rulePropertyRule131 = new BitSet(new long[]{0x0000000000001010L});
> public static final BitSet FOLLOW_12_in_rulePropertyRule149 = new BitSet(new long[]{0x0000000000000010L});
> public static final BitSet FOLLOW_RULE_ID_in_rulePropertyRule180 = new BitSet(new long[]{0x0000000000002000L});
>- public static final BitSet FOLLOW_13_in_rulePropertyRule195 = new BitSet(new long[]{0x0000000000004010L});
>- public static final BitSet FOLLOW_ruleTypeRule_in_rulePropertyRule217 = new BitSet(new long[]{0x0000000001090002L});
>- public static final BitSet FOLLOW_14_in_rulePropertyRule233 = new BitSet(new long[]{0x0000000001090002L});
>- public static final BitSet FOLLOW_ruleMultiplicityRule_in_rulePropertyRule255 = new BitSet(new long[]{0x0000000001080002L});
>- public static final BitSet FOLLOW_ruleModifiersRule_in_rulePropertyRule277 = new BitSet(new long[]{0x0000000001000002L});
>- public static final BitSet FOLLOW_ruleDefaultValueRule_in_rulePropertyRule299 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule336 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule346 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule392 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule411 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName447 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName457 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName500 = new BitSet(new long[]{0x0000000000008000L});
>- public static final BitSet FOLLOW_15_in_ruleQualifiedName510 = new BitSet(new long[]{0x0000000000000012L});
>- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName531 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule568 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule578 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_16_in_ruleMultiplicityRule613 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule634 = new BitSet(new long[]{0x0000000000060000L});
>- public static final BitSet FOLLOW_17_in_ruleMultiplicityRule645 = new BitSet(new long[]{0x0000000000000020L});
>- public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule666 = new BitSet(new long[]{0x0000000000040000L});
>- public static final BitSet FOLLOW_18_in_ruleMultiplicityRule678 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification714 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification724 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification765 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule805 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule815 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_19_in_ruleModifiersRule850 = new BitSet(new long[]{0x00000001E0C00000L});
>- public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule871 = new BitSet(new long[]{0x0000000000300000L});
>- public static final BitSet FOLLOW_20_in_ruleModifiersRule882 = new BitSet(new long[]{0x00000001E0C00000L});
>- public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule903 = new BitSet(new long[]{0x0000000000300000L});
>- public static final BitSet FOLLOW_21_in_ruleModifiersRule915 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification951 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification961 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleModifierKind_in_ruleModifierSpecification1007 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleRedefinesRule_in_ruleModifierSpecification1034 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleSubsetsRule_in_ruleModifierSpecification1061 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule1097 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleRedefinesRule1107 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_22_in_ruleRedefinesRule1142 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleRedefinesRule1160 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule1196 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleSubsetsRule1206 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_23_in_ruleSubsetsRule1241 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleSubsetsRule1259 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule1295 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleDefaultValueRule1305 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_24_in_ruleDefaultValueRule1340 = new BitSet(new long[]{0x0000000000000040L});
>- public static final BitSet FOLLOW_RULE_STRING_in_ruleDefaultValueRule1357 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_25_in_ruleVisibilityKind1410 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_26_in_ruleVisibilityKind1425 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_27_in_ruleVisibilityKind1440 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_28_in_ruleVisibilityKind1455 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_29_in_ruleModifierKind1498 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_30_in_ruleModifierKind1513 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_31_in_ruleModifierKind1528 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_32_in_ruleModifierKind1543 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_13_in_rulePropertyRule197 = new BitSet(new long[]{0x0000000000004010L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_rulePropertyRule219 = new BitSet(new long[]{0x0000000001090002L});
>+ public static final BitSet FOLLOW_14_in_rulePropertyRule237 = new BitSet(new long[]{0x0000000001090002L});
>+ public static final BitSet FOLLOW_ruleMultiplicityRule_in_rulePropertyRule259 = new BitSet(new long[]{0x0000000001080002L});
>+ public static final BitSet FOLLOW_ruleModifiersRule_in_rulePropertyRule281 = new BitSet(new long[]{0x0000000001000002L});
>+ public static final BitSet FOLLOW_ruleDefaultValueRule_in_rulePropertyRule303 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule340 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule350 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule396 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule417 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName453 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName463 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName508 = new BitSet(new long[]{0x0000000000008000L});
>+ public static final BitSet FOLLOW_15_in_ruleQualifiedName520 = new BitSet(new long[]{0x0000000000000012L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName541 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule578 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule588 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_16_in_ruleMultiplicityRule625 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule646 = new BitSet(new long[]{0x0000000000060000L});
>+ public static final BitSet FOLLOW_17_in_ruleMultiplicityRule659 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule680 = new BitSet(new long[]{0x0000000000040000L});
>+ public static final BitSet FOLLOW_18_in_ruleMultiplicityRule694 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification730 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification740 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification781 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule821 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule831 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_19_in_ruleModifiersRule868 = new BitSet(new long[]{0x00000001E0C00000L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule889 = new BitSet(new long[]{0x0000000000300000L});
>+ public static final BitSet FOLLOW_20_in_ruleModifiersRule902 = new BitSet(new long[]{0x00000001E0C00000L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule923 = new BitSet(new long[]{0x0000000000300000L});
>+ public static final BitSet FOLLOW_21_in_ruleModifiersRule937 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification973 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification983 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierKind_in_ruleModifierSpecification1029 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleRedefinesRule_in_ruleModifierSpecification1056 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleSubsetsRule_in_ruleModifierSpecification1083 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule1119 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleRedefinesRule1129 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_22_in_ruleRedefinesRule1166 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleRedefinesRule1186 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule1222 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleSubsetsRule1232 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_23_in_ruleSubsetsRule1269 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleSubsetsRule1289 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule1325 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleDefaultValueRule1335 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_24_in_ruleDefaultValueRule1372 = new BitSet(new long[]{0x0000000000000040L});
>+ public static final BitSet FOLLOW_RULE_STRING_in_ruleDefaultValueRule1389 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_25_in_ruleVisibilityKind1444 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_26_in_ruleVisibilityKind1461 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_27_in_ruleVisibilityKind1478 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_28_in_ruleVisibilityKind1495 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_29_in_ruleModifierKind1540 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_30_in_ruleModifierKind1557 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_31_in_ruleModifierKind1574 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_32_in_ruleModifierKind1591 = new BitSet(new long[]{0x0000000000000002L});
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/UmlPropertyParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/UmlPropertyParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/UmlPropertyParser.java	(working copy)
>@@ -3,14 +3,9 @@
> */
> package org.eclipse.papyrus.property.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.papyrus.property.editor.xtext.services.UmlPropertyGrammarAccess;
> 
> public class UmlPropertyParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>@@ -19,25 +14,13 @@
> 	private UmlPropertyGrammarAccess grammarAccess;
> 	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal.InternalUmlPropertyParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(),re);
>-		}
> 	}
> 	
>+	@Override
> 	protected org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal.InternalUmlPropertyParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal.InternalUmlPropertyParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal.InternalUmlPropertyParser(stream, getGrammarAccess());
> 	}
> 	
> 	@Override 
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>Index: src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java
>===================================================================
>--- src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java	(revision 4043)
>+++ src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java	(working copy)
>@@ -80,7 +80,8 @@
> 				upperValue = rule.getBounds().get(1).getValue().equals("*") ? -1 : Integer.valueOf(rule.getBounds().get(1).getValue()) ;
> 				if ((lowerValue == -1 && upperValue != -1) ||
> 					(lowerValue > upperValue && upperValue != -1)) {
>-					error(errorMessage, rule, UmlPropertyPackage.BOUND_SPECIFICATION__VALUE) ;
>+					error(errorMessage, UmlPropertyPackage.eINSTANCE.getBoundSpecification_Value()) ;
>+					//error(errorMessage, rule, UmlPropertyPackage.BOUND_SPECIFICATION__VALUE) ;
> 					valid_MultiplicityRule = false ;
> 				}
> 				else {
>@@ -118,7 +119,8 @@
> 
> 			valid_RedefinesRule = typeOfRedefiningProperty.conformsTo(redefinedProperty.getType()) ;
> 			if (! valid_RedefinesRule) {
>-				error(typeErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
>+				error(typeErrorMessage, UmlPropertyPackage.eINSTANCE.getRedefinesRule_Property()) ;
>+				//error(typeErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
> 				return ;
> 			}
> 
>@@ -149,14 +151,16 @@
> 			}
> 
> 			if (! valid_RedefinesRule) {
>-				error(multiplicityErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
>+				error(multiplicityErrorMessage, UmlPropertyPackage.eINSTANCE.getRedefinesRule_Property()) ;
>+				//error(multiplicityErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
> 				return ;
> 			}
> 			
> 			if (redefinedProperty.isDerived() && !isRedefiningPropertyDerived)
> 				valid_RedefinesRule = false ;
> 			if (! valid_RedefinesRule) {
>-				error(isDerivedErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
>+				error(multiplicityErrorMessage, UmlPropertyPackage.eINSTANCE.getRedefinesRule_Property()) ;
>+				//error(isDerivedErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
> 				return ;
> 			}
> 
>@@ -189,7 +193,8 @@
> 
> 			valid_SubsetsRule = typeOfSubsettingProperty.conformsTo(subsettedProperty.getType()) ;
> 			if (! valid_SubsetsRule) {
>-				error(typeErrorMessage, rule, UmlPropertyPackage.SUBSETS_RULE__PROPERTY) ;
>+				error(multiplicityErrorMessage, UmlPropertyPackage.eINSTANCE.getSubsetsRule_Property()) ;
>+				//error(typeErrorMessage, rule, UmlPropertyPackage.SUBSETS_RULE__PROPERTY) ;
> 				return ;
> 			}
> 
>@@ -220,7 +225,8 @@
> 			}
> 
> 			if (! valid_SubsetsRule) {
>-				error(multiplicityErrorMessage, rule, UmlPropertyPackage.SUBSETS_RULE__PROPERTY) ;
>+				error(multiplicityErrorMessage, UmlPropertyPackage.eINSTANCE.getSubsetsRule_Property()) ;
>+				//error(multiplicityErrorMessage, rule, UmlPropertyPackage.SUBSETS_RULE__PROPERTY) ;
> 				return ;
> 			}
> 			
>Index: src/org/eclipse/papyrus/property/editor/xtext/GenerateUmlProperty.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/property/editor/xtext/GenerateUmlProperty.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/property/editor/xtext/GenerateUmlProperty.mwe2	(working copy)
>@@ -62,7 +62,13 @@
> 			}
> 				
> 			// the following fragment tries to use the Antlr Generator fragment which can be installed via update manager from http://download.itemis.com/updates/
>-			fragment = AntlrDelegatingFragment {}
>+			//fragment = AntlrDelegatingFragment {}
>+			// The antlr parser generator fragment.
>+			fragment = parser.antlr.XtextAntlrGeneratorFragment {
>+			// options = {
>+			//		backtrack = true
>+			//	}
>+			}
> 			
> 			/*
> 			If you don't want to use the Antlr fragment for some reason, remove the antlr fragment and uncomment the packrat parser fragment below.
>@@ -99,8 +105,7 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// java-based API for content assistance 
>@@ -109,10 +114,12 @@
> 			// the following fragment tries to use the Antlr based content assist 
> 			// fragment which can be downloaded from http://www.itemis.com 
> 			// and will be ignored if it's not available. 
>-			fragment = DelegatingGeneratorFragment { 
>-				delegate = "de.itemis.xtext.antlr.XtextAntlrUiGeneratorFragment"
>-				message="You are generating without ANTLR. It is highly recommended to download and use the plugin \'de.itemis.xtext.antlr\' \n\t using the update site http://download.itemis.com/updates/."
>-			}
>+			//fragment = DelegatingGeneratorFragment { 
>+			//	delegate = "de.itemis.xtext.antlr.XtextAntlrUiGeneratorFragment"
>+			//	message="You are generating without ANTLR. It is highly recommended to download and use the plugin \'de.itemis.xtext.antlr\' \n\t using the update site http://download.itemis.com/updates/."
>+			//}
>+			
>+			fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
> 
> 			fragment = builder.BuilderIntegrationFragment {}
> 
>#P org.eclipse.papyrus.transition.editor.xtext.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -16,11 +16,11 @@
> org.antlr.runtime,
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.8.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0",
> org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
> org.eclipse.papyrus.core;bundle-version="0.8.0",
> org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
>- org.eclipse.core.expressions;bundle-version="3.4.200"
>+ org.eclipse.core.expressions;bundle-version="3.4.200",
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.transition.editor.xtext.ui,
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/UmlTransitionExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/UmlTransitionExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/UmlTransitionExecutableExtensionFactory.java	(working copy)
>@@ -1,8 +1,6 @@
>-
> /*
> * generated by Xtext
> */
>- 
> package org.eclipse.papyrus.transition.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -11,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- *@generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlTransitionExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/AbstractUmlTransitionUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/AbstractUmlTransitionUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/AbstractUmlTransitionUiModule.java	(working copy)
>@@ -24,21 +24,11 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.XtextDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.transition.editor.xtext.parser.antlr.internal.InternalUmlTransitionLexer.class);
> 	}
>@@ -48,6 +38,11 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
> 	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
> 		return org.eclipse.papyrus.transition.editor.xtext.ui.labeling.UmlTransitionLabelProvider.class;
>@@ -58,14 +53,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.transition.editor.xtext.ui.labeling.UmlTransitionDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.transition.editor.xtext.ui.outline.UmlTransitionTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.transition.editor.xtext.ui.outline.UmlTransitionOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.transition.editor.xtext.ui.outline.UmlTransitionOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.transition.editor.xtext.ui.outline.UmlTransitionOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/internal/UmlTransitionActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/internal/UmlTransitionActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/internal/UmlTransitionActivator.java	(working copy)
>@@ -1,24 +1,25 @@
>-
> /*
> * generated by Xtext
> */
> package org.eclipse.papyrus.transition.editor.xtext.ui.internal;
> 
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
>+
> import org.apache.log4j.Logger;
> 
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
> 
> import java.util.Map;
> import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlTransitionActivator extends AbstractUIPlugin {
> 
>@@ -34,10 +35,7 @@
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-			
>-			injectors.put("org.eclipse.papyrus.transition.editor.xtext.UmlTransition", Guice.createInjector(
>-				Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.transition.editor.xtext.UmlTransition")).with(getUiModule("org.eclipse.papyrus.transition.editor.xtext.UmlTransition"))).with(getSharedStateModule())
>-			));
>+			registerInjectorFor("org.eclipse.papyrus.transition.editor.xtext.UmlTransition");
> 			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
>@@ -45,20 +43,31 @@
> 		}
> 	}
> 	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlTransitionActivator getInstance() {
> 		return INSTANCE;
> 	}
> 	
> 	protected Module getRuntimeModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.transition.editor.xtext.UmlTransition".equals(grammar)) {
> 		 return new org.eclipse.papyrus.transition.editor.xtext.UmlTransitionRuntimeModule();
> 		}
> 		
> 		throw new IllegalArgumentException(grammar);
> 	}
>+	
> 	protected Module getUiModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.transition.editor.xtext.UmlTransition".equals(grammar)) {
> 		 return new org.eclipse.papyrus.transition.editor.xtext.ui.UmlTransitionUiModule(this);
> 		}
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g	(working copy)
>@@ -1239,7 +1239,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransitionParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransitionParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransitionParser.java	(working copy)
>@@ -26,20 +26,39 @@
> "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'Activity'", "'StateMachine'", "'OpaqueBehavior'", "','", "'after'", "'at'", "'when'", "'['", "']'", "'/'", "'all'"
> };
> public static final int RULE_ID=4;
>- public static final int RULE_STRING=5;
> public static final int RULE_ANY_OTHER=10;
>- public static final int RULE_INT=6;
>- public static final int RULE_WS=9;
>- public static final int RULE_SL_COMMENT=8;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
> 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 T__19=19;
>+ public static final int RULE_STRING=5;
>+ 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=9;
>+
>+ // delegates
>+ // delegators
>+
> 
> public InternalUmlTransitionParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlTransitionParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlTransitionParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g"; }
> 
> 
>@@ -63,7 +82,7 @@
> 
> 
> 
>- // $ANTLR start entryRuleTransitionRule
>+ // $ANTLR start "entryRuleTransitionRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:61:1: entryRuleTransitionRule : ruleTransitionRule EOF ;
> public final void entryRuleTransitionRule() throws RecognitionException {
> try {
>@@ -73,7 +92,8 @@
> before(grammarAccess.getTransitionRuleRule()); 
> pushFollow(FOLLOW_ruleTransitionRule_in_entryRuleTransitionRule61);
> ruleTransitionRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTransitionRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleTransitionRule68); 
>@@ -89,10 +109,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleTransitionRule
>+ // $ANTLR end "entryRuleTransitionRule"
> 
> 
>- // $ANTLR start ruleTransitionRule
>+ // $ANTLR start "ruleTransitionRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:70:1: ruleTransitionRule : ( ( rule__TransitionRule__Group__0 ) ) ;
> public final void ruleTransitionRule() throws RecognitionException {
> 
>@@ -111,8 +131,9 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group__0_in_ruleTransitionRule94);
> rule__TransitionRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -135,10 +156,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleTransitionRule
>+ // $ANTLR end "ruleTransitionRule"
> 
> 
>- // $ANTLR start entryRuleEventRule
>+ // $ANTLR start "entryRuleEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:89:1: entryRuleEventRule : ruleEventRule EOF ;
> public final void entryRuleEventRule() throws RecognitionException {
> try {
>@@ -148,7 +169,8 @@
> before(grammarAccess.getEventRuleRule()); 
> pushFollow(FOLLOW_ruleEventRule_in_entryRuleEventRule121);
> ruleEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleEventRule128); 
>@@ -164,10 +186,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleEventRule
>+ // $ANTLR end "entryRuleEventRule"
> 
> 
>- // $ANTLR start ruleEventRule
>+ // $ANTLR start "ruleEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:98:1: ruleEventRule : ( ( rule__EventRule__Alternatives ) ) ;
> public final void ruleEventRule() throws RecognitionException {
> 
>@@ -186,7 +208,8 @@
> {
> pushFollow(FOLLOW_rule__EventRule__Alternatives_in_ruleEventRule154);
> rule__EventRule__Alternatives();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -210,10 +233,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleEventRule
>+ // $ANTLR end "ruleEventRule"
> 
> 
>- // $ANTLR start entryRuleCallOrSignalEventRule
>+ // $ANTLR start "entryRuleCallOrSignalEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:117:1: entryRuleCallOrSignalEventRule : ruleCallOrSignalEventRule EOF ;
> public final void entryRuleCallOrSignalEventRule() throws RecognitionException {
> try {
>@@ -223,7 +246,8 @@
> before(grammarAccess.getCallOrSignalEventRuleRule()); 
> pushFollow(FOLLOW_ruleCallOrSignalEventRule_in_entryRuleCallOrSignalEventRule181);
> ruleCallOrSignalEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getCallOrSignalEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleCallOrSignalEventRule188); 
>@@ -239,10 +263,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleCallOrSignalEventRule
>+ // $ANTLR end "entryRuleCallOrSignalEventRule"
> 
> 
>- // $ANTLR start ruleCallOrSignalEventRule
>+ // $ANTLR start "ruleCallOrSignalEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:126:1: ruleCallOrSignalEventRule : ( ( rule__CallOrSignalEventRule__OperationOrSignalAssignment ) ) ;
> public final void ruleCallOrSignalEventRule() throws RecognitionException {
> 
>@@ -261,8 +285,9 @@
> {
> pushFollow(FOLLOW_rule__CallOrSignalEventRule__OperationOrSignalAssignment_in_ruleCallOrSignalEventRule214);
> rule__CallOrSignalEventRule__OperationOrSignalAssignment();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -285,10 +310,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleCallOrSignalEventRule
>+ // $ANTLR end "ruleCallOrSignalEventRule"
> 
> 
>- // $ANTLR start entryRuleAnyReceiveEventRule
>+ // $ANTLR start "entryRuleAnyReceiveEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:145:1: entryRuleAnyReceiveEventRule : ruleAnyReceiveEventRule EOF ;
> public final void entryRuleAnyReceiveEventRule() throws RecognitionException {
> try {
>@@ -298,7 +323,8 @@
> before(grammarAccess.getAnyReceiveEventRuleRule()); 
> pushFollow(FOLLOW_ruleAnyReceiveEventRule_in_entryRuleAnyReceiveEventRule241);
> ruleAnyReceiveEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getAnyReceiveEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleAnyReceiveEventRule248); 
>@@ -314,10 +340,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleAnyReceiveEventRule
>+ // $ANTLR end "entryRuleAnyReceiveEventRule"
> 
> 
>- // $ANTLR start ruleAnyReceiveEventRule
>+ // $ANTLR start "ruleAnyReceiveEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:154:1: ruleAnyReceiveEventRule : ( ( rule__AnyReceiveEventRule__IsAReceiveEventAssignment ) ) ;
> public final void ruleAnyReceiveEventRule() throws RecognitionException {
> 
>@@ -336,8 +362,9 @@
> {
> pushFollow(FOLLOW_rule__AnyReceiveEventRule__IsAReceiveEventAssignment_in_ruleAnyReceiveEventRule274);
> rule__AnyReceiveEventRule__IsAReceiveEventAssignment();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -360,10 +387,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleAnyReceiveEventRule
>+ // $ANTLR end "ruleAnyReceiveEventRule"
> 
> 
>- // $ANTLR start entryRuleTimeEventRule
>+ // $ANTLR start "entryRuleTimeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:173:1: entryRuleTimeEventRule : ruleTimeEventRule EOF ;
> public final void entryRuleTimeEventRule() throws RecognitionException {
> try {
>@@ -373,7 +400,8 @@
> before(grammarAccess.getTimeEventRuleRule()); 
> pushFollow(FOLLOW_ruleTimeEventRule_in_entryRuleTimeEventRule301);
> ruleTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTimeEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleTimeEventRule308); 
>@@ -389,10 +417,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleTimeEventRule
>+ // $ANTLR end "entryRuleTimeEventRule"
> 
> 
>- // $ANTLR start ruleTimeEventRule
>+ // $ANTLR start "ruleTimeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:182:1: ruleTimeEventRule : ( ( rule__TimeEventRule__Alternatives ) ) ;
> public final void ruleTimeEventRule() throws RecognitionException {
> 
>@@ -411,8 +439,9 @@
> {
> pushFollow(FOLLOW_rule__TimeEventRule__Alternatives_in_ruleTimeEventRule334);
> rule__TimeEventRule__Alternatives();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -435,10 +464,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleTimeEventRule
>+ // $ANTLR end "ruleTimeEventRule"
> 
> 
>- // $ANTLR start entryRuleRelativeTimeEventRule
>+ // $ANTLR start "entryRuleRelativeTimeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:201:1: entryRuleRelativeTimeEventRule : ruleRelativeTimeEventRule EOF ;
> public final void entryRuleRelativeTimeEventRule() throws RecognitionException {
> try {
>@@ -448,7 +477,8 @@
> before(grammarAccess.getRelativeTimeEventRuleRule()); 
> pushFollow(FOLLOW_ruleRelativeTimeEventRule_in_entryRuleRelativeTimeEventRule361);
> ruleRelativeTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getRelativeTimeEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleRelativeTimeEventRule368); 
>@@ -464,10 +494,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleRelativeTimeEventRule
>+ // $ANTLR end "entryRuleRelativeTimeEventRule"
> 
> 
>- // $ANTLR start ruleRelativeTimeEventRule
>+ // $ANTLR start "ruleRelativeTimeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:210:1: ruleRelativeTimeEventRule : ( ( rule__RelativeTimeEventRule__Group__0 ) ) ;
> public final void ruleRelativeTimeEventRule() throws RecognitionException {
> 
>@@ -486,8 +516,9 @@
> {
> pushFollow(FOLLOW_rule__RelativeTimeEventRule__Group__0_in_ruleRelativeTimeEventRule394);
> rule__RelativeTimeEventRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -510,10 +541,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleRelativeTimeEventRule
>+ // $ANTLR end "ruleRelativeTimeEventRule"
> 
> 
>- // $ANTLR start entryRuleAbsoluteTimeEventRule
>+ // $ANTLR start "entryRuleAbsoluteTimeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:229:1: entryRuleAbsoluteTimeEventRule : ruleAbsoluteTimeEventRule EOF ;
> public final void entryRuleAbsoluteTimeEventRule() throws RecognitionException {
> try {
>@@ -523,7 +554,8 @@
> before(grammarAccess.getAbsoluteTimeEventRuleRule()); 
> pushFollow(FOLLOW_ruleAbsoluteTimeEventRule_in_entryRuleAbsoluteTimeEventRule421);
> ruleAbsoluteTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getAbsoluteTimeEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleAbsoluteTimeEventRule428); 
>@@ -539,10 +571,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleAbsoluteTimeEventRule
>+ // $ANTLR end "entryRuleAbsoluteTimeEventRule"
> 
> 
>- // $ANTLR start ruleAbsoluteTimeEventRule
>+ // $ANTLR start "ruleAbsoluteTimeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:238:1: ruleAbsoluteTimeEventRule : ( ( rule__AbsoluteTimeEventRule__Group__0 ) ) ;
> public final void ruleAbsoluteTimeEventRule() throws RecognitionException {
> 
>@@ -561,7 +593,8 @@
> {
> pushFollow(FOLLOW_rule__AbsoluteTimeEventRule__Group__0_in_ruleAbsoluteTimeEventRule454);
> rule__AbsoluteTimeEventRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -585,10 +618,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleAbsoluteTimeEventRule
>+ // $ANTLR end "ruleAbsoluteTimeEventRule"
> 
> 
>- // $ANTLR start entryRuleChangeEventRule
>+ // $ANTLR start "entryRuleChangeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:257:1: entryRuleChangeEventRule : ruleChangeEventRule EOF ;
> public final void entryRuleChangeEventRule() throws RecognitionException {
> try {
>@@ -598,7 +631,8 @@
> before(grammarAccess.getChangeEventRuleRule()); 
> pushFollow(FOLLOW_ruleChangeEventRule_in_entryRuleChangeEventRule481);
> ruleChangeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getChangeEventRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleChangeEventRule488); 
>@@ -614,10 +648,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleChangeEventRule
>+ // $ANTLR end "entryRuleChangeEventRule"
> 
> 
>- // $ANTLR start ruleChangeEventRule
>+ // $ANTLR start "ruleChangeEventRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:266:1: ruleChangeEventRule : ( ( rule__ChangeEventRule__Group__0 ) ) ;
> public final void ruleChangeEventRule() throws RecognitionException {
> 
>@@ -636,8 +670,9 @@
> {
> pushFollow(FOLLOW_rule__ChangeEventRule__Group__0_in_ruleChangeEventRule514);
> rule__ChangeEventRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -660,10 +695,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleChangeEventRule
>+ // $ANTLR end "ruleChangeEventRule"
> 
> 
>- // $ANTLR start entryRuleGuardRule
>+ // $ANTLR start "entryRuleGuardRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:285:1: entryRuleGuardRule : ruleGuardRule EOF ;
> public final void entryRuleGuardRule() throws RecognitionException {
> try {
>@@ -673,7 +708,8 @@
> before(grammarAccess.getGuardRuleRule()); 
> pushFollow(FOLLOW_ruleGuardRule_in_entryRuleGuardRule541);
> ruleGuardRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getGuardRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleGuardRule548); 
>@@ -689,10 +725,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleGuardRule
>+ // $ANTLR end "entryRuleGuardRule"
> 
> 
>- // $ANTLR start ruleGuardRule
>+ // $ANTLR start "ruleGuardRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:294:1: ruleGuardRule : ( ( rule__GuardRule__Group__0 ) ) ;
> public final void ruleGuardRule() throws RecognitionException {
> 
>@@ -711,8 +747,9 @@
> {
> pushFollow(FOLLOW_rule__GuardRule__Group__0_in_ruleGuardRule574);
> rule__GuardRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -735,10 +772,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleGuardRule
>+ // $ANTLR end "ruleGuardRule"
> 
> 
>- // $ANTLR start entryRuleEffectRule
>+ // $ANTLR start "entryRuleEffectRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:313:1: entryRuleEffectRule : ruleEffectRule EOF ;
> public final void entryRuleEffectRule() throws RecognitionException {
> try {
>@@ -748,7 +785,8 @@
> before(grammarAccess.getEffectRuleRule()); 
> pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule601);
> ruleEffectRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEffectRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleEffectRule608); 
>@@ -764,10 +802,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleEffectRule
>+ // $ANTLR end "entryRuleEffectRule"
> 
> 
>- // $ANTLR start ruleEffectRule
>+ // $ANTLR start "ruleEffectRule"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:322:1: ruleEffectRule : ( ( rule__EffectRule__Group__0 ) ) ;
> public final void ruleEffectRule() throws RecognitionException {
> 
>@@ -786,8 +824,9 @@
> {
> pushFollow(FOLLOW_rule__EffectRule__Group__0_in_ruleEffectRule634);
> rule__EffectRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -810,10 +849,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleEffectRule
>+ // $ANTLR end "ruleEffectRule"
> 
> 
>- // $ANTLR start ruleBehaviorKind
>+ // $ANTLR start "ruleBehaviorKind"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:342:1: ruleBehaviorKind : ( ( rule__BehaviorKind__Alternatives ) ) ;
> public final void ruleBehaviorKind() throws RecognitionException {
> 
>@@ -832,8 +871,9 @@
> {
> pushFollow(FOLLOW_rule__BehaviorKind__Alternatives_in_ruleBehaviorKind671);
> rule__BehaviorKind__Alternatives();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -856,10 +896,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleBehaviorKind
>+ // $ANTLR end "ruleBehaviorKind"
> 
> 
>- // $ANTLR start rule__EventRule__Alternatives
>+ // $ANTLR start "rule__EventRule__Alternatives"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:360:1: rule__EventRule__Alternatives : ( ( ruleCallOrSignalEventRule ) | ( ruleAnyReceiveEventRule ) | ( ruleTimeEventRule ) | ( ruleChangeEventRule ) );
> public final void rule__EventRule__Alternatives() throws RecognitionException {
> 
>@@ -892,7 +932,7 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("360:1: rule__EventRule__Alternatives : ( ( ruleCallOrSignalEventRule ) | ( ruleAnyReceiveEventRule ) | ( ruleTimeEventRule ) | ( ruleChangeEventRule ) );", 1, 0, input);
>+ new NoViableAltException("", 1, 0, input);
> 
> throw nvae;
> }
>@@ -907,7 +947,8 @@
> before(grammarAccess.getEventRuleAccess().getCallOrSignalEventRuleParserRuleCall_0()); 
> pushFollow(FOLLOW_ruleCallOrSignalEventRule_in_rule__EventRule__Alternatives706);
> ruleCallOrSignalEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEventRuleAccess().getCallOrSignalEventRuleParserRuleCall_0()); 
> 
>@@ -925,7 +966,8 @@
> before(grammarAccess.getEventRuleAccess().getAnyReceiveEventRuleParserRuleCall_1()); 
> pushFollow(FOLLOW_ruleAnyReceiveEventRule_in_rule__EventRule__Alternatives723);
> ruleAnyReceiveEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEventRuleAccess().getAnyReceiveEventRuleParserRuleCall_1()); 
> 
>@@ -943,7 +985,8 @@
> before(grammarAccess.getEventRuleAccess().getTimeEventRuleParserRuleCall_2()); 
> pushFollow(FOLLOW_ruleTimeEventRule_in_rule__EventRule__Alternatives740);
> ruleTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEventRuleAccess().getTimeEventRuleParserRuleCall_2()); 
> 
>@@ -961,7 +1004,8 @@
> before(grammarAccess.getEventRuleAccess().getChangeEventRuleParserRuleCall_3()); 
> pushFollow(FOLLOW_ruleChangeEventRule_in_rule__EventRule__Alternatives757);
> ruleChangeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEventRuleAccess().getChangeEventRuleParserRuleCall_3()); 
> 
>@@ -984,10 +1028,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EventRule__Alternatives
>+ // $ANTLR end "rule__EventRule__Alternatives"
> 
> 
>- // $ANTLR start rule__TimeEventRule__Alternatives
>+ // $ANTLR start "rule__TimeEventRule__Alternatives"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:394:1: rule__TimeEventRule__Alternatives : ( ( ruleRelativeTimeEventRule ) | ( ruleAbsoluteTimeEventRule ) );
> public final void rule__TimeEventRule__Alternatives() throws RecognitionException {
> 
>@@ -1006,7 +1050,7 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("394:1: rule__TimeEventRule__Alternatives : ( ( ruleRelativeTimeEventRule ) | ( ruleAbsoluteTimeEventRule ) );", 2, 0, input);
>+ new NoViableAltException("", 2, 0, input);
> 
> throw nvae;
> }
>@@ -1020,7 +1064,8 @@
> before(grammarAccess.getTimeEventRuleAccess().getRelativeTimeEventRuleParserRuleCall_0()); 
> pushFollow(FOLLOW_ruleRelativeTimeEventRule_in_rule__TimeEventRule__Alternatives789);
> ruleRelativeTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTimeEventRuleAccess().getRelativeTimeEventRuleParserRuleCall_0()); 
> 
>@@ -1038,7 +1083,8 @@
> before(grammarAccess.getTimeEventRuleAccess().getAbsoluteTimeEventRuleParserRuleCall_1()); 
> pushFollow(FOLLOW_ruleAbsoluteTimeEventRule_in_rule__TimeEventRule__Alternatives806);
> ruleAbsoluteTimeEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTimeEventRuleAccess().getAbsoluteTimeEventRuleParserRuleCall_1()); 
> 
>@@ -1061,10 +1107,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TimeEventRule__Alternatives
>+ // $ANTLR end "rule__TimeEventRule__Alternatives"
> 
> 
>- // $ANTLR start rule__BehaviorKind__Alternatives
>+ // $ANTLR start "rule__BehaviorKind__Alternatives"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:416:1: rule__BehaviorKind__Alternatives : ( ( ( 'Activity' ) ) | ( ( 'StateMachine' ) ) | ( ( 'OpaqueBehavior' ) ) );
> public final void rule__BehaviorKind__Alternatives() throws RecognitionException {
> 
>@@ -1091,7 +1137,7 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("416:1: rule__BehaviorKind__Alternatives : ( ( ( 'Activity' ) ) | ( ( 'StateMachine' ) ) | ( ( 'OpaqueBehavior' ) ) );", 3, 0, input);
>+ new NoViableAltException("", 3, 0, input);
> 
> throw nvae;
> }
>@@ -1174,10 +1220,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__BehaviorKind__Alternatives
>+ // $ANTLR end "rule__BehaviorKind__Alternatives"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group__0
>+ // $ANTLR start "rule__TransitionRule__Group__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:449:1: rule__TransitionRule__Group__0 : rule__TransitionRule__Group__0__Impl rule__TransitionRule__Group__1 ;
> public final void rule__TransitionRule__Group__0() throws RecognitionException {
> 
>@@ -1189,12 +1235,14 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group__0__Impl_in_rule__TransitionRule__Group__0914);
> rule__TransitionRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__TransitionRule__Group__1_in_rule__TransitionRule__Group__0917);
> rule__TransitionRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1210,10 +1258,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group__0
>+ // $ANTLR end "rule__TransitionRule__Group__0"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group__0__Impl
>+ // $ANTLR start "rule__TransitionRule__Group__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:461:1: rule__TransitionRule__Group__0__Impl : ( ( rule__TransitionRule__Group_0__0 )? ) ;
> public final void rule__TransitionRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -1240,8 +1288,9 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group_0__0_in_rule__TransitionRule__Group__0__Impl944);
> rule__TransitionRule__Group_0__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -1267,10 +1316,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group__0__Impl
>+ // $ANTLR end "rule__TransitionRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group__1
>+ // $ANTLR start "rule__TransitionRule__Group__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:478:1: rule__TransitionRule__Group__1 : rule__TransitionRule__Group__1__Impl rule__TransitionRule__Group__2 ;
> public final void rule__TransitionRule__Group__1() throws RecognitionException {
> 
>@@ -1282,11 +1331,13 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group__1__Impl_in_rule__TransitionRule__Group__1975);
> rule__TransitionRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__TransitionRule__Group__2_in_rule__TransitionRule__Group__1978);
> rule__TransitionRule__Group__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1303,10 +1354,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group__1
>+ // $ANTLR end "rule__TransitionRule__Group__1"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group__1__Impl
>+ // $ANTLR start "rule__TransitionRule__Group__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:490:1: rule__TransitionRule__Group__1__Impl : ( ( rule__TransitionRule__GuardAssignment_1 )? ) ;
> public final void rule__TransitionRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1333,7 +1384,8 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__GuardAssignment_1_in_rule__TransitionRule__Group__1__Impl1005);
> rule__TransitionRule__GuardAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1360,10 +1412,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group__1__Impl
>+ // $ANTLR end "rule__TransitionRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group__2
>+ // $ANTLR start "rule__TransitionRule__Group__2"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:507:1: rule__TransitionRule__Group__2 : rule__TransitionRule__Group__2__Impl ;
> public final void rule__TransitionRule__Group__2() throws RecognitionException {
> 
>@@ -1375,8 +1427,9 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group__2__Impl_in_rule__TransitionRule__Group__21036);
> rule__TransitionRule__Group__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1392,10 +1445,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group__2
>+ // $ANTLR end "rule__TransitionRule__Group__2"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group__2__Impl
>+ // $ANTLR start "rule__TransitionRule__Group__2__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:518:1: rule__TransitionRule__Group__2__Impl : ( ( rule__TransitionRule__EffectAssignment_2 )? ) ;
> public final void rule__TransitionRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -1422,7 +1475,8 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__EffectAssignment_2_in_rule__TransitionRule__Group__2__Impl1063);
> rule__TransitionRule__EffectAssignment_2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1449,10 +1503,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group__2__Impl
>+ // $ANTLR end "rule__TransitionRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0__0
>+ // $ANTLR start "rule__TransitionRule__Group_0__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:541:1: rule__TransitionRule__Group_0__0 : rule__TransitionRule__Group_0__0__Impl rule__TransitionRule__Group_0__1 ;
> public final void rule__TransitionRule__Group_0__0() throws RecognitionException {
> 
>@@ -1464,12 +1518,14 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group_0__0__Impl_in_rule__TransitionRule__Group_0__01100);
> rule__TransitionRule__Group_0__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__TransitionRule__Group_0__1_in_rule__TransitionRule__Group_0__01103);
> rule__TransitionRule__Group_0__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1485,10 +1541,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0__0
>+ // $ANTLR end "rule__TransitionRule__Group_0__0"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0__0__Impl
>+ // $ANTLR start "rule__TransitionRule__Group_0__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:553:1: rule__TransitionRule__Group_0__0__Impl : ( ( rule__TransitionRule__TriggersAssignment_0_0 ) ) ;
> public final void rule__TransitionRule__Group_0__0__Impl() throws RecognitionException {
> 
>@@ -1507,8 +1563,9 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__TriggersAssignment_0_0_in_rule__TransitionRule__Group_0__0__Impl1130);
> rule__TransitionRule__TriggersAssignment_0_0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1531,10 +1588,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0__0__Impl
>+ // $ANTLR end "rule__TransitionRule__Group_0__0__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0__1
>+ // $ANTLR start "rule__TransitionRule__Group_0__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:570:1: rule__TransitionRule__Group_0__1 : rule__TransitionRule__Group_0__1__Impl ;
> public final void rule__TransitionRule__Group_0__1() throws RecognitionException {
> 
>@@ -1546,8 +1603,9 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group_0__1__Impl_in_rule__TransitionRule__Group_0__11160);
> rule__TransitionRule__Group_0__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1563,10 +1621,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0__1
>+ // $ANTLR end "rule__TransitionRule__Group_0__1"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0__1__Impl
>+ // $ANTLR start "rule__TransitionRule__Group_0__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:581:1: rule__TransitionRule__Group_0__1__Impl : ( ( rule__TransitionRule__Group_0_1__0 )* ) ;
> public final void rule__TransitionRule__Group_0__1__Impl() throws RecognitionException {
> 
>@@ -1597,8 +1655,9 @@
> 	 {
> 	 pushFollow(FOLLOW_rule__TransitionRule__Group_0_1__0_in_rule__TransitionRule__Group_0__1__Impl1187);
> 	 rule__TransitionRule__Group_0_1__0();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 }
> 	 break;
>@@ -1627,10 +1686,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0__1__Impl
>+ // $ANTLR end "rule__TransitionRule__Group_0__1__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0_1__0
>+ // $ANTLR start "rule__TransitionRule__Group_0_1__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:602:1: rule__TransitionRule__Group_0_1__0 : rule__TransitionRule__Group_0_1__0__Impl rule__TransitionRule__Group_0_1__1 ;
> public final void rule__TransitionRule__Group_0_1__0() throws RecognitionException {
> 
>@@ -1642,12 +1701,14 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group_0_1__0__Impl_in_rule__TransitionRule__Group_0_1__01222);
> rule__TransitionRule__Group_0_1__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__TransitionRule__Group_0_1__1_in_rule__TransitionRule__Group_0_1__01225);
> rule__TransitionRule__Group_0_1__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1663,10 +1724,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0_1__0
>+ // $ANTLR end "rule__TransitionRule__Group_0_1__0"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0_1__0__Impl
>+ // $ANTLR start "rule__TransitionRule__Group_0_1__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:614:1: rule__TransitionRule__Group_0_1__0__Impl : ( ',' ) ;
> public final void rule__TransitionRule__Group_0_1__0__Impl() throws RecognitionException {
> 
>@@ -1700,10 +1761,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0_1__0__Impl
>+ // $ANTLR end "rule__TransitionRule__Group_0_1__0__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0_1__1
>+ // $ANTLR start "rule__TransitionRule__Group_0_1__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:633:1: rule__TransitionRule__Group_0_1__1 : rule__TransitionRule__Group_0_1__1__Impl ;
> public final void rule__TransitionRule__Group_0_1__1() throws RecognitionException {
> 
>@@ -1715,7 +1776,8 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__Group_0_1__1__Impl_in_rule__TransitionRule__Group_0_1__11284);
> rule__TransitionRule__Group_0_1__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1732,10 +1794,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0_1__1
>+ // $ANTLR end "rule__TransitionRule__Group_0_1__1"
> 
> 
>- // $ANTLR start rule__TransitionRule__Group_0_1__1__Impl
>+ // $ANTLR start "rule__TransitionRule__Group_0_1__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:644:1: rule__TransitionRule__Group_0_1__1__Impl : ( ( rule__TransitionRule__TriggersAssignment_0_1_1 ) ) ;
> public final void rule__TransitionRule__Group_0_1__1__Impl() throws RecognitionException {
> 
>@@ -1754,7 +1816,8 @@
> {
> pushFollow(FOLLOW_rule__TransitionRule__TriggersAssignment_0_1_1_in_rule__TransitionRule__Group_0_1__1__Impl1311);
> rule__TransitionRule__TriggersAssignment_0_1_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1778,10 +1841,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__Group_0_1__1__Impl
>+ // $ANTLR end "rule__TransitionRule__Group_0_1__1__Impl"
> 
> 
>- // $ANTLR start rule__RelativeTimeEventRule__Group__0
>+ // $ANTLR start "rule__RelativeTimeEventRule__Group__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:665:1: rule__RelativeTimeEventRule__Group__0 : rule__RelativeTimeEventRule__Group__0__Impl rule__RelativeTimeEventRule__Group__1 ;
> public final void rule__RelativeTimeEventRule__Group__0() throws RecognitionException {
> 
>@@ -1793,11 +1856,13 @@
> {
> pushFollow(FOLLOW_rule__RelativeTimeEventRule__Group__0__Impl_in_rule__RelativeTimeEventRule__Group__01345);
> rule__RelativeTimeEventRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RelativeTimeEventRule__Group__1_in_rule__RelativeTimeEventRule__Group__01348);
> rule__RelativeTimeEventRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1814,10 +1879,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RelativeTimeEventRule__Group__0
>+ // $ANTLR end "rule__RelativeTimeEventRule__Group__0"
> 
> 
>- // $ANTLR start rule__RelativeTimeEventRule__Group__0__Impl
>+ // $ANTLR start "rule__RelativeTimeEventRule__Group__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:677:1: rule__RelativeTimeEventRule__Group__0__Impl : ( 'after' ) ;
> public final void rule__RelativeTimeEventRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -1851,10 +1916,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RelativeTimeEventRule__Group__0__Impl
>+ // $ANTLR end "rule__RelativeTimeEventRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__RelativeTimeEventRule__Group__1
>+ // $ANTLR start "rule__RelativeTimeEventRule__Group__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:696:1: rule__RelativeTimeEventRule__Group__1 : rule__RelativeTimeEventRule__Group__1__Impl ;
> public final void rule__RelativeTimeEventRule__Group__1() throws RecognitionException {
> 
>@@ -1866,7 +1931,8 @@
> {
> pushFollow(FOLLOW_rule__RelativeTimeEventRule__Group__1__Impl_in_rule__RelativeTimeEventRule__Group__11407);
> rule__RelativeTimeEventRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1883,10 +1949,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RelativeTimeEventRule__Group__1
>+ // $ANTLR end "rule__RelativeTimeEventRule__Group__1"
> 
> 
>- // $ANTLR start rule__RelativeTimeEventRule__Group__1__Impl
>+ // $ANTLR start "rule__RelativeTimeEventRule__Group__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:707:1: rule__RelativeTimeEventRule__Group__1__Impl : ( ( rule__RelativeTimeEventRule__ExprAssignment_1 ) ) ;
> public final void rule__RelativeTimeEventRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1905,8 +1971,9 @@
> {
> pushFollow(FOLLOW_rule__RelativeTimeEventRule__ExprAssignment_1_in_rule__RelativeTimeEventRule__Group__1__Impl1434);
> rule__RelativeTimeEventRule__ExprAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1929,10 +1996,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RelativeTimeEventRule__Group__1__Impl
>+ // $ANTLR end "rule__RelativeTimeEventRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__AbsoluteTimeEventRule__Group__0
>+ // $ANTLR start "rule__AbsoluteTimeEventRule__Group__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:728:1: rule__AbsoluteTimeEventRule__Group__0 : rule__AbsoluteTimeEventRule__Group__0__Impl rule__AbsoluteTimeEventRule__Group__1 ;
> public final void rule__AbsoluteTimeEventRule__Group__0() throws RecognitionException {
> 
>@@ -1944,12 +2011,14 @@
> {
> pushFollow(FOLLOW_rule__AbsoluteTimeEventRule__Group__0__Impl_in_rule__AbsoluteTimeEventRule__Group__01468);
> rule__AbsoluteTimeEventRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__AbsoluteTimeEventRule__Group__1_in_rule__AbsoluteTimeEventRule__Group__01471);
> rule__AbsoluteTimeEventRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1965,10 +2034,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__AbsoluteTimeEventRule__Group__0
>+ // $ANTLR end "rule__AbsoluteTimeEventRule__Group__0"
> 
> 
>- // $ANTLR start rule__AbsoluteTimeEventRule__Group__0__Impl
>+ // $ANTLR start "rule__AbsoluteTimeEventRule__Group__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:740:1: rule__AbsoluteTimeEventRule__Group__0__Impl : ( 'at' ) ;
> public final void rule__AbsoluteTimeEventRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2002,10 +2071,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__AbsoluteTimeEventRule__Group__0__Impl
>+ // $ANTLR end "rule__AbsoluteTimeEventRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__AbsoluteTimeEventRule__Group__1
>+ // $ANTLR start "rule__AbsoluteTimeEventRule__Group__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:759:1: rule__AbsoluteTimeEventRule__Group__1 : rule__AbsoluteTimeEventRule__Group__1__Impl ;
> public final void rule__AbsoluteTimeEventRule__Group__1() throws RecognitionException {
> 
>@@ -2017,8 +2086,9 @@
> {
> pushFollow(FOLLOW_rule__AbsoluteTimeEventRule__Group__1__Impl_in_rule__AbsoluteTimeEventRule__Group__11530);
> rule__AbsoluteTimeEventRule__Group__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2034,10 +2104,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__AbsoluteTimeEventRule__Group__1
>+ // $ANTLR end "rule__AbsoluteTimeEventRule__Group__1"
> 
> 
>- // $ANTLR start rule__AbsoluteTimeEventRule__Group__1__Impl
>+ // $ANTLR start "rule__AbsoluteTimeEventRule__Group__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:770:1: rule__AbsoluteTimeEventRule__Group__1__Impl : ( ( rule__AbsoluteTimeEventRule__ExprAssignment_1 ) ) ;
> public final void rule__AbsoluteTimeEventRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2056,8 +2126,9 @@
> {
> pushFollow(FOLLOW_rule__AbsoluteTimeEventRule__ExprAssignment_1_in_rule__AbsoluteTimeEventRule__Group__1__Impl1557);
> rule__AbsoluteTimeEventRule__ExprAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2080,10 +2151,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__AbsoluteTimeEventRule__Group__1__Impl
>+ // $ANTLR end "rule__AbsoluteTimeEventRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__ChangeEventRule__Group__0
>+ // $ANTLR start "rule__ChangeEventRule__Group__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:791:1: rule__ChangeEventRule__Group__0 : rule__ChangeEventRule__Group__0__Impl rule__ChangeEventRule__Group__1 ;
> public final void rule__ChangeEventRule__Group__0() throws RecognitionException {
> 
>@@ -2095,12 +2166,14 @@
> {
> pushFollow(FOLLOW_rule__ChangeEventRule__Group__0__Impl_in_rule__ChangeEventRule__Group__01591);
> rule__ChangeEventRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ChangeEventRule__Group__1_in_rule__ChangeEventRule__Group__01594);
> rule__ChangeEventRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2116,10 +2189,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ChangeEventRule__Group__0
>+ // $ANTLR end "rule__ChangeEventRule__Group__0"
> 
> 
>- // $ANTLR start rule__ChangeEventRule__Group__0__Impl
>+ // $ANTLR start "rule__ChangeEventRule__Group__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:803:1: rule__ChangeEventRule__Group__0__Impl : ( 'when' ) ;
> public final void rule__ChangeEventRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2153,10 +2226,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ChangeEventRule__Group__0__Impl
>+ // $ANTLR end "rule__ChangeEventRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__ChangeEventRule__Group__1
>+ // $ANTLR start "rule__ChangeEventRule__Group__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:822:1: rule__ChangeEventRule__Group__1 : rule__ChangeEventRule__Group__1__Impl ;
> public final void rule__ChangeEventRule__Group__1() throws RecognitionException {
> 
>@@ -2168,8 +2241,9 @@
> {
> pushFollow(FOLLOW_rule__ChangeEventRule__Group__1__Impl_in_rule__ChangeEventRule__Group__11653);
> rule__ChangeEventRule__Group__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2185,10 +2259,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ChangeEventRule__Group__1
>+ // $ANTLR end "rule__ChangeEventRule__Group__1"
> 
> 
>- // $ANTLR start rule__ChangeEventRule__Group__1__Impl
>+ // $ANTLR start "rule__ChangeEventRule__Group__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:833:1: rule__ChangeEventRule__Group__1__Impl : ( ( rule__ChangeEventRule__ExpAssignment_1 ) ) ;
> public final void rule__ChangeEventRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2207,8 +2281,9 @@
> {
> pushFollow(FOLLOW_rule__ChangeEventRule__ExpAssignment_1_in_rule__ChangeEventRule__Group__1__Impl1680);
> rule__ChangeEventRule__ExpAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2231,10 +2306,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ChangeEventRule__Group__1__Impl
>+ // $ANTLR end "rule__ChangeEventRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__GuardRule__Group__0
>+ // $ANTLR start "rule__GuardRule__Group__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:854:1: rule__GuardRule__Group__0 : rule__GuardRule__Group__0__Impl rule__GuardRule__Group__1 ;
> public final void rule__GuardRule__Group__0() throws RecognitionException {
> 
>@@ -2246,11 +2321,13 @@
> {
> pushFollow(FOLLOW_rule__GuardRule__Group__0__Impl_in_rule__GuardRule__Group__01714);
> rule__GuardRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__GuardRule__Group__1_in_rule__GuardRule__Group__01717);
> rule__GuardRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2267,10 +2344,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__Group__0
>+ // $ANTLR end "rule__GuardRule__Group__0"
> 
> 
>- // $ANTLR start rule__GuardRule__Group__0__Impl
>+ // $ANTLR start "rule__GuardRule__Group__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:866:1: rule__GuardRule__Group__0__Impl : ( '[' ) ;
> public final void rule__GuardRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2304,10 +2381,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__Group__0__Impl
>+ // $ANTLR end "rule__GuardRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__GuardRule__Group__1
>+ // $ANTLR start "rule__GuardRule__Group__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:885:1: rule__GuardRule__Group__1 : rule__GuardRule__Group__1__Impl rule__GuardRule__Group__2 ;
> public final void rule__GuardRule__Group__1() throws RecognitionException {
> 
>@@ -2319,12 +2396,14 @@
> {
> pushFollow(FOLLOW_rule__GuardRule__Group__1__Impl_in_rule__GuardRule__Group__11776);
> rule__GuardRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__GuardRule__Group__2_in_rule__GuardRule__Group__11779);
> rule__GuardRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2340,10 +2419,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__Group__1
>+ // $ANTLR end "rule__GuardRule__Group__1"
> 
> 
>- // $ANTLR start rule__GuardRule__Group__1__Impl
>+ // $ANTLR start "rule__GuardRule__Group__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:897:1: rule__GuardRule__Group__1__Impl : ( ( rule__GuardRule__ConstraintAssignment_1 ) ) ;
> public final void rule__GuardRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2362,8 +2441,9 @@
> {
> pushFollow(FOLLOW_rule__GuardRule__ConstraintAssignment_1_in_rule__GuardRule__Group__1__Impl1806);
> rule__GuardRule__ConstraintAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2386,10 +2466,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__Group__1__Impl
>+ // $ANTLR end "rule__GuardRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__GuardRule__Group__2
>+ // $ANTLR start "rule__GuardRule__Group__2"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:914:1: rule__GuardRule__Group__2 : rule__GuardRule__Group__2__Impl ;
> public final void rule__GuardRule__Group__2() throws RecognitionException {
> 
>@@ -2401,8 +2481,9 @@
> {
> pushFollow(FOLLOW_rule__GuardRule__Group__2__Impl_in_rule__GuardRule__Group__21836);
> rule__GuardRule__Group__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2418,10 +2499,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__Group__2
>+ // $ANTLR end "rule__GuardRule__Group__2"
> 
> 
>- // $ANTLR start rule__GuardRule__Group__2__Impl
>+ // $ANTLR start "rule__GuardRule__Group__2__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:925:1: rule__GuardRule__Group__2__Impl : ( ']' ) ;
> public final void rule__GuardRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -2455,10 +2536,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__Group__2__Impl
>+ // $ANTLR end "rule__GuardRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__EffectRule__Group__0
>+ // $ANTLR start "rule__EffectRule__Group__0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:950:1: rule__EffectRule__Group__0 : rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1 ;
> public final void rule__EffectRule__Group__0() throws RecognitionException {
> 
>@@ -2470,12 +2551,14 @@
> {
> pushFollow(FOLLOW_rule__EffectRule__Group__0__Impl_in_rule__EffectRule__Group__01901);
> rule__EffectRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__EffectRule__Group__1_in_rule__EffectRule__Group__01904);
> rule__EffectRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2491,10 +2574,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__Group__0
>+ // $ANTLR end "rule__EffectRule__Group__0"
> 
> 
>- // $ANTLR start rule__EffectRule__Group__0__Impl
>+ // $ANTLR start "rule__EffectRule__Group__0__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:962:1: rule__EffectRule__Group__0__Impl : ( '/' ) ;
> public final void rule__EffectRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2528,10 +2611,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__Group__0__Impl
>+ // $ANTLR end "rule__EffectRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__EffectRule__Group__1
>+ // $ANTLR start "rule__EffectRule__Group__1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:981:1: rule__EffectRule__Group__1 : rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2 ;
> public final void rule__EffectRule__Group__1() throws RecognitionException {
> 
>@@ -2543,12 +2626,14 @@
> {
> pushFollow(FOLLOW_rule__EffectRule__Group__1__Impl_in_rule__EffectRule__Group__11963);
> rule__EffectRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__EffectRule__Group__2_in_rule__EffectRule__Group__11966);
> rule__EffectRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2564,10 +2649,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__Group__1
>+ // $ANTLR end "rule__EffectRule__Group__1"
> 
> 
>- // $ANTLR start rule__EffectRule__Group__1__Impl
>+ // $ANTLR start "rule__EffectRule__Group__1__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:993:1: rule__EffectRule__Group__1__Impl : ( ( rule__EffectRule__KindAssignment_1 ) ) ;
> public final void rule__EffectRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2586,8 +2671,9 @@
> {
> pushFollow(FOLLOW_rule__EffectRule__KindAssignment_1_in_rule__EffectRule__Group__1__Impl1993);
> rule__EffectRule__KindAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2610,10 +2696,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__Group__1__Impl
>+ // $ANTLR end "rule__EffectRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__EffectRule__Group__2
>+ // $ANTLR start "rule__EffectRule__Group__2"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1010:1: rule__EffectRule__Group__2 : rule__EffectRule__Group__2__Impl ;
> public final void rule__EffectRule__Group__2() throws RecognitionException {
> 
>@@ -2625,8 +2711,9 @@
> {
> pushFollow(FOLLOW_rule__EffectRule__Group__2__Impl_in_rule__EffectRule__Group__22023);
> rule__EffectRule__Group__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2642,10 +2729,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__Group__2
>+ // $ANTLR end "rule__EffectRule__Group__2"
> 
> 
>- // $ANTLR start rule__EffectRule__Group__2__Impl
>+ // $ANTLR start "rule__EffectRule__Group__2__Impl"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1021:1: rule__EffectRule__Group__2__Impl : ( ( rule__EffectRule__BehaviorNameAssignment_2 ) ) ;
> public final void rule__EffectRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -2664,8 +2751,9 @@
> {
> pushFollow(FOLLOW_rule__EffectRule__BehaviorNameAssignment_2_in_rule__EffectRule__Group__2__Impl2050);
> rule__EffectRule__BehaviorNameAssignment_2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2688,10 +2776,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__Group__2__Impl
>+ // $ANTLR end "rule__EffectRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__TransitionRule__TriggersAssignment_0_0
>+ // $ANTLR start "rule__TransitionRule__TriggersAssignment_0_0"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1045:1: rule__TransitionRule__TriggersAssignment_0_0 : ( ruleEventRule ) ;
> public final void rule__TransitionRule__TriggersAssignment_0_0() throws RecognitionException {
> 
>@@ -2707,7 +2795,8 @@
> before(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_0_0()); 
> pushFollow(FOLLOW_ruleEventRule_in_rule__TransitionRule__TriggersAssignment_0_02091);
> ruleEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_0_0()); 
> 
>@@ -2728,10 +2817,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__TriggersAssignment_0_0
>+ // $ANTLR end "rule__TransitionRule__TriggersAssignment_0_0"
> 
> 
>- // $ANTLR start rule__TransitionRule__TriggersAssignment_0_1_1
>+ // $ANTLR start "rule__TransitionRule__TriggersAssignment_0_1_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1060:1: rule__TransitionRule__TriggersAssignment_0_1_1 : ( ruleEventRule ) ;
> public final void rule__TransitionRule__TriggersAssignment_0_1_1() throws RecognitionException {
> 
>@@ -2747,7 +2836,8 @@
> before(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_1_1_0()); 
> pushFollow(FOLLOW_ruleEventRule_in_rule__TransitionRule__TriggersAssignment_0_1_12122);
> ruleEventRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTransitionRuleAccess().getTriggersEventRuleParserRuleCall_0_1_1_0()); 
> 
>@@ -2768,10 +2858,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__TriggersAssignment_0_1_1
>+ // $ANTLR end "rule__TransitionRule__TriggersAssignment_0_1_1"
> 
> 
>- // $ANTLR start rule__TransitionRule__GuardAssignment_1
>+ // $ANTLR start "rule__TransitionRule__GuardAssignment_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1075:1: rule__TransitionRule__GuardAssignment_1 : ( ruleGuardRule ) ;
> public final void rule__TransitionRule__GuardAssignment_1() throws RecognitionException {
> 
>@@ -2787,7 +2877,8 @@
> before(grammarAccess.getTransitionRuleAccess().getGuardGuardRuleParserRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleGuardRule_in_rule__TransitionRule__GuardAssignment_12153);
> ruleGuardRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTransitionRuleAccess().getGuardGuardRuleParserRuleCall_1_0()); 
> 
>@@ -2808,10 +2899,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__GuardAssignment_1
>+ // $ANTLR end "rule__TransitionRule__GuardAssignment_1"
> 
> 
>- // $ANTLR start rule__TransitionRule__EffectAssignment_2
>+ // $ANTLR start "rule__TransitionRule__EffectAssignment_2"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1090:1: rule__TransitionRule__EffectAssignment_2 : ( ruleEffectRule ) ;
> public final void rule__TransitionRule__EffectAssignment_2() throws RecognitionException {
> 
>@@ -2827,7 +2918,8 @@
> before(grammarAccess.getTransitionRuleAccess().getEffectEffectRuleParserRuleCall_2_0()); 
> pushFollow(FOLLOW_ruleEffectRule_in_rule__TransitionRule__EffectAssignment_22184);
> ruleEffectRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTransitionRuleAccess().getEffectEffectRuleParserRuleCall_2_0()); 
> 
>@@ -2848,10 +2940,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TransitionRule__EffectAssignment_2
>+ // $ANTLR end "rule__TransitionRule__EffectAssignment_2"
> 
> 
>- // $ANTLR start rule__CallOrSignalEventRule__OperationOrSignalAssignment
>+ // $ANTLR start "rule__CallOrSignalEventRule__OperationOrSignalAssignment"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1105:1: rule__CallOrSignalEventRule__OperationOrSignalAssignment : ( ( RULE_ID ) ) ;
> public final void rule__CallOrSignalEventRule__OperationOrSignalAssignment() throws RecognitionException {
> 
>@@ -2893,10 +2985,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__CallOrSignalEventRule__OperationOrSignalAssignment
>+ // $ANTLR end "rule__CallOrSignalEventRule__OperationOrSignalAssignment"
> 
> 
>- // $ANTLR start rule__AnyReceiveEventRule__IsAReceiveEventAssignment
>+ // $ANTLR start "rule__AnyReceiveEventRule__IsAReceiveEventAssignment"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1124:1: rule__AnyReceiveEventRule__IsAReceiveEventAssignment : ( ( 'all' ) ) ;
> public final void rule__AnyReceiveEventRule__IsAReceiveEventAssignment() throws RecognitionException {
> 
>@@ -2938,10 +3030,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__AnyReceiveEventRule__IsAReceiveEventAssignment
>+ // $ANTLR end "rule__AnyReceiveEventRule__IsAReceiveEventAssignment"
> 
> 
>- // $ANTLR start rule__RelativeTimeEventRule__ExprAssignment_1
>+ // $ANTLR start "rule__RelativeTimeEventRule__ExprAssignment_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1147:1: rule__RelativeTimeEventRule__ExprAssignment_1 : ( RULE_STRING ) ;
> public final void rule__RelativeTimeEventRule__ExprAssignment_1() throws RecognitionException {
> 
>@@ -2975,10 +3067,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RelativeTimeEventRule__ExprAssignment_1
>+ // $ANTLR end "rule__RelativeTimeEventRule__ExprAssignment_1"
> 
> 
>- // $ANTLR start rule__AbsoluteTimeEventRule__ExprAssignment_1
>+ // $ANTLR start "rule__AbsoluteTimeEventRule__ExprAssignment_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1162:1: rule__AbsoluteTimeEventRule__ExprAssignment_1 : ( RULE_STRING ) ;
> public final void rule__AbsoluteTimeEventRule__ExprAssignment_1() throws RecognitionException {
> 
>@@ -3012,10 +3104,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__AbsoluteTimeEventRule__ExprAssignment_1
>+ // $ANTLR end "rule__AbsoluteTimeEventRule__ExprAssignment_1"
> 
> 
>- // $ANTLR start rule__ChangeEventRule__ExpAssignment_1
>+ // $ANTLR start "rule__ChangeEventRule__ExpAssignment_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1177:1: rule__ChangeEventRule__ExpAssignment_1 : ( RULE_STRING ) ;
> public final void rule__ChangeEventRule__ExpAssignment_1() throws RecognitionException {
> 
>@@ -3049,10 +3141,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ChangeEventRule__ExpAssignment_1
>+ // $ANTLR end "rule__ChangeEventRule__ExpAssignment_1"
> 
> 
>- // $ANTLR start rule__GuardRule__ConstraintAssignment_1
>+ // $ANTLR start "rule__GuardRule__ConstraintAssignment_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1192:1: rule__GuardRule__ConstraintAssignment_1 : ( RULE_STRING ) ;
> public final void rule__GuardRule__ConstraintAssignment_1() throws RecognitionException {
> 
>@@ -3086,10 +3178,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__GuardRule__ConstraintAssignment_1
>+ // $ANTLR end "rule__GuardRule__ConstraintAssignment_1"
> 
> 
>- // $ANTLR start rule__EffectRule__KindAssignment_1
>+ // $ANTLR start "rule__EffectRule__KindAssignment_1"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1207:1: rule__EffectRule__KindAssignment_1 : ( ruleBehaviorKind ) ;
> public final void rule__EffectRule__KindAssignment_1() throws RecognitionException {
> 
>@@ -3105,7 +3197,8 @@
> before(grammarAccess.getEffectRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleBehaviorKind_in_rule__EffectRule__KindAssignment_12422);
> ruleBehaviorKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEffectRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 
>@@ -3126,10 +3219,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__KindAssignment_1
>+ // $ANTLR end "rule__EffectRule__KindAssignment_1"
> 
> 
>- // $ANTLR start rule__EffectRule__BehaviorNameAssignment_2
>+ // $ANTLR start "rule__EffectRule__BehaviorNameAssignment_2"
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1222:1: rule__EffectRule__BehaviorNameAssignment_2 : ( RULE_ID ) ;
> public final void rule__EffectRule__BehaviorNameAssignment_2() throws RecognitionException {
> 
>@@ -3163,8 +3256,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EffectRule__BehaviorNameAssignment_2
>+ // $ANTLR end "rule__EffectRule__BehaviorNameAssignment_2"
> 
>+ // Delegated rules
>+
> 
> 
> 
>@@ -3208,15 +3303,15 @@
> public static final BitSet FOLLOW_11_in_rule__BehaviorKind__Alternatives839 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_12_in_rule__BehaviorKind__Alternatives860 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_13_in_rule__BehaviorKind__Alternatives881 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__TransitionRule__Group__0__Impl_in_rule__TransitionRule__Group__0914 = new BitSet(new long[]{0x0000000000140002L});
>+ public static final BitSet FOLLOW_rule__TransitionRule__Group__0__Impl_in_rule__TransitionRule__Group__0914 = new BitSet(new long[]{0x0000000000140000L});
> public static final BitSet FOLLOW_rule__TransitionRule__Group__1_in_rule__TransitionRule__Group__0917 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__TransitionRule__Group_0__0_in_rule__TransitionRule__Group__0__Impl944 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__TransitionRule__Group__1__Impl_in_rule__TransitionRule__Group__1975 = new BitSet(new long[]{0x0000000000100002L});
>+ public static final BitSet FOLLOW_rule__TransitionRule__Group__1__Impl_in_rule__TransitionRule__Group__1975 = new BitSet(new long[]{0x0000000000140000L});
> public static final BitSet FOLLOW_rule__TransitionRule__Group__2_in_rule__TransitionRule__Group__1978 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__TransitionRule__GuardAssignment_1_in_rule__TransitionRule__Group__1__Impl1005 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__TransitionRule__Group__2__Impl_in_rule__TransitionRule__Group__21036 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__TransitionRule__EffectAssignment_2_in_rule__TransitionRule__Group__2__Impl1063 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__TransitionRule__Group_0__0__Impl_in_rule__TransitionRule__Group_0__01100 = new BitSet(new long[]{0x0000000000004002L});
>+ public static final BitSet FOLLOW_rule__TransitionRule__Group_0__0__Impl_in_rule__TransitionRule__Group_0__01100 = new BitSet(new long[]{0x0000000000004000L});
> public static final BitSet FOLLOW_rule__TransitionRule__Group_0__1_in_rule__TransitionRule__Group_0__01103 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__TransitionRule__TriggersAssignment_0_0_in_rule__TransitionRule__Group_0__0__Impl1130 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__TransitionRule__Group_0__1__Impl_in_rule__TransitionRule__Group_0__11160 = new BitSet(new long[]{0x0000000000000002L});
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransitionLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransitionLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransitionLexer.java	(working copy)
>@@ -13,240 +13,270 @@
> @SuppressWarnings("all")
> public class InternalUmlTransitionLexer extends Lexer {
> public static final int RULE_ID=4;
>+ public static final int T__21=21;
> public static final int RULE_ANY_OTHER=10;
>- public static final int Tokens=22;
>+ public static final int T__20=20;
> public static final int EOF=-1;
> public static final int RULE_SL_COMMENT=8;
>- public static final int T21=21;
>- public static final int T20=20;
> public static final int RULE_ML_COMMENT=7;
>+ public static final int T__19=19;
> public static final int RULE_STRING=5;
>+ 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
> public static final int RULE_INT=6;
>- public static final int T11=11;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
> public static final int RULE_WS=9;
>- public static final int T15=15;
>- public static final int T16=16;
>- public static final int T17=17;
>- public static final int T18=18;
>- public static final int T19=19;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlTransitionLexer() {;} 
> public InternalUmlTransitionLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlTransitionLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g"; }
> 
>- // $ANTLR start T11
>- public final void mT11() throws RecognitionException {
>+ // $ANTLR start "T__11"
>+ public final void mT__11() throws RecognitionException {
> try {
>- int _type = T11;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:10:5: ( 'Activity' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:10:7: 'Activity'
>+ int _type = T__11;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:11:7: ( 'Activity' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:11:9: 'Activity'
> {
> match("Activity"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T11
>+ // $ANTLR end "T__11"
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:11:5: ( 'StateMachine' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:11:7: 'StateMachine'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:12:7: ( 'StateMachine' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:12:9: 'StateMachine'
> {
> match("StateMachine"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:12:5: ( 'OpaqueBehavior' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:12:7: 'OpaqueBehavior'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:13:7: ( 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:13:9: 'OpaqueBehavior'
> {
> match("OpaqueBehavior"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:13:5: ( ',' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:13:7: ','
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:14:7: ( ',' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:14:9: ','
> {
> match(','); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:14:5: ( 'after' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:14:7: 'after'
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:15:7: ( 'after' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:15:9: 'after'
> {
> match("after"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:15:5: ( 'at' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:15:7: 'at'
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:16:7: ( 'at' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:16:9: 'at'
> {
> match("at"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start T17
>- public final void mT17() throws RecognitionException {
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
> try {
>- int _type = T17;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:16:5: ( 'when' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:16:7: 'when'
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:17:7: ( 'when' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:17:9: 'when'
> {
> match("when"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T17
>+ // $ANTLR end "T__17"
> 
>- // $ANTLR start T18
>- public final void mT18() throws RecognitionException {
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
> try {
>- int _type = T18;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:17:5: ( '[' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:17:7: '['
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:18:7: ( '[' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:18:9: '['
> {
> match('['); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T18
>+ // $ANTLR end "T__18"
> 
>- // $ANTLR start T19
>- public final void mT19() throws RecognitionException {
>+ // $ANTLR start "T__19"
>+ public final void mT__19() throws RecognitionException {
> try {
>- int _type = T19;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:18:5: ( ']' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:18:7: ']'
>+ int _type = T__19;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:19:7: ( ']' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:19:9: ']'
> {
> match(']'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T19
>+ // $ANTLR end "T__19"
> 
>- // $ANTLR start T20
>- public final void mT20() throws RecognitionException {
>+ // $ANTLR start "T__20"
>+ public final void mT__20() throws RecognitionException {
> try {
>- int _type = T20;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:19:5: ( '/' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:19:7: '/'
>+ int _type = T__20;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:20:7: ( '/' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:20:9: '/'
> {
> match('/'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T20
>+ // $ANTLR end "T__20"
> 
>- // $ANTLR start T21
>- public final void mT21() throws RecognitionException {
>+ // $ANTLR start "T__21"
>+ public final void mT__21() throws RecognitionException {
> try {
>- int _type = T21;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:20:5: ( 'all' )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:20:7: 'all'
>+ int _type = T__21;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:21:7: ( 'all' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:21:9: 'all'
> {
> match("all"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T21
>+ // $ANTLR end "T__21"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1238:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1238:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>@@ -273,10 +303,9 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1238:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop2:
>@@ -298,10 +327,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -315,17 +343,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1240:10: ( ( '0' .. '9' )+ )
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1240:12: ( '0' .. '9' )+
> {
>@@ -362,21 +392,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -388,16 +420,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("1242:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop4:
> do {
> int alt4=3;
>@@ -406,41 +438,39 @@
> if ( (LA4_0=='\\') ) {
> alt4=1;
> }
>- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
>+ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
> alt4=2;
> }
> 
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -456,10 +486,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -468,41 +498,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1242:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -523,17 +551,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1244:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1244:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
>@@ -551,13 +581,13 @@
> if ( (LA7_1=='/') ) {
> alt7=2;
> }
>- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
>+ else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
> alt7=1;
> }
> 
>@@ -581,17 +611,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1246:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1246:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
>@@ -603,7 +635,7 @@
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
>+ if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
>@@ -612,15 +644,14 @@
> 	case 1 :
> 	 // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1246: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -670,17 +701,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1248:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1248:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>@@ -705,10 +738,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -726,17 +758,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1250:16: ( . )
> // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1250:18: .
> {
>@@ -744,513 +778,140 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt12=18;
>- int LA12_0 = input.LA(1);
>-
>- if ( (LA12_0=='A') ) {
>- int LA12_1 = input.LA(2);
>-
>- if ( (LA12_1=='c') ) {
>- int LA12_17 = input.LA(3);
>-
>- if ( (LA12_17=='t') ) {
>- int LA12_34 = input.LA(4);
>-
>- if ( (LA12_34=='i') ) {
>- int LA12_41 = input.LA(5);
>-
>- if ( (LA12_41=='v') ) {
>- int LA12_47 = input.LA(6);
>-
>- if ( (LA12_47=='i') ) {
>- int LA12_52 = input.LA(7);
>-
>- if ( (LA12_52=='t') ) {
>- int LA12_56 = input.LA(8);
>-
>- if ( (LA12_56=='y') ) {
>- int LA12_59 = input.LA(9);
>-
>- if ( ((LA12_59>='0' && LA12_59<='9')||(LA12_59>='A' && LA12_59<='Z')||LA12_59=='_'||(LA12_59>='a' && LA12_59<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=1;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='S') ) {
>- int LA12_2 = input.LA(2);
>-
>- if ( (LA12_2=='t') ) {
>- int LA12_19 = input.LA(3);
>-
>- if ( (LA12_19=='a') ) {
>- int LA12_35 = input.LA(4);
>-
>- if ( (LA12_35=='t') ) {
>- int LA12_42 = input.LA(5);
>-
>- if ( (LA12_42=='e') ) {
>- int LA12_48 = input.LA(6);
>-
>- if ( (LA12_48=='M') ) {
>- int LA12_53 = input.LA(7);
>-
>- if ( (LA12_53=='a') ) {
>- int LA12_57 = input.LA(8);
>-
>- if ( (LA12_57=='c') ) {
>- int LA12_60 = input.LA(9);
>-
>- if ( (LA12_60=='h') ) {
>- int LA12_63 = input.LA(10);
>-
>- if ( (LA12_63=='i') ) {
>- int LA12_65 = input.LA(11);
>-
>- if ( (LA12_65=='n') ) {
>- int LA12_67 = input.LA(12);
>-
>- if ( (LA12_67=='e') ) {
>- int LA12_69 = input.LA(13);
>-
>- if ( ((LA12_69>='0' && LA12_69<='9')||(LA12_69>='A' && LA12_69<='Z')||LA12_69=='_'||(LA12_69>='a' && LA12_69<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=2;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='O') ) {
>- int LA12_3 = input.LA(2);
>-
>- if ( (LA12_3=='p') ) {
>- int LA12_20 = input.LA(3);
>-
>- if ( (LA12_20=='a') ) {
>- int LA12_36 = input.LA(4);
>-
>- if ( (LA12_36=='q') ) {
>- int LA12_43 = input.LA(5);
>-
>- if ( (LA12_43=='u') ) {
>- int LA12_49 = input.LA(6);
>-
>- if ( (LA12_49=='e') ) {
>- int LA12_54 = input.LA(7);
>-
>- if ( (LA12_54=='B') ) {
>- int LA12_58 = input.LA(8);
>-
>- if ( (LA12_58=='e') ) {
>- int LA12_61 = input.LA(9);
>-
>- if ( (LA12_61=='h') ) {
>- int LA12_64 = input.LA(10);
>-
>- if ( (LA12_64=='a') ) {
>- int LA12_66 = input.LA(11);
>-
>- if ( (LA12_66=='v') ) {
>- int LA12_68 = input.LA(12);
>-
>- if ( (LA12_68=='i') ) {
>- int LA12_70 = input.LA(13);
>-
>- if ( (LA12_70=='o') ) {
>- int LA12_72 = input.LA(14);
>-
>- if ( (LA12_72=='r') ) {
>- int LA12_73 = input.LA(15);
>-
>- if ( ((LA12_73>='0' && LA12_73<='9')||(LA12_73>='A' && LA12_73<='Z')||LA12_73=='_'||(LA12_73>='a' && LA12_73<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=3;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0==',') ) {
>- alt12=4;
>- }
>- else if ( (LA12_0=='a') ) {
>- switch ( input.LA(2) ) {
>- case 'f':
>- {
>- int LA12_22 = input.LA(3);
>-
>- if ( (LA12_22=='t') ) {
>- int LA12_37 = input.LA(4);
>-
>- if ( (LA12_37=='e') ) {
>- int LA12_44 = input.LA(5);
>-
>- if ( (LA12_44=='r') ) {
>- int LA12_50 = input.LA(6);
>-
>- if ( ((LA12_50>='0' && LA12_50<='9')||(LA12_50>='A' && LA12_50<='Z')||LA12_50=='_'||(LA12_50>='a' && LA12_50<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=5;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- break;
>- case 't':
>- {
>- int LA12_23 = input.LA(3);
>-
>- if ( ((LA12_23>='0' && LA12_23<='9')||(LA12_23>='A' && LA12_23<='Z')||LA12_23=='_'||(LA12_23>='a' && LA12_23<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=6;}
>- }
>- break;
>- case 'l':
>- {
>- int LA12_24 = input.LA(3);
>-
>- if ( (LA12_24=='l') ) {
>- int LA12_39 = input.LA(4);
>-
>- if ( ((LA12_39>='0' && LA12_39<='9')||(LA12_39>='A' && LA12_39<='Z')||LA12_39=='_'||(LA12_39>='a' && LA12_39<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=11;}
>- }
>- else {
>- alt12=12;}
>- }
>- break;
>- default:
>- alt12=12;}
>-
>- }
>- else if ( (LA12_0=='w') ) {
>- int LA12_6 = input.LA(2);
>-
>- if ( (LA12_6=='h') ) {
>- int LA12_25 = input.LA(3);
>-
>- if ( (LA12_25=='e') ) {
>- int LA12_40 = input.LA(4);
>-
>- if ( (LA12_40=='n') ) {
>- int LA12_46 = input.LA(5);
>-
>- if ( ((LA12_46>='0' && LA12_46<='9')||(LA12_46>='A' && LA12_46<='Z')||LA12_46=='_'||(LA12_46>='a' && LA12_46<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=7;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else {
>- alt12=12;}
>- }
>- else if ( (LA12_0=='[') ) {
>- alt12=8;
>- }
>- else if ( (LA12_0==']') ) {
>- alt12=9;
>- }
>- else if ( (LA12_0=='/') ) {
>- switch ( input.LA(2) ) {
>- case '*':
>- {
>- alt12=15;
>- }
>- break;
>- case '/':
>- {
>- alt12=16;
>- }
>- break;
>- default:
>- alt12=10;}
>-
>- }
>- else if ( (LA12_0=='^') ) {
>- int LA12_10 = input.LA(2);
>-
>- if ( ((LA12_10>='A' && LA12_10<='Z')||LA12_10=='_'||(LA12_10>='a' && LA12_10<='z')) ) {
>- alt12=12;
>- }
>- else {
>- alt12=18;}
>- }
>- else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='b' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {
>- alt12=12;
>- }
>- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
>- alt12=13;
>- }
>- else if ( (LA12_0=='\"') ) {
>- int LA12_13 = input.LA(2);
>-
>- if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFE')) ) {
>- alt12=14;
>- }
>- else {
>- alt12=18;}
>- }
>- else if ( (LA12_0=='\'') ) {
>- int LA12_14 = input.LA(2);
>-
>- if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFE')) ) {
>- alt12=14;
>- }
>- else {
>- alt12=18;}
>- }
>- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
>- alt12=17;
>- }
>- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
>- alt12=18;
>- }
>- else {
>- NoViableAltException nvae =
>- new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
>-
>- throw nvae;
>- }
>+ alt12 = dfa12.predict(input);
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:10: T11
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:10: T__11
> {
>- mT11(); 
>+ mT__11(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:14: T12
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:16: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:18: T13
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:22: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:22: T14
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:28: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:26: T15
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:34: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:30: T16
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:40: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:34: T17
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:46: T__17
> {
>- mT17(); 
>+ mT__17(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:38: T18
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:52: T__18
> {
>- mT18(); 
>+ mT__18(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:42: T19
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:58: T__19
> {
>- mT19(); 
>+ mT__19(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:46: T20
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:64: T__20
> {
>- mT20(); 
>+ mT__20(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:50: T21
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:70: T__21
> {
>- mT21(); 
>+ mT__21(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:54: RULE_ID
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:76: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:62: RULE_INT
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:84: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 14 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:71: RULE_STRING
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:93: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 15 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:83: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:105: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 16 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:99: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:121: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 17 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:115: RULE_WS
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:137: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 18 :
>- // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:123: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.transition.editor.xtext.ui/src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.g:1:145: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -1262,6 +923,218 @@
> }
> 
> 
>+ protected DFA12 dfa12 = new DFA12(this);
>+ static final String DFA12_eotS =
>+ "\1\uffff\3\22\1\uffff\2\22\2\uffff\1\36\1\20\2\uffff\2\20\2\uffff"+
>+ "\1\22\1\uffff\2\22\1\uffff\1\22\1\46\2\22\10\uffff\4\22\1\uffff"+
>+ "\1\55\5\22\1\uffff\1\63\3\22\1\67\1\uffff\3\22\1\uffff\3\22\1\76"+
>+ "\2\22\1\uffff\6\22\1\107\1\22\1\uffff\1\22\1\112\1\uffff";
>+ static final String DFA12_eofS =
>+ "\113\uffff";
>+ static final String DFA12_minS =
>+ "\1\0\1\143\1\164\1\160\1\uffff\1\146\1\150\2\uffff\1\52\1\101\2"+
>+ "\uffff\2\0\2\uffff\1\164\1\uffff\2\141\1\uffff\1\164\1\60\1\154"+
>+ "\1\145\10\uffff\1\151\1\164\1\161\1\145\1\uffff\1\60\1\156\1\166"+
>+ "\1\145\1\165\1\162\1\uffff\1\60\1\151\1\115\1\145\1\60\1\uffff\1"+
>+ "\164\1\141\1\102\1\uffff\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 DFA12_maxS =
>+ "\1\uffff\1\143\1\164\1\160\1\uffff\1\164\1\150\2\uffff\1\57\1\172"+
>+ "\2\uffff\2\uffff\2\uffff\1\164\1\uffff\2\141\1\uffff\1\164\1\172"+
>+ "\1\154\1\145\10\uffff\1\151\1\164\1\161\1\145\1\uffff\1\172\1\156"+
>+ "\1\166\1\145\1\165\1\162\1\uffff\1\172\1\151\1\115\1\145\1\172\1"+
>+ "\uffff\1\164\1\141\1\102\1\uffff\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 DFA12_acceptS =
>+ "\4\uffff\1\4\2\uffff\1\10\1\11\2\uffff\1\14\1\15\2\uffff\1\21\1"+
>+ "\22\1\uffff\1\14\2\uffff\1\4\4\uffff\1\10\1\11\1\17\1\20\1\12\1"+
>+ "\15\1\16\1\21\4\uffff\1\6\6\uffff\1\13\5\uffff\1\7\3\uffff\1\5\6"+
>+ "\uffff\1\1\10\uffff\1\2\2\uffff\1\3";
>+ static final String DFA12_specialS =
>+ "\1\1\14\uffff\1\2\1\0\74\uffff}>";
>+ static final String[] DFA12_transitionS = {
>+ "\11\20\2\17\2\20\1\17\22\20\1\17\1\20\1\15\4\20\1\16\4\20\1"+
>+ "\4\2\20\1\11\12\14\7\20\1\1\15\13\1\3\3\13\1\2\7\13\1\7\1\20"+
>+ "\1\10\1\12\1\13\1\20\1\5\25\13\1\6\3\13\uff85\20",
>+ "\1\21",
>+ "\1\23",
>+ "\1\24",
>+ "",
>+ "\1\26\5\uffff\1\30\7\uffff\1\27",
>+ "\1\31",
>+ "",
>+ "",
>+ "\1\34\4\uffff\1\35",
>+ "\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "",
>+ "",
>+ "\0\40",
>+ "\0\40",
>+ "",
>+ "",
>+ "\1\42",
>+ "",
>+ "\1\43",
>+ "\1\44",
>+ "",
>+ "\1\45",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "\1\47",
>+ "\1\50",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\51",
>+ "\1\52",
>+ "\1\53",
>+ "\1\54",
>+ "",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "\1\56",
>+ "\1\57",
>+ "\1\60",
>+ "\1\61",
>+ "\1\62",
>+ "",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "\1\64",
>+ "\1\65",
>+ "\1\66",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "",
>+ "\1\70",
>+ "\1\71",
>+ "\1\72",
>+ "",
>+ "\1\73",
>+ "\1\74",
>+ "\1\75",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "\1\77",
>+ "\1\100",
>+ "",
>+ "\1\101",
>+ "\1\102",
>+ "\1\103",
>+ "\1\104",
>+ "\1\105",
>+ "\1\106",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ "\1\110",
>+ "",
>+ "\1\111",
>+ "\12\22\7\uffff\32\22\4\uffff\1\22\1\uffff\32\22",
>+ ""
>+ };
>+
>+ static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
>+ static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
>+ static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
>+ static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
>+ static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
>+ static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
>+ static final short[][] DFA12_transition;
>+
>+ static {
>+ int numStates = DFA12_transitionS.length;
>+ DFA12_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
>+ }
>+ }
>+
>+ class DFA12 extends DFA {
>+
>+ public DFA12(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 12;
>+ this.eot = DFA12_eot;
>+ this.eof = DFA12_eof;
>+ this.min = DFA12_min;
>+ this.max = DFA12_max;
>+ this.accept = DFA12_accept;
>+ this.special = DFA12_special;
>+ this.transition = DFA12_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA12_14 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_14>='\u0000' && LA12_14<='\uFFFF')) ) {s = 32;}
>+
>+ else s = 16;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA12_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA12_0=='A') ) {s = 1;}
>+
>+ else if ( (LA12_0=='S') ) {s = 2;}
>+
>+ else if ( (LA12_0=='O') ) {s = 3;}
>+
>+ else if ( (LA12_0==',') ) {s = 4;}
>+
>+ else if ( (LA12_0=='a') ) {s = 5;}
>+
>+ else if ( (LA12_0=='w') ) {s = 6;}
>+
>+ else if ( (LA12_0=='[') ) {s = 7;}
>+
>+ else if ( (LA12_0==']') ) {s = 8;}
>+
>+ else if ( (LA12_0=='/') ) {s = 9;}
>+
>+ else if ( (LA12_0=='^') ) {s = 10;}
>+
>+ else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='b' && LA12_0<='v')||(LA12_0>='x' && LA12_0<='z')) ) {s = 11;}
>+
>+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 12;}
>+
>+ else if ( (LA12_0=='\"') ) {s = 13;}
>+
>+ else if ( (LA12_0=='\'') ) {s = 14;}
>+
>+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 15;}
>+
>+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 16;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA12_13 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFF')) ) {s = 32;}
>+
>+ else s = 16;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 12, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
> 
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/transition/editor/xtext/ui/contentassist/antlr/internal/InternalUmlTransition.tokens	(working copy)
>@@ -1,10 +1,21 @@
> RULE_ID=4
>-RULE_STRING=5
> RULE_ANY_OTHER=10
>-RULE_INT=6
>-RULE_WS=9
>+T__21=21
>+T__20=20
> RULE_SL_COMMENT=8
> RULE_ML_COMMENT=7
>+T__19=19
>+RULE_STRING=5
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__11=11
>+T__14=14
>+T__13=13
>+RULE_INT=6
>+RULE_WS=9
> 'after'=15
> 'when'=17
> '/'=20
>Index: src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,22 +0,0 @@
>-/*
>-* generated by Xtext
>-*/
>-package org.eclipse.papyrus.transition.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UmlTransitionOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = { 
>-		// provide list of classes to adapt to, e.g.:
>-		// Entity.class
>-		// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>-
>Index: src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.transition.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlTransitionOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>Index: src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/transition/editor/xtext/ui/outline/UmlTransitionTransformer.java	(working copy)
>@@ -1,14 +0,0 @@
>-/*
>-* generated by Xtext
>-*/
>-package org.eclipse.papyrus.transition.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UmlTransitionTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-	
>-}
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>#P org.eclipse.papyrus.parameter.editor.xtext.ui
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/AbstractUmlParameterUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/AbstractUmlParameterUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/AbstractUmlParameterUiModule.java	(working copy)
>@@ -1,3 +1,4 @@
>+
> /*
> * generated by Xtext
> */
>@@ -11,33 +12,23 @@
> */
> @SuppressWarnings("all")
> public abstract class AbstractUmlParameterUiModule extends DefaultUiModule {
>-
>+	
> 	public AbstractUmlParameterUiModule(AbstractUIPlugin plugin) {
> 		super(plugin);
> 	}
>-
>-
>+	
>+	
> 	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
> 	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
> 		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.FastDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal.InternalUmlParameterLexer.class);
> 	}
>@@ -47,9 +38,14 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.builderState.ShadowingResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>@@ -77,14 +73,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.parameter.editor.xtext.ui.labeling.UmlParameterDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.parameter.editor.xtext.ui.outline.UmlParameterTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.parameter.editor.xtext.ui.outline.UmlParameterOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.parameter.editor.xtext.ui.outline.UmlParameterOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.parameter.editor.xtext.ui.outline.UmlParameterOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/UmlParameterExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/UmlParameterExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/UmlParameterExecutableExtensionFactory.java	(working copy)
>@@ -1,7 +1,6 @@
> /*
> * generated by Xtext
> */
>-
> package org.eclipse.papyrus.parameter.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -10,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- * @generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlParameterExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>@@ -18,10 +18,10 @@
> 	protected Bundle getBundle() {
> 		return org.eclipse.papyrus.parameter.editor.xtext.ui.internal.UmlParameterActivator.getInstance().getBundle();
> 	}
>-
>+	
> 	@Override
> 	protected Injector getInjector() {
> 		return org.eclipse.papyrus.parameter.editor.xtext.ui.internal.UmlParameterActivator.getInstance().getInjector("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter");
> 	}
>-
>+	
> }
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/AbstractUmlParameterProposalProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/AbstractUmlParameterProposalProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/AbstractUmlParameterProposalProvider.java	(working copy)
>@@ -1,6 +1,6 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist;
> 
> import org.eclipse.emf.ecore.EObject;
>@@ -11,72 +11,58 @@
> 
> /**
> * Represents a generated, default implementation of interface {@link IProposalProvider}.
>- * Methods are dynamically dispatched on the first parameter, i.e., you can override them
>- * with a more concrete subtype.
>+ * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
>+ * with a more concrete subtype. 
> */
> @SuppressWarnings("all")
> public class AbstractUmlParameterProposalProvider extends UmlCommonProposalProvider {
>-
>+		
> 	public void completeParameterRule_Visibility(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeParameterRule_Direction(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeParameterRule_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeParameterRule_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeParameterRule_Multiplicity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeParameterRule_Modifiers(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeParameterRule_Effect(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeModifiersRule_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeModifierSpecification_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeEffectRule_EffectKind(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
>+ 
> 	public void complete_ParameterRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_ModifiersRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_ModifierSpecification(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_ModifierKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_EffectKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_EffectRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/UmlParameterParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/UmlParameterParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/UmlParameterParser.java	(working copy)
>@@ -1,6 +1,6 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr;
> 
> import java.util.Collection;
>@@ -18,24 +18,23 @@
> import org.eclipse.papyrus.parameter.editor.xtext.services.UmlParameterGrammarAccess;
> 
> public class UmlParameterParser extends AbstractContentAssistParser {
>-
>+	
> 	@Inject
> 	private UmlParameterGrammarAccess grammarAccess;
>-
>+	
> 	private Map<AbstractElement, String> nameMappings;
>-
>+	
> 	@Override
> 	protected org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser createParser() {
> 		org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser result = new org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser(null);
> 		result.setGrammarAccess(grammarAccess);
> 		return result;
> 	}
>-
>+	
> 	@Override
> 	protected String getRuleName(AbstractElement element) {
>-		if(nameMappings == null) {
>+		if (nameMappings == null) {
> 			nameMappings = new HashMap<AbstractElement, String>() {
>-
> 				private static final long serialVersionUID = 1L;
> 				{
> 					put(grammarAccess.getParameterRuleAccess().getAlternatives_4(), "rule__ParameterRule__Alternatives_4");
>@@ -74,27 +73,27 @@
> 		}
> 		return nameMappings.get(element);
> 	}
>-
>+	
> 	@Override
> 	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
> 		try {
>-			org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser typedParser = (org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser)parser;
>+			org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser typedParser = (org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal.InternalUmlParameterParser) parser;
> 			typedParser.entryRuleParameterRule();
> 			return typedParser.getFollowElements();
>-		} catch (RecognitionException ex) {
>+		} catch(RecognitionException ex) {
> 			throw new RuntimeException(ex);
>-		}
>+		}		
> 	}
>-
>+	
> 	@Override
> 	protected String[] getInitialHiddenTokens() {
>-		return new String[]{ "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
>+		return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
> 	}
>-
>+	
> 	public UmlParameterGrammarAccess getGrammarAccess() {
> 		return this.grammarAccess;
> 	}
>-
>+	
> 	public void setGrammarAccess(UmlParameterGrammarAccess grammarAccess) {
> 		this.grammarAccess = grammarAccess;
> 	}
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameterLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameterLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameterLexer.java	(working copy)
>@@ -1,22 +1,10 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.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.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
> 
>+
> import org.antlr.runtime.*;
> import java.util.Stack;
> import java.util.List;
>@@ -24,1438 +12,1722 @@
> 
> @SuppressWarnings("all")
> public class InternalUmlParameterLexer extends Lexer {
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int T29 = 29;
>-
>-	public static final int T28 = 28;
>-
>-	public static final int T27 = 27;
>-
>-	public static final int T26 = 26;
>-
>-	public static final int T25 = 25;
>-
>-	public static final int Tokens = 38;
>-
>-	public static final int T24 = 24;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int T23 = 23;
>-
>-	public static final int T22 = 22;
>-
>-	public static final int T21 = 21;
>-
>-	public static final int T20 = 20;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int T37 = 37;
>-
>-	public static final int T12 = 12;
>-
>-	public static final int T13 = 13;
>-
>-	public static final int T14 = 14;
>-
>-	public static final int T34 = 34;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int T15 = 15;
>-
>-	public static final int T33 = 33;
>+ public static final int RULE_ID=4;
>+ public static final int T__29=29;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
>+ public static final int EOF=-1;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int RULE_ML_COMMENT=8;
>+ public static final int T__19=19;
>+ public static final int T__30=30;
>+ public static final int T__31=31;
>+ public static final int T__32=32;
>+ public static final int RULE_STRING=7;
>+ public static final int T__16=16;
>+ public static final int T__33=33;
>+ public static final int T__15=15;
>+ public static final int T__34=34;
>+ public static final int T__18=18;
>+ public static final int T__35=35;
>+ public static final int T__17=17;
>+ public static final int T__36=36;
>+ public static final int T__12=12;
>+ public static final int T__37=37;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
> 
>-	public static final int T16 = 16;
>+ // delegates
>+ // delegators
> 
>-	public static final int T36 = 36;
>+ public InternalUmlParameterLexer() {;} 
>+ public InternalUmlParameterLexer(CharStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlParameterLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
> 
>-	public static final int T17 = 17;
>+ }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g"; }
> 
>-	public static final int T35 = 35;
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
>+ try {
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:11:7: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:11:9: '<Undefined>'
>+ {
>+ match("<Undefined>"); 
> 
>-	public static final int T18 = 18;
> 
>-	public static final int T30 = 30;
>+ }
> 
>-	public static final int T19 = 19;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__12"
> 
>-	public static final int T32 = 32;
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
>+ try {
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:12:7: ( 'exception' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:12:9: 'exception'
>+ {
>+ match("exception"); 
> 
>-	public static final int T31 = 31;
> 
>-	public InternalUmlParameterLexer() {
>-		;
>-	}
>+ }
> 
>-	public InternalUmlParameterLexer(CharStream input) {
>-		super(input);
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__13"
> 
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g";
>-	}
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
>+ try {
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:13:7: ( 'stream' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:13:9: 'stream'
>+ {
>+ match("stream"); 
> 
>-	// $ANTLR start T12
>-	public final void mT12() throws RecognitionException {
>-		try {
>-			int _type = T12;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:10:5: ( '<Undefined>' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:10:7: '<Undefined>'
>-			{
>-				match("<Undefined>");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__14"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
>+ try {
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:14:7: ( 'ordered' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:14:9: 'ordered'
>+ {
>+ match("ordered"); 
> 
>-	// $ANTLR end T12
> 
>-	// $ANTLR start T13
>-	public final void mT13() throws RecognitionException {
>-		try {
>-			int _type = T13;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:11:5: ( 'exception' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:11:7: 'exception'
>-			{
>-				match("exception");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__15"
> 
>-			}
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
>+ try {
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:15:7: ( 'unique' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:15:9: 'unique'
>+ {
>+ match("unique"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T13
>+ }
> 
>-	// $ANTLR start T14
>-	public final void mT14() throws RecognitionException {
>-		try {
>-			int _type = T14;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:12:5: ( 'stream' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:12:7: 'stream'
>-			{
>-				match("stream");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__16"
> 
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
>+ try {
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:16:7: ( 'create' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:16:9: 'create'
>+ {
>+ match("create"); 
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T14
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__17"
> 
>-	// $ANTLR start T15
>-	public final void mT15() throws RecognitionException {
>-		try {
>-			int _type = T15;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:13:5: ( 'ordered' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:13:7: 'ordered'
>-			{
>-				match("ordered");
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
>+ try {
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:17:7: ( 'read' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:17:9: 'read'
>+ {
>+ match("read"); 
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__18"
> 
>-	// $ANTLR end T15
>+ // $ANTLR start "T__19"
>+ public final void mT__19() throws RecognitionException {
>+ try {
>+ int _type = T__19;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:18:7: ( 'update' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:18:9: 'update'
>+ {
>+ match("update"); 
> 
>-	// $ANTLR start T16
>-	public final void mT16() throws RecognitionException {
>-		try {
>-			int _type = T16;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:14:5: ( 'unique' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:14:7: 'unique'
>-			{
>-				match("unique");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__19"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__20"
>+ public final void mT__20() throws RecognitionException {
>+ try {
>+ int _type = T__20;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:19:7: ( 'delete' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:19:9: 'delete'
>+ {
>+ match("delete"); 
> 
>-	// $ANTLR end T16
> 
>-	// $ANTLR start T17
>-	public final void mT17() throws RecognitionException {
>-		try {
>-			int _type = T17;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:15:5: ( 'create' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:15:7: 'create'
>-			{
>-				match("create");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__20"
> 
>-			}
>+ // $ANTLR start "T__21"
>+ public final void mT__21() throws RecognitionException {
>+ try {
>+ int _type = T__21;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:20:7: ( '+' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:20:9: '+'
>+ {
>+ match('+'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T17
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__21"
> 
>-	// $ANTLR start T18
>-	public final void mT18() throws RecognitionException {
>-		try {
>-			int _type = T18;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:16:5: ( 'read' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:16:7: 'read'
>-			{
>-				match("read");
>+ // $ANTLR start "T__22"
>+ public final void mT__22() throws RecognitionException {
>+ try {
>+ int _type = T__22;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:21:7: ( '-' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:21:9: '-'
>+ {
>+ match('-'); 
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__22"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__23"
>+ public final void mT__23() throws RecognitionException {
>+ try {
>+ int _type = T__23;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:22:7: ( '#' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:22:9: '#'
>+ {
>+ match('#'); 
> 
>-	// $ANTLR end T18
>+ }
> 
>-	// $ANTLR start T19
>-	public final void mT19() throws RecognitionException {
>-		try {
>-			int _type = T19;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:17:5: ( 'update' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:17:7: 'update'
>-			{
>-				match("update");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__23"
> 
>+ // $ANTLR start "T__24"
>+ public final void mT__24() throws RecognitionException {
>+ try {
>+ int _type = T__24;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:23:7: ( '~' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:23:9: '~'
>+ {
>+ match('~'); 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__24"
> 
>-	// $ANTLR end T19
>+ // $ANTLR start "T__25"
>+ public final void mT__25() throws RecognitionException {
>+ try {
>+ int _type = T__25;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:24:7: ( 'in' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:24:9: 'in'
>+ {
>+ match("in"); 
> 
>-	// $ANTLR start T20
>-	public final void mT20() throws RecognitionException {
>-		try {
>-			int _type = T20;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:18:5: ( 'delete' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:18:7: 'delete'
>-			{
>-				match("delete");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__25"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__26"
>+ public final void mT__26() throws RecognitionException {
>+ try {
>+ int _type = T__26;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:25:7: ( 'out' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:25:9: 'out'
>+ {
>+ match("out"); 
> 
>-	// $ANTLR end T20
> 
>-	// $ANTLR start T21
>-	public final void mT21() throws RecognitionException {
>-		try {
>-			int _type = T21;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:19:5: ( '+' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:19:7: '+'
>-			{
>-				match('+');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__26"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__27"
>+ public final void mT__27() throws RecognitionException {
>+ try {
>+ int _type = T__27;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:26:7: ( 'inout' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:26:9: 'inout'
>+ {
>+ match("inout"); 
> 
>-	// $ANTLR end T21
> 
>-	// $ANTLR start T22
>-	public final void mT22() throws RecognitionException {
>-		try {
>-			int _type = T22;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:20:5: ( '-' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:20:7: '-'
>-			{
>-				match('-');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__27"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__28"
>+ public final void mT__28() throws RecognitionException {
>+ try {
>+ int _type = T__28;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:27:7: ( 'return' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:27:9: 'return'
>+ {
>+ match("return"); 
> 
>-	// $ANTLR end T22
> 
>-	// $ANTLR start T23
>-	public final void mT23() throws RecognitionException {
>-		try {
>-			int _type = T23;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:21:5: ( '#' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:21:7: '#'
>-			{
>-				match('#');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__28"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__29"
>+ public final void mT__29() throws RecognitionException {
>+ try {
>+ int _type = T__29;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:28:7: ( ':' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:28:9: ':'
>+ {
>+ match(':'); 
> 
>-	// $ANTLR end T23
>+ }
> 
>-	// $ANTLR start T24
>-	public final void mT24() throws RecognitionException {
>-		try {
>-			int _type = T24;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:22:5: ( '~' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:22:7: '~'
>-			{
>-				match('~');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__29"
> 
>-			}
>+ // $ANTLR start "T__30"
>+ public final void mT__30() throws RecognitionException {
>+ try {
>+ int _type = T__30;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:29:7: ( '{' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:29:9: '{'
>+ {
>+ match('{'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T24
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__30"
> 
>-	// $ANTLR start T25
>-	public final void mT25() throws RecognitionException {
>-		try {
>-			int _type = T25;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:23:5: ( 'in' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:23:7: 'in'
>-			{
>-				match("in");
>+ // $ANTLR start "T__31"
>+ public final void mT__31() throws RecognitionException {
>+ try {
>+ int _type = T__31;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:30:7: ( '}' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:30:9: '}'
>+ {
>+ match('}'); 
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__31"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__32"
>+ public final void mT__32() throws RecognitionException {
>+ try {
>+ int _type = T__32;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:31:7: ( ',' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:31:9: ','
>+ {
>+ match(','); 
> 
>-	// $ANTLR end T25
>+ }
> 
>-	// $ANTLR start T26
>-	public final void mT26() throws RecognitionException {
>-		try {
>-			int _type = T26;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:24:5: ( 'out' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:24:7: 'out'
>-			{
>-				match("out");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__32"
> 
>+ // $ANTLR start "T__33"
>+ public final void mT__33() throws RecognitionException {
>+ try {
>+ int _type = T__33;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:32:7: ( 'effect: ' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:32:9: 'effect: '
>+ {
>+ match("effect: "); 
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T26
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__33"
> 
>-	// $ANTLR start T27
>-	public final void mT27() throws RecognitionException {
>-		try {
>-			int _type = T27;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:25:5: ( 'inout' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:25:7: 'inout'
>-			{
>-				match("inout");
>+ // $ANTLR start "T__34"
>+ public final void mT__34() throws RecognitionException {
>+ try {
>+ int _type = T__34;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:33:7: ( '::' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:33:9: '::'
>+ {
>+ match("::"); 
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__34"
> 
>-	// $ANTLR end T27
>+ // $ANTLR start "T__35"
>+ public final void mT__35() throws RecognitionException {
>+ try {
>+ int _type = T__35;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:34:7: ( '[' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:34:9: '['
>+ {
>+ match('['); 
> 
>-	// $ANTLR start T28
>-	public final void mT28() throws RecognitionException {
>-		try {
>-			int _type = T28;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:26:5: ( 'return' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:26:7: 'return'
>-			{
>-				match("return");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__35"
> 
>-			}
>+ // $ANTLR start "T__36"
>+ public final void mT__36() throws RecognitionException {
>+ try {
>+ int _type = T__36;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:35:7: ( ']' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:35:9: ']'
>+ {
>+ match(']'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T28
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__36"
> 
>-	// $ANTLR start T29
>-	public final void mT29() throws RecognitionException {
>-		try {
>-			int _type = T29;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:27:5: ( ':' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:27:7: ':'
>-			{
>-				match(':');
>+ // $ANTLR start "T__37"
>+ public final void mT__37() throws RecognitionException {
>+ try {
>+ int _type = T__37;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:36:7: ( '..' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:36:9: '..'
>+ {
>+ match(".."); 
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T29
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__37"
> 
>-	// $ANTLR start T30
>-	public final void mT30() throws RecognitionException {
>-		try {
>-			int _type = T30;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:28:5: ( '{' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:28:7: '{'
>-			{
>-				match('{');
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
>+ public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>+ try {
>+ int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-			}
>+ if ( ((LA2_0>='0' && LA2_0<='9')) ) {
>+ alt2=1;
>+ }
>+ else if ( (LA2_0=='*') ) {
>+ alt2=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ throw nvae;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:26: '0' .. '9' ( '0' .. '9' )*
>+ {
>+ matchRange('0','9'); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:35: ( '0' .. '9' )*
>+ loop1:
>+ do {
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-	// $ANTLR end T30
>+ if ( ((LA1_0>='0' && LA1_0<='9')) ) {
>+ alt1=1;
>+ }
> 
>-	// $ANTLR start T31
>-	public final void mT31() throws RecognitionException {
>-		try {
>-			int _type = T31;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:29:5: ( '}' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:29:7: '}'
>-			{
>-				match('}');
> 
>-			}
>+ switch (alt1) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:36: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR end T31
>+ 	default :
>+ 	 break loop1;
>+ }
>+ } while (true);
> 
>-	// $ANTLR start T32
>-	public final void mT32() throws RecognitionException {
>-		try {
>-			int _type = T32;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:30:5: ( ',' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:30:7: ','
>-			{
>-				match(',');
> 
>-			}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:47: '*'
>+ {
>+ match('*'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
> 
>-	// $ANTLR end T32
>+ }
> 
>-	// $ANTLR start T33
>-	public final void mT33() throws RecognitionException {
>-		try {
>-			int _type = T33;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:31:5: ( 'effect: ' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:31:7: 'effect: '
>-			{
>-				match("effect: ");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "RULE_ID"
>+ public final void mRULE_ID() throws RecognitionException {
>+ try {
>+ int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:11: ( '^' )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-	// $ANTLR end T33
>+ if ( (LA3_0=='^') ) {
>+ alt3=1;
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:11: '^'
>+ {
>+ match('^'); 
> 
>-	// $ANTLR start T34
>-	public final void mT34() throws RecognitionException {
>-		try {
>-			int _type = T34;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:32:5: ( '::' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:32:7: '::'
>-			{
>-				match("::");
>+ }
>+ break;
> 
>+ }
> 
>-			}
>+ if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
>+ input.consume();
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ else {
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>-	// $ANTLR end T34
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-	// $ANTLR start T35
>-	public final void mT35() throws RecognitionException {
>-		try {
>-			int _type = T35;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:33:5: ( '[' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:33:7: '['
>-			{
>-				match('[');
>+ if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
>+ alt4=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.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();
> 
>-	// $ANTLR end T35
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start T36
>-	public final void mT36() throws RecognitionException {
>-		try {
>-			int _type = T36;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:34:5: ( ']' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:34:7: ']'
>-			{
>-				match(']');
> 
>-			}
>+ 	 }
>+ 	 break;
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
>-	// $ANTLR end T36
> 
>-	// $ANTLR start T37
>-	public final void mT37() throws RecognitionException {
>-		try {
>-			int _type = T37;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:35:5: ( '..' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:35:7: '..'
>-			{
>-				match("..");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ID"
> 
>-			}
>+ // $ANTLR start "RULE_INT"
>+ public final void mRULE_INT() throws RecognitionException {
>+ try {
>+ int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:12: ( '0' .. '9' )+
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:12: ( '0' .. '9' )+
>+ int cnt5=0;
>+ loop5:
>+ do {
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ if ( ((LA5_0>='0' && LA5_0<='9')) ) {
>+ alt5=1;
>+ }
> 
>-	// $ANTLR end T37
> 
>-	// $ANTLR start RULE_UNLIMITEDLITERAL
>-	public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>-		try {
>-			int _type = RULE_UNLIMITEDLITERAL;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-				int alt2 = 2;
>-				int LA2_0 = input.LA(1);
>+ switch (alt5) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:13: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-				if(((LA2_0 >= '0' && LA2_0 <= '9'))) {
>-					alt2 = 1;
>-				} else if((LA2_0 == '*')) {
>-					alt2 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("1732:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ 	 }
>+ 	 break;
> 
>-					throw nvae;
>-				}
>-				switch(alt2) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:26: '0' .. '9' ( '0' .. '9' )*
>-				{
>-					matchRange('0', '9');
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:35: ( '0' .. '9' )*
>-					loop1: do {
>-						int alt1 = 2;
>-						int LA1_0 = input.LA(1);
>+ 	default :
>+ 	 if ( cnt5 >= 1 ) break loop5;
>+ EarlyExitException eee =
>+ new EarlyExitException(5, input);
>+ throw eee;
>+ }
>+ cnt5++;
>+ } while (true);
> 
>-						if(((LA1_0 >= '0' && LA1_0 <= '9'))) {
>-							alt1 = 1;
>-						}
> 
>+ }
> 
>-						switch(alt1) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:36: '0' .. '9'
>-						{
>-							matchRange('0', '9');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_INT"
> 
>-						}
>-							break;
>+ // $ANTLR start "RULE_STRING"
>+ public final void mRULE_STRING() throws RecognitionException {
>+ try {
>+ int _type = RULE_STRING;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>-						default:
>-							break loop1;
>-						}
>-					} while(true);
>+ if ( (LA8_0=='\"') ) {
>+ alt8=1;
>+ }
>+ else if ( (LA8_0=='\'') ) {
>+ alt8=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>+ throw nvae;
>+ }
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ {
>+ match('\"'); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ loop6:
>+ do {
>+ int alt6=3;
>+ int LA6_0 = input.LA(1);
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1732:47: '*'
>-				{
>-					match('*');
>+ if ( (LA6_0=='\\') ) {
>+ alt6=1;
>+ }
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
>+ alt6=2;
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ switch (alt6) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:66: ~ ( ( '\\\\' | '\"' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-	// $ANTLR end RULE_UNLIMITEDLITERAL
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start RULE_ID
>-	public final void mRULE_ID() throws RecognitionException {
>-		try {
>-			int _type = RULE_ID;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:11: ( '^' )?
>-				int alt3 = 2;
>-				int LA3_0 = input.LA(1);
> 
>-				if((LA3_0 == '^')) {
>-					alt3 = 1;
>-				}
>-				switch(alt3) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:11: '^'
>-				{
>-					match('^');
>+ 	 }
>+ 	 break;
> 
>-				}
>-					break;
>+ 	default :
>+ 	 break loop6;
>+ }
>+ } while (true);
> 
>-				}
>+ match('\"'); 
> 
>-				if((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {
>-					input.consume();
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ {
>+ match('\''); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ loop7:
>+ do {
>+ int alt7=3;
>+ int LA7_0 = input.LA(1);
> 
>-				} else {
>-					MismatchedSetException mse = new MismatchedSetException(null, input);
>-					recover(mse);
>-					throw mse;
>-				}
>+ if ( (LA7_0=='\\') ) {
>+ alt7=1;
>+ }
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
>+ alt7=2;
>+ }
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1734:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-				loop4: do {
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
> 
>-					if(((LA4_0 >= '0' && LA4_0 <= '9') || (LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
>-						alt4 = 1;
>-					}
>+ switch (alt7) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.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 {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:137: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop4;
>-					}
>-				} while(true);
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop7;
>+ }
>+ } while (true);
> 
>-			}
>+ match('\''); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
> 
>-	// $ANTLR end RULE_ID
>+ }
> 
>-	// $ANTLR start RULE_INT
>-	public final void mRULE_INT() throws RecognitionException {
>-		try {
>-			int _type = RULE_INT;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:10: ( ( '0' .. '9' )+ )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:12: ( '0' .. '9' )+
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:12: ( '0' .. '9' )+
>-				int cnt5 = 0;
>-				loop5: do {
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
> 
>-					if(((LA5_0 >= '0' && LA5_0 <= '9'))) {
>-						alt5 = 1;
>-					}
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_STRING"
> 
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1736:13: '0' .. '9'
>-					{
>-						matchRange('0', '9');
>+ // $ANTLR start "RULE_ML_COMMENT"
>+ public final void mRULE_ML_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ {
>+ match("/*"); 
> 
>-					}
>-						break;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:24: ( options {greedy=false; } : . )*
>+ loop9:
>+ do {
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>-					default:
>-						if(cnt5 >= 1)
>-							break loop5;
>-						EarlyExitException eee = new EarlyExitException(5, input);
>-						throw eee;
>-					}
>-					cnt5++;
>-				} while(true);
>+ if ( (LA9_0=='*') ) {
>+ int LA9_1 = input.LA(2);
> 
>+ if ( (LA9_1=='/') ) {
>+ alt9=2;
>+ }
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-	// $ANTLR end RULE_INT
> 
>-	// $ANTLR start RULE_STRING
>-	public final void mRULE_STRING() throws RecognitionException {
>-		try {
>-			int _type = RULE_STRING;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-				int alt8 = 2;
>-				int LA8_0 = input.LA(1);
>+ switch (alt9) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:52: .
>+ 	 {
>+ 	 matchAny(); 
> 
>-				if((LA8_0 == '\"')) {
>-					alt8 = 1;
>-				} else if((LA8_0 == '\'')) {
>-					alt8 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("1738:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ 	 }
>+ 	 break;
> 
>-					throw nvae;
>-				}
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>-				{
>-					match('\"');
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>-					loop6: do {
>-						int alt6 = 3;
>-						int LA6_0 = input.LA(1);
>+ 	default :
>+ 	 break loop9;
>+ }
>+ } while (true);
> 
>-						if((LA6_0 == '\\')) {
>-							alt6 = 1;
>-						} else if(((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '[') || (LA6_0 >= ']' && LA6_0 <= '\uFFFE'))) {
>-							alt6 = 2;
>-						}
>+ match("*/"); 
> 
> 
>-						switch(alt6) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:21: '\\\\' ( '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 {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>+ // $ANTLR start "RULE_SL_COMMENT"
>+ public final void mRULE_SL_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ {
>+ match("//"); 
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:62: ~ ( ( '\\\\' | '\"' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ loop10:
>+ do {
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
>+ alt10=1;
>+ }
> 
> 
>-						}
>-							break;
>+ switch (alt10) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742: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)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-						default:
>-							break loop6;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					match('\"');
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>-				{
>-					match('\'');
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>-					loop7: do {
>-						int alt7 = 3;
>-						int LA7_0 = input.LA(1);
>+ 	 }
>+ 	 break;
> 
>-						if((LA7_0 == '\\')) {
>-							alt7 = 1;
>-						} else if(((LA7_0 >= '\u0000' && LA7_0 <= '&') || (LA7_0 >= '(' && LA7_0 <= '[') || (LA7_0 >= ']' && LA7_0 <= '\uFFFE'))) {
>-							alt7 = 2;
>-						}
>+ 	default :
>+ 	 break loop10;
>+ }
>+ } while (true);
> 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:40: ( ( '\\r' )? '\\n' )?
>+ int alt12=2;
>+ int LA12_0 = input.LA(1);
> 
>-						switch(alt7) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:88: '\\\\' ( '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();
>+ if ( (LA12_0=='\n'||LA12_0=='\r') ) {
>+ alt12=1;
>+ }
>+ switch (alt12) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:41: ( '\\r' )? '\\n'
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:41: ( '\\r' )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( (LA11_0=='\r') ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:41: '\\r'
>+ {
>+ match('\r'); 
> 
>+ }
>+ break;
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1738:129: ~ ( ( '\\\\' | '\\'' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ }
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ match('\n'); 
> 
>+ }
>+ break;
> 
>-						}
>-							break;
>+ }
> 
>-						default:
>-							break loop7;
>-						}
>-					} while(true);
> 
>-					match('\'');
>+ }
> 
>-				}
>-					break;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>-				}
>+ // $ANTLR start "RULE_WS"
>+ public final void mRULE_WS() throws RecognitionException {
>+ try {
>+ int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1744:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1744:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1744:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int cnt13=0;
>+ loop13:
>+ do {
>+ int alt13=2;
>+ int LA13_0 = input.LA(1);
> 
>+ if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
>+ alt13=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ switch (alt13) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:
>+ 	 {
>+ 	 if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
>+ 	 input.consume();
> 
>-	// $ANTLR end RULE_STRING
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start RULE_ML_COMMENT
>-	public final void mRULE_ML_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_ML_COMMENT;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:19: '/*' ( options {greedy=false; } : . )* '*/'
>-			{
>-				match("/*");
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:24: ( options {greedy=false; } : . )*
>-				loop9: do {
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
>+ 	 }
>+ 	 break;
> 
>-					if((LA9_0 == '*')) {
>-						int LA9_1 = input.LA(2);
>+ 	default :
>+ 	 if ( cnt13 >= 1 ) break loop13;
>+ EarlyExitException eee =
>+ new EarlyExitException(13, input);
>+ throw eee;
>+ }
>+ cnt13++;
>+ } while (true);
> 
>-						if((LA9_1 == '/')) {
>-							alt9 = 2;
>-						} else if(((LA9_1 >= '\u0000' && LA9_1 <= '.') || (LA9_1 >= '0' && LA9_1 <= '\uFFFE'))) {
>-							alt9 = 1;
>-						}
> 
>+ }
> 
>-					} else if(((LA9_0 >= '\u0000' && LA9_0 <= ')') || (LA9_0 >= '+' && LA9_0 <= '\uFFFE'))) {
>-						alt9 = 1;
>-					}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_WS"
> 
>+ // $ANTLR start "RULE_ANY_OTHER"
>+ public final void mRULE_ANY_OTHER() throws RecognitionException {
>+ try {
>+ int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1746:16: ( . )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1746:18: .
>+ {
>+ matchAny(); 
> 
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1740:52: .
>-					{
>-						matchAny();
>+ }
> 
>-					}
>-						break;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
>-					default:
>-						break loop9;
>-					}
>-				} while(true);
>+ public void mTokens() throws RecognitionException {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ int alt14=34;
>+ alt14 = dfa14.predict(input);
>+ switch (alt14) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:10: T__12
>+ {
>+ mT__12(); 
> 
>-				match("*/");
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:16: T__13
>+ {
>+ mT__13(); 
> 
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:22: T__14
>+ {
>+ mT__14(); 
> 
>-			}
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:28: T__15
>+ {
>+ mT__15(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 5 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:34: T__16
>+ {
>+ mT__16(); 
> 
>-	// $ANTLR end RULE_ML_COMMENT
>+ }
>+ break;
>+ case 6 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:40: T__17
>+ {
>+ mT__17(); 
> 
>-	// $ANTLR start RULE_SL_COMMENT
>-	public final void mRULE_SL_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_SL_COMMENT;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>-			{
>-				match("//");
>+ }
>+ break;
>+ case 7 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:46: T__18
>+ {
>+ mT__18(); 
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:24: (~ ( ( '\\n' | '\\r' ) ) )*
>-				loop10: do {
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ }
>+ break;
>+ case 8 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:52: T__19
>+ {
>+ mT__19(); 
> 
>-					if(((LA10_0 >= '\u0000' && LA10_0 <= '\t') || (LA10_0 >= '\u000B' && LA10_0 <= '\f') || (LA10_0 >= '\u000E' && LA10_0 <= '\uFFFE'))) {
>-						alt10 = 1;
>-					}
>+ }
>+ break;
>+ case 9 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:58: T__20
>+ {
>+ mT__20(); 
> 
>+ }
>+ break;
>+ case 10 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:64: T__21
>+ {
>+ mT__21(); 
> 
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742: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) <= '\uFFFE')) {
>-							input.consume();
>+ }
>+ break;
>+ case 11 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:70: T__22
>+ {
>+ mT__22(); 
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
>+ break;
>+ case 12 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:76: T__23
>+ {
>+ mT__23(); 
> 
>+ }
>+ break;
>+ case 13 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:82: T__24
>+ {
>+ mT__24(); 
> 
>-					}
>-						break;
>+ }
>+ break;
>+ case 14 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:88: T__25
>+ {
>+ mT__25(); 
> 
>-					default:
>-						break loop10;
>-					}
>-				} while(true);
>+ }
>+ break;
>+ case 15 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:94: T__26
>+ {
>+ mT__26(); 
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:40: ( ( '\\r' )? '\\n' )?
>-				int alt12 = 2;
>-				int LA12_0 = input.LA(1);
>+ }
>+ break;
>+ case 16 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:100: T__27
>+ {
>+ mT__27(); 
> 
>-				if((LA12_0 == '\n' || LA12_0 == '\r')) {
>-					alt12 = 1;
>-				}
>-				switch(alt12) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:41: ( '\\r' )? '\\n'
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:41: ( '\\r' )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ }
>+ break;
>+ case 17 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:106: T__28
>+ {
>+ mT__28(); 
> 
>-					if((LA11_0 == '\r')) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1742:41: '\\r'
>-					{
>-						match('\r');
>+ }
>+ break;
>+ case 18 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:112: T__29
>+ {
>+ mT__29(); 
> 
>-					}
>-						break;
>+ }
>+ break;
>+ case 19 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:118: T__30
>+ {
>+ mT__30(); 
> 
>-					}
>+ }
>+ break;
>+ case 20 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:124: T__31
>+ {
>+ mT__31(); 
> 
>-					match('\n');
>+ }
>+ break;
>+ case 21 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:130: T__32
>+ {
>+ mT__32(); 
> 
>-				}
>-					break;
>+ }
>+ break;
>+ case 22 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:136: T__33
>+ {
>+ mT__33(); 
> 
>-				}
>+ }
>+ break;
>+ case 23 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:142: T__34
>+ {
>+ mT__34(); 
> 
>+ }
>+ break;
>+ case 24 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:148: T__35
>+ {
>+ mT__35(); 
> 
>-			}
>+ }
>+ break;
>+ case 25 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:154: T__36
>+ {
>+ mT__36(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 26 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:160: T__37
>+ {
>+ mT__37(); 
> 
>-	// $ANTLR end RULE_SL_COMMENT
>+ }
>+ break;
>+ case 27 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:166: RULE_UNLIMITEDLITERAL
>+ {
>+ mRULE_UNLIMITEDLITERAL(); 
> 
>-	// $ANTLR start RULE_WS
>-	public final void mRULE_WS() throws RecognitionException {
>-		try {
>-			int _type = RULE_WS;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1744:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1744:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1744:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-				int cnt13 = 0;
>-				loop13: do {
>-					int alt13 = 2;
>-					int LA13_0 = input.LA(1);
>+ }
>+ break;
>+ case 28 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:188: RULE_ID
>+ {
>+ mRULE_ID(); 
> 
>-					if(((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) {
>-						alt13 = 1;
>-					}
>+ }
>+ break;
>+ case 29 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:196: RULE_INT
>+ {
>+ mRULE_INT(); 
> 
>+ }
>+ break;
>+ case 30 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:205: RULE_STRING
>+ {
>+ mRULE_STRING(); 
> 
>-					switch(alt13) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:
>-					{
>-						if((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
>-							input.consume();
>+ }
>+ break;
>+ case 31 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:217: RULE_ML_COMMENT
>+ {
>+ mRULE_ML_COMMENT(); 
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
>+ break;
>+ case 32 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:233: RULE_SL_COMMENT
>+ {
>+ mRULE_SL_COMMENT(); 
> 
>+ }
>+ break;
>+ case 33 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:249: RULE_WS
>+ {
>+ mRULE_WS(); 
> 
>-					}
>-						break;
>+ }
>+ break;
>+ case 34 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:257: RULE_ANY_OTHER
>+ {
>+ mRULE_ANY_OTHER(); 
> 
>-					default:
>-						if(cnt13 >= 1)
>-							break loop13;
>-						EarlyExitException eee = new EarlyExitException(13, input);
>-						throw eee;
>-					}
>-					cnt13++;
>-				} while(true);
>+ }
>+ break;
> 
>+ }
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_WS
>+ protected DFA14 dfa14 = new DFA14(this);
>+ static final String DFA14_eotS =
>+ "\1\uffff\1\35\7\41\4\uffff\1\41\1\60\5\uffff\1\35\1\67\1\uffff"+
>+ "\1\35\1\uffff\3\35\3\uffff\2\41\1\uffff\10\41\4\uffff\1\111\11\uffff"+
>+ "\1\67\4\uffff\4\41\1\116\7\41\1\uffff\4\41\1\uffff\3\41\1\135\12"+
>+ "\41\1\uffff\2\41\1\152\2\41\1\155\1\41\1\157\1\160\1\161\1\162\1"+
>+ "\163\1\uffff\1\41\2\uffff\1\165\5\uffff\1\41\1\uffff\1\167\1\uffff";
>+ static final String DFA14_eofS =
>+ "\170\uffff";
>+ static final String DFA14_minS =
>+ "\1\0\1\125\1\146\1\164\1\162\1\156\1\162\2\145\4\uffff\1\156\1"+
>+ "\72\5\uffff\1\56\1\60\1\uffff\1\101\1\uffff\2\0\1\52\3\uffff\1\143"+
>+ "\1\146\1\uffff\1\162\1\144\1\164\1\151\1\144\1\145\1\141\1\154\4"+
>+ "\uffff\1\60\11\uffff\1\60\4\uffff\4\145\1\60\1\161\2\141\1\144\1"+
>+ "\165\1\145\1\165\1\uffff\1\160\1\143\1\141\1\162\1\uffff\1\165\2"+
>+ "\164\1\60\1\162\4\164\1\155\4\145\1\uffff\1\156\1\145\1\60\1\151"+
>+ "\1\72\1\60\1\144\5\60\1\uffff\1\157\2\uffff\1\60\5\uffff\1\156\1"+
>+ "\uffff\1\60\1\uffff";
>+ static final String DFA14_maxS =
>+ "\1\uffff\1\125\1\170\1\164\1\165\1\160\1\162\2\145\4\uffff\1\156"+
>+ "\1\72\5\uffff\1\56\1\71\1\uffff\1\172\1\uffff\2\uffff\1\57\3\uffff"+
>+ "\1\143\1\146\1\uffff\1\162\1\144\1\164\1\151\1\144\1\145\1\164\1"+
>+ "\154\4\uffff\1\172\11\uffff\1\71\4\uffff\4\145\1\172\1\161\2\141"+
>+ "\1\144\1\165\1\145\1\165\1\uffff\1\160\1\143\1\141\1\162\1\uffff"+
>+ "\1\165\2\164\1\172\1\162\4\164\1\155\4\145\1\uffff\1\156\1\145\1"+
>+ "\172\1\151\1\72\1\172\1\144\5\172\1\uffff\1\157\2\uffff\1\172\5"+
>+ "\uffff\1\156\1\uffff\1\172\1\uffff";
>+ static final String DFA14_acceptS =
>+ "\11\uffff\1\12\1\13\1\14\1\15\2\uffff\1\23\1\24\1\25\1\30\1\31"+
>+ "\2\uffff\1\33\1\uffff\1\34\3\uffff\1\41\1\42\1\1\2\uffff\1\34\10"+
>+ "\uffff\1\12\1\13\1\14\1\15\1\uffff\1\27\1\22\1\23\1\24\1\25\1\30"+
>+ "\1\31\1\32\1\33\1\uffff\1\36\1\37\1\40\1\41\14\uffff\1\16\4\uffff"+
>+ "\1\17\16\uffff\1\7\14\uffff\1\20\1\uffff\1\26\1\3\1\uffff\1\5\1"+
>+ "\10\1\6\1\21\1\11\1\uffff\1\4\1\uffff\1\2";
>+ static final String DFA14_specialS =
>+ "\1\0\30\uffff\1\2\1\1\135\uffff}>";
>+ static final String[] DFA14_transitionS = {
>+ "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\1\13\3\35\1\32\2"+
>+ "\35\1\26\1\11\1\21\1\12\1\24\1\33\12\25\1\16\1\35\1\1\4\35\32"+
>+ "\30\1\22\1\35\1\23\1\27\1\30\1\35\2\30\1\6\1\10\1\2\3\30\1\15"+
>+ "\5\30\1\4\2\30\1\7\1\3\1\30\1\5\5\30\1\17\1\35\1\20\1\14\uff81"+
>+ "\35",
>+ "\1\36",
>+ "\1\40\21\uffff\1\37",
>+ "\1\42",
>+ "\1\43\2\uffff\1\44",
>+ "\1\45\1\uffff\1\46",
>+ "\1\47",
>+ "\1\50",
>+ "\1\51",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\56",
>+ "\1\57",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\66",
>+ "\12\70",
>+ "",
>+ "\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "",
>+ "\0\71",
>+ "\0\71",
>+ "\1\72\4\uffff\1\73",
>+ "",
>+ "",
>+ "",
>+ "\1\75",
>+ "\1\76",
>+ "",
>+ "\1\77",
>+ "\1\100",
>+ "\1\101",
>+ "\1\102",
>+ "\1\103",
>+ "\1\104",
>+ "\1\105\22\uffff\1\106",
>+ "\1\107",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\16\41\1\110\13\41",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\12\70",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\112",
>+ "\1\113",
>+ "\1\114",
>+ "\1\115",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\1\117",
>+ "\1\120",
>+ "\1\121",
>+ "\1\122",
>+ "\1\123",
>+ "\1\124",
>+ "\1\125",
>+ "",
>+ "\1\126",
>+ "\1\127",
>+ "\1\130",
>+ "\1\131",
>+ "",
>+ "\1\132",
>+ "\1\133",
>+ "\1\134",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\1\136",
>+ "\1\137",
>+ "\1\140",
>+ "\1\141",
>+ "\1\142",
>+ "\1\143",
>+ "\1\144",
>+ "\1\145",
>+ "\1\146",
>+ "\1\147",
>+ "",
>+ "\1\150",
>+ "\1\151",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\1\153",
>+ "\1\154",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\1\156",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "",
>+ "\1\164",
>+ "",
>+ "",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\166",
>+ "",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ ""
>+ };
> 
>-	// $ANTLR start RULE_ANY_OTHER
>-	public final void mRULE_ANY_OTHER() throws RecognitionException {
>-		try {
>-			int _type = RULE_ANY_OTHER;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1746:16: ( . )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1746:18: .
>-			{
>-				matchAny();
>+ static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ static final short[][] DFA14_transition;
> 
>-			}
>+ static {
>+ int numStates = DFA14_transitionS.length;
>+ DFA14_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>+ }
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ class DFA14 extends DFA {
> 
>-	// $ANTLR end RULE_ANY_OTHER
>+ public DFA14(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 14;
>+ this.eot = DFA14_eot;
>+ this.eof = DFA14_eof;
>+ this.min = DFA14_min;
>+ this.max = DFA14_max;
>+ this.accept = DFA14_accept;
>+ this.special = DFA14_special;
>+ this.transition = DFA14_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_0 = input.LA(1);
> 
>-	public void mTokens() throws RecognitionException {
>-		// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:8: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>-		int alt14 = 34;
>-		alt14 = dfa14.predict(input);
>-		switch(alt14) {
>-		case 1:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:10: T12
>-		{
>-			mT12();
>+ s = -1;
>+ if ( (LA14_0=='<') ) {s = 1;}
> 
>-		}
>-			break;
>-		case 2:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:14: T13
>-		{
>-			mT13();
>+ else if ( (LA14_0=='e') ) {s = 2;}
> 
>-		}
>-			break;
>-		case 3:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:18: T14
>-		{
>-			mT14();
>+ else if ( (LA14_0=='s') ) {s = 3;}
> 
>-		}
>-			break;
>-		case 4:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:22: T15
>-		{
>-			mT15();
>+ else if ( (LA14_0=='o') ) {s = 4;}
> 
>-		}
>-			break;
>-		case 5:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:26: T16
>-		{
>-			mT16();
>+ else if ( (LA14_0=='u') ) {s = 5;}
> 
>-		}
>-			break;
>-		case 6:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:30: T17
>-		{
>-			mT17();
>+ else if ( (LA14_0=='c') ) {s = 6;}
> 
>-		}
>-			break;
>-		case 7:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:34: T18
>-		{
>-			mT18();
>+ else if ( (LA14_0=='r') ) {s = 7;}
> 
>-		}
>-			break;
>-		case 8:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:38: T19
>-		{
>-			mT19();
>+ else if ( (LA14_0=='d') ) {s = 8;}
> 
>-		}
>-			break;
>-		case 9:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:42: T20
>-		{
>-			mT20();
>+ else if ( (LA14_0=='+') ) {s = 9;}
> 
>-		}
>-			break;
>-		case 10:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:46: T21
>-		{
>-			mT21();
>+ else if ( (LA14_0=='-') ) {s = 10;}
> 
>-		}
>-			break;
>-		case 11:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:50: T22
>-		{
>-			mT22();
>+ else if ( (LA14_0=='#') ) {s = 11;}
> 
>-		}
>-			break;
>-		case 12:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:54: T23
>-		{
>-			mT23();
>+ else if ( (LA14_0=='~') ) {s = 12;}
> 
>-		}
>-			break;
>-		case 13:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:58: T24
>-		{
>-			mT24();
>+ else if ( (LA14_0=='i') ) {s = 13;}
> 
>-		}
>-			break;
>-		case 14:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:62: T25
>-		{
>-			mT25();
>+ else if ( (LA14_0==':') ) {s = 14;}
> 
>-		}
>-			break;
>-		case 15:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:66: T26
>-		{
>-			mT26();
>+ else if ( (LA14_0=='{') ) {s = 15;}
> 
>-		}
>-			break;
>-		case 16:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:70: T27
>-		{
>-			mT27();
>+ else if ( (LA14_0=='}') ) {s = 16;}
> 
>-		}
>-			break;
>-		case 17:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:74: T28
>-		{
>-			mT28();
>+ else if ( (LA14_0==',') ) {s = 17;}
> 
>-		}
>-			break;
>-		case 18:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:78: T29
>-		{
>-			mT29();
>+ else if ( (LA14_0=='[') ) {s = 18;}
> 
>-		}
>-			break;
>-		case 19:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:82: T30
>-		{
>-			mT30();
>+ else if ( (LA14_0==']') ) {s = 19;}
> 
>-		}
>-			break;
>-		case 20:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:86: T31
>-		{
>-			mT31();
>+ else if ( (LA14_0=='.') ) {s = 20;}
> 
>-		}
>-			break;
>-		case 21:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:90: T32
>-		{
>-			mT32();
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 21;}
> 
>-		}
>-			break;
>-		case 22:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:94: T33
>-		{
>-			mT33();
>+ else if ( (LA14_0=='*') ) {s = 22;}
> 
>-		}
>-			break;
>-		case 23:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:98: T34
>-		{
>-			mT34();
>+ else if ( (LA14_0=='^') ) {s = 23;}
> 
>-		}
>-			break;
>-		case 24:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:102: T35
>-		{
>-			mT35();
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='b')||(LA14_0>='f' && LA14_0<='h')||(LA14_0>='j' && LA14_0<='n')||(LA14_0>='p' && LA14_0<='q')||LA14_0=='t'||(LA14_0>='v' && LA14_0<='z')) ) {s = 24;}
> 
>-		}
>-			break;
>-		case 25:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:106: T36
>-		{
>-			mT36();
>+ else if ( (LA14_0=='\"') ) {s = 25;}
> 
>-		}
>-			break;
>-		case 26:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:110: T37
>-		{
>-			mT37();
>+ else if ( (LA14_0=='\'') ) {s = 26;}
> 
>-		}
>-			break;
>-		case 27:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:114: RULE_UNLIMITEDLITERAL
>-		{
>-			mRULE_UNLIMITEDLITERAL();
>+ else if ( (LA14_0=='/') ) {s = 27;}
> 
>-		}
>-			break;
>-		case 28:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:136: RULE_ID
>-		{
>-			mRULE_ID();
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 28;}
> 
>-		}
>-			break;
>-		case 29:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:144: RULE_INT
>-		{
>-			mRULE_INT();
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='$' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||LA14_0==';'||(LA14_0>='=' && LA14_0<='@')||LA14_0=='\\'||LA14_0=='`'||LA14_0=='|'||(LA14_0>='\u007F' && LA14_0<='\uFFFF')) ) {s = 29;}
> 
>-		}
>-			break;
>-		case 30:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:153: RULE_STRING
>-		{
>-			mRULE_STRING();
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_26 = input.LA(1);
> 
>-		}
>-			break;
>-		case 31:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:165: RULE_ML_COMMENT
>-		{
>-			mRULE_ML_COMMENT();
>+ s = -1;
>+ if ( ((LA14_26>='\u0000' && LA14_26<='\uFFFF')) ) {s = 57;}
> 
>-		}
>-			break;
>-		case 32:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:181: RULE_SL_COMMENT
>-		{
>-			mRULE_SL_COMMENT();
>+ else s = 29;
> 
>-		}
>-			break;
>-		case 33:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:197: RULE_WS
>-		{
>-			mRULE_WS();
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_25 = input.LA(1);
> 
>-		}
>-			break;
>-		case 34:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1:205: RULE_ANY_OTHER
>-		{
>-			mRULE_ANY_OTHER();
>+ s = -1;
>+ if ( ((LA14_25>='\u0000' && LA14_25<='\uFFFF')) ) {s = 57;}
> 
>-		}
>-			break;
>+ else s = 29;
> 
>-		}
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
>+ 
> 
>-	}
>-
>-
>-	protected DFA14 dfa14 = new DFA14(this);
>-
>-	static final String DFA14_eotS = "\1\uffff\1\35\7\41\4\uffff\1\41\1\60\5\uffff\1\35\1\67\1\uffff\1" + "\35\1\uffff\3\35\3\uffff\2\41\1\uffff\10\41\4\uffff\1\111\11\uffff" + "\1\67\4\uffff\3\41\1\115\10\41\1\uffff\3\41\1\uffff\4\41\1\135\12" + "\41\1\uffff\2\41\1\152\2\41\1\155\1\41\1\157\1\160\1\161\1\162\1" + "\163\2\uffff\1\41\1\uffff\1\165\5\uffff\1\41\1\uffff\1\167\1\uffff";
>-
>-	static final String DFA14_eofS = "\170\uffff";
>-
>-	static final String DFA14_minS = "\1\0\1\125\1\146\1\164\1\162\1\156\1\162\2\145\4\uffff\1\156\1\72" + "\5\uffff\1\56\1\60\1\uffff\1\101\1\uffff\2\0\1\52\3\uffff\1\146" + "\1\143\1\uffff\1\162\1\164\1\144\1\151\1\144\1\145\1\141\1\154\4" + "\uffff\1\60\11\uffff\1\60\4\uffff\3\145\1\60\1\145\1\161\2\141\1" + "\144\1\165\1\145\1\165\1\uffff\1\143\1\160\1\141\1\uffff\1\162\1" + "\165\2\164\1\60\1\162\4\164\1\155\4\145\1\uffff\1\156\1\145\1\60" + "\1\72\1\151\1\60\1\144\5\60\2\uffff\1\157\1\uffff\1\60\5\uffff\1" + "\156\1\uffff\1\60\1\uffff";
>-
>-	static final String DFA14_maxS = "\1\ufffe\1\125\1\170\1\164\1\165\1\160\1\162\2\145\4\uffff\1\156" + "\1\72\5\uffff\1\56\1\71\1\uffff\1\172\1\uffff\2\ufffe\1\57\3\uffff" + "\1\146\1\143\1\uffff\1\162\1\164\1\144\1\151\1\144\1\145\1\164\1" + "\154\4\uffff\1\172\11\uffff\1\71\4\uffff\3\145\1\172\1\145\1\161" + "\2\141\1\144\1\165\1\145\1\165\1\uffff\1\143\1\160\1\141\1\uffff" + "\1\162\1\165\2\164\1\172\1\162\4\164\1\155\4\145\1\uffff\1\156\1" + "\145\1\172\1\72\1\151\1\172\1\144\5\172\2\uffff\1\157\1\uffff\1" + "\172\5\uffff\1\156\1\uffff\1\172\1\uffff";
>-
>-	static final String DFA14_acceptS = "\11\uffff\1\12\1\13\1\14\1\15\2\uffff\1\23\1\24\1\25\1\30\1\31\2" + "\uffff\1\33\1\uffff\1\34\3\uffff\1\41\1\42\1\1\2\uffff\1\34\10\uffff" + "\1\12\1\13\1\14\1\15\1\uffff\1\27\1\22\1\23\1\24\1\25\1\30\1\31" + "\1\32\1\33\1\uffff\1\36\1\40\1\37\1\41\14\uffff\1\16\3\uffff\1\17" + "\17\uffff\1\7\14\uffff\1\20\1\26\1\uffff\1\3\1\uffff\1\5\1\10\1" + "\6\1\21\1\11\1\uffff\1\4\1\uffff\1\2";
>-
>-	static final String DFA14_specialS = "\170\uffff}>";
>-
>-	static final String[] DFA14_transitionS = { "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\1\13\3\35\1\32\2" + "\35\1\26\1\11\1\21\1\12\1\24\1\33\12\25\1\16\1\35\1\1\4\35\32" + "\30\1\22\1\35\1\23\1\27\1\30\1\35\2\30\1\6\1\10\1\2\3\30\1\15" + "\5\30\1\4\2\30\1\7\1\3\1\30\1\5\5\30\1\17\1\35\1\20\1\14\uff80" + "\35", "\1\36", "\1\37\21\uffff\1\40", "\1\42", "\1\44\2\uffff\1\43", "\1\45\1\uffff\1\46", "\1\47", "\1\50", "\1\51", "", "", "", "", "\1\56", "\1\57", "", "", "", "", "", "\1\66", "\12\70", "", "\32\41\4\uffff\1\41\1\uffff\32\41", "", "\uffff\71", "\uffff\71", "\1\73\4\uffff\1\72", "", "", "", "\1\75", "\1\76", "", "\1\77", "\1\100", "\1\101", "\1\102", "\1\103", "\1\104", "\1\105\22\uffff\1\106", "\1\107", "", "", "", "", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\16\41\1\110\13\41", "", "", "", "", "", "", "", "", "", "\12\70", "", "", "", "", "\1\112", "\1\113", "\1\114", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\1\116", "\1\117", "\1\120", "\1\121", "\1\122", "\1\123", "\1\124", "\1\125", "", "\1\126", "\1\127", "\1\130", "", "\1\131", "\1\132", "\1\133", "\1\134", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\1\136", "\1\137", "\1\140", "\1\141", "\1\142", "\1\143", "\1\144", "\1\145", "\1\146", "\1\147", "", "\1\150", "\1\151", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\1\153", "\1\154", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\1\156", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "", "", "\1\164", "", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "", "", "", "", "", "\1\166", "", "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41", "" };
>-
>-	static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>-
>-	static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>-
>-	static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>-
>-	static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>-
>-	static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>-
>-	static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>-
>-	static final short[][] DFA14_transition;
>-
>-	static {
>-		int numStates = DFA14_transitionS.length;
>-		DFA14_transition = new short[numStates][];
>-		for(int i = 0; i < numStates; i++) {
>-			DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>-		}
>-	}
>-
>-	class DFA14 extends DFA {
>-
>-		public DFA14(BaseRecognizer recognizer) {
>-			this.recognizer = recognizer;
>-			this.decisionNumber = 14;
>-			this.eot = DFA14_eot;
>-			this.eof = DFA14_eof;
>-			this.min = DFA14_min;
>-			this.max = DFA14_max;
>-			this.accept = DFA14_accept;
>-			this.special = DFA14_special;
>-			this.transition = DFA14_transition;
>-		}
>-
>-		public String getDescription() {
>-			return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>-		}
>-	}
>-
>-
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g	(working copy)
>@@ -1735,7 +1735,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.tokens	(working copy)
>@@ -1,11 +1,37 @@
> RULE_ID=4
>-RULE_STRING=7
> RULE_UNLIMITEDLITERAL=5
>+T__29=29
>+T__28=28
>+T__27=27
>+T__26=26
>+T__25=25
>+T__24=24
>+T__23=23
>+T__22=22
> RULE_ANY_OTHER=11
>-RULE_INT=6
>-RULE_WS=10
>+T__21=21
>+T__20=20
> RULE_SL_COMMENT=9
> RULE_ML_COMMENT=8
>+T__30=30
>+T__19=19
>+T__31=31
>+RULE_STRING=7
>+T__32=32
>+T__33=33
>+T__16=16
>+T__34=34
>+T__15=15
>+T__35=35
>+T__18=18
>+T__36=36
>+T__17=17
>+T__37=37
>+T__12=12
>+T__14=14
>+T__13=13
>+RULE_INT=6
>+RULE_WS=10
> '..'=37
> 'update'=19
> 'ordered'=15
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameterParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameterParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameterParser.java	(working copy)
>@@ -1,17 +1,4 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal;
>+package org.eclipse.papyrus.parameter.editor.xtext.ui.contentassist.antlr.internal; 
> 
> import java.io.InputStream;
> import org.eclipse.xtext.*;
>@@ -26,6 +13,8 @@
> import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
> import org.eclipse.papyrus.parameter.editor.xtext.services.UmlParameterGrammarAccess;
> 
>+
>+
> import org.antlr.runtime.*;
> import java.util.Stack;
> import java.util.List;
>@@ -33,4714 +22,4807 @@
> 
> @SuppressWarnings("all")
> public class InternalUmlParameterParser extends AbstractInternalContentAssistParser {
>-
>-	public static final String[] tokenNames = new String[]{ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'<Undefined>'", "'exception'", "'stream'", "'ordered'", "'unique'", "'create'", "'read'", "'update'", "'delete'", "'+'", "'-'", "'#'", "'~'", "'in'", "'out'", "'inout'", "'return'", "':'", "'{'", "'}'", "','", "'effect: '", "'::'", "'['", "']'", "'..'" };
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlParameterParser(TokenStream input) {
>-		super(input);
>-	}
>-
>-
>-	public String[] getTokenNames() {
>-		return tokenNames;
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g";
>-	}
>-
>-
>-
>-	private UmlParameterGrammarAccess grammarAccess;
>-
>-	public void setGrammarAccess(UmlParameterGrammarAccess grammarAccess) {
>-		this.grammarAccess = grammarAccess;
>-	}
>-
>-	@Override
>-	protected Grammar getGrammar() {
>-		return grammarAccess.getGrammar();
>-	}
>-
>-	@Override
>-	protected String getValueForTokenName(String tokenName) {
>-		return tokenName;
>-	}
>-
>-
>-
>-
>-	// $ANTLR start entryRuleParameterRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:61:1: entryRuleParameterRule : ruleParameterRule EOF ;
>-	public final void entryRuleParameterRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:62:1: ( ruleParameterRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:63:1: ruleParameterRule EOF
>-			{
>-				before(grammarAccess.getParameterRuleRule());
>-				pushFollow(FOLLOW_ruleParameterRule_in_entryRuleParameterRule61);
>-				ruleParameterRule();
>-				_fsp--;
>-
>-				after(grammarAccess.getParameterRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleParameterRule68);
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end entryRuleParameterRule
>-
>+ public static final String[] tokenNames = new String[] {
>+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'<Undefined>'", "'exception'", "'stream'", "'ordered'", "'unique'", "'create'", "'read'", "'update'", "'delete'", "'+'", "'-'", "'#'", "'~'", "'in'", "'out'", "'inout'", "'return'", "':'", "'{'", "'}'", "','", "'effect: '", "'::'", "'['", "']'", "'..'"
>+ };
>+ public static final int RULE_ID=4;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__29=29;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
>+ public static final int T__30=30;
>+ public static final int T__19=19;
>+ public static final int T__31=31;
>+ public static final int RULE_STRING=7;
>+ public static final int T__32=32;
>+ public static final int T__33=33;
>+ public static final int T__16=16;
>+ public static final int T__34=34;
>+ public static final int T__15=15;
>+ public static final int T__35=35;
>+ public static final int T__18=18;
>+ public static final int T__36=36;
>+ public static final int T__17=17;
>+ public static final int T__37=37;
>+ 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=6;
>+ public static final int RULE_WS=10;
> 
>-	// $ANTLR start ruleParameterRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:70:1: ruleParameterRule : ( ( rule__ParameterRule__Group__0 ) ) ;
>-	public final void ruleParameterRule() throws RecognitionException {
>+ // delegates
>+ // delegators
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:74:2: ( ( ( rule__ParameterRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:75:1: ( ( rule__ParameterRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:75:1: ( ( rule__ParameterRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:76:1: ( rule__ParameterRule__Group__0 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:77:1: ( rule__ParameterRule__Group__0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:77:2: rule__ParameterRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__Group__0_in_ruleParameterRule94);
>-						rule__ParameterRule__Group__0();
>-						_fsp--;
>+ public InternalUmlParameterParser(TokenStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlParameterParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
>+ }
>+ 
> 
>+ public String[] getTokenNames() { return InternalUmlParameterParser.tokenNames; }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g"; }
> 
>-					}
> 
>-					after(grammarAccess.getParameterRuleAccess().getGroup());
>+ 
>+ 	private UmlParameterGrammarAccess grammarAccess;
>+ 	
>+ public void setGrammarAccess(UmlParameterGrammarAccess grammarAccess) {
>+ 	this.grammarAccess = grammarAccess;
>+ }
>+ 
>+ @Override
>+ protected Grammar getGrammar() {
>+ 	return grammarAccess.getGrammar();
>+ }
>+ 
>+ @Override
>+ protected String getValueForTokenName(String tokenName) {
>+ 	return tokenName;
>+ }
> 
>-				}
> 
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "entryRuleParameterRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:61:1: entryRuleParameterRule : ruleParameterRule EOF ;
>+ public final void entryRuleParameterRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:62:1: ( ruleParameterRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:63:1: ruleParameterRule EOF
>+ {
>+ before(grammarAccess.getParameterRuleRule()); 
>+ pushFollow(FOLLOW_ruleParameterRule_in_entryRuleParameterRule61);
>+ ruleParameterRule();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getParameterRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleParameterRule68); 
> 
>-	// $ANTLR end ruleParameterRule
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleParameterRule"
> 
>-	// $ANTLR start entryRuleModifiersRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:89:1: entryRuleModifiersRule : ruleModifiersRule EOF ;
>-	public final void entryRuleModifiersRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:90:1: ( ruleModifiersRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:91:1: ruleModifiersRule EOF
>-			{
>-				before(grammarAccess.getModifiersRuleRule());
>-				pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule121);
>-				ruleModifiersRule();
>-				_fsp--;
> 
>-				after(grammarAccess.getModifiersRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleModifiersRule128);
>+ // $ANTLR start "ruleParameterRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:70:1: ruleParameterRule : ( ( rule__ParameterRule__Group__0 ) ) ;
>+ public final void ruleParameterRule() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:74:2: ( ( ( rule__ParameterRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:75:1: ( ( rule__ParameterRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:75:1: ( ( rule__ParameterRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:76:1: ( rule__ParameterRule__Group__0 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:77:1: ( rule__ParameterRule__Group__0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:77:2: rule__ParameterRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__0_in_ruleParameterRule94);
>+ rule__ParameterRule__Group__0();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end entryRuleModifiersRule
> 
>+ }
> 
>-	// $ANTLR start ruleModifiersRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:98:1: ruleModifiersRule : ( ( rule__ModifiersRule__Group__0 ) ) ;
>-	public final void ruleModifiersRule() throws RecognitionException {
>+ after(grammarAccess.getParameterRuleAccess().getGroup()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:102:2: ( ( ( rule__ModifiersRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:103:1: ( ( rule__ModifiersRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:103:1: ( ( rule__ModifiersRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:104:1: ( rule__ModifiersRule__Group__0 )
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:105:1: ( rule__ModifiersRule__Group__0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:105:2: rule__ModifiersRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__ModifiersRule__Group__0_in_ruleModifiersRule154);
>-						rule__ModifiersRule__Group__0();
>-						_fsp--;
> 
>+ }
> 
>-					}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					after(grammarAccess.getModifiersRuleAccess().getGroup());
>+ 	restoreStackSize(stackSize);
> 
>-				}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleParameterRule"
> 
> 
>-			}
>+ // $ANTLR start "entryRuleModifiersRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:89:1: entryRuleModifiersRule : ruleModifiersRule EOF ;
>+ public final void entryRuleModifiersRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:90:1: ( ruleModifiersRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:91:1: ruleModifiersRule EOF
>+ {
>+ before(grammarAccess.getModifiersRuleRule()); 
>+ pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule121);
>+ ruleModifiersRule();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getModifiersRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule128); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end ruleModifiersRule
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleModifiersRule"
> 
> 
>-	// $ANTLR start entryRuleModifierSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:117:1: entryRuleModifierSpecification : ruleModifierSpecification EOF ;
>-	public final void entryRuleModifierSpecification() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:118:1: ( ruleModifierSpecification EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:119:1: ruleModifierSpecification EOF
>-			{
>-				before(grammarAccess.getModifierSpecificationRule());
>-				pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification181);
>-				ruleModifierSpecification();
>-				_fsp--;
>+ // $ANTLR start "ruleModifiersRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:98:1: ruleModifiersRule : ( ( rule__ModifiersRule__Group__0 ) ) ;
>+ public final void ruleModifiersRule() throws RecognitionException {
> 
>-				after(grammarAccess.getModifierSpecificationRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleModifierSpecification188);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:102:2: ( ( ( rule__ModifiersRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:103:1: ( ( rule__ModifiersRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:103:1: ( ( rule__ModifiersRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:104:1: ( rule__ModifiersRule__Group__0 )
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:105:1: ( rule__ModifiersRule__Group__0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:105:2: rule__ModifiersRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__0_in_ruleModifiersRule154);
>+ rule__ModifiersRule__Group__0();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end entryRuleModifierSpecification
>+ }
> 
>+ after(grammarAccess.getModifiersRuleAccess().getGroup()); 
> 
>-	// $ANTLR start ruleModifierSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:126:1: ruleModifierSpecification : ( ( rule__ModifierSpecification__ValueAssignment ) ) ;
>-	public final void ruleModifierSpecification() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:130:2: ( ( ( rule__ModifierSpecification__ValueAssignment ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:131:1: ( ( rule__ModifierSpecification__ValueAssignment ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:131:1: ( ( rule__ModifierSpecification__ValueAssignment ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:132:1: ( rule__ModifierSpecification__ValueAssignment )
>-				{
>-					before(grammarAccess.getModifierSpecificationAccess().getValueAssignment());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:133:1: ( rule__ModifierSpecification__ValueAssignment )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:133:2: rule__ModifierSpecification__ValueAssignment
>-					{
>-						pushFollow(FOLLOW_rule__ModifierSpecification__ValueAssignment_in_ruleModifierSpecification214);
>-						rule__ModifierSpecification__ValueAssignment();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getModifierSpecificationAccess().getValueAssignment());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleModifiersRule"
> 
>-				}
> 
>+ // $ANTLR start "entryRuleModifierSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:117:1: entryRuleModifierSpecification : ruleModifierSpecification EOF ;
>+ public final void entryRuleModifierSpecification() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:118:1: ( ruleModifierSpecification EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:119:1: ruleModifierSpecification EOF
>+ {
>+ before(grammarAccess.getModifierSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification181);
>+ ruleModifierSpecification();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getModifierSpecificationRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification188); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleModifierSpecification"
> 
>-	// $ANTLR end ruleModifierSpecification
> 
>+ // $ANTLR start "ruleModifierSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:126:1: ruleModifierSpecification : ( ( rule__ModifierSpecification__ValueAssignment ) ) ;
>+ public final void ruleModifierSpecification() throws RecognitionException {
> 
>-	// $ANTLR start entryRuleEffectRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:145:1: entryRuleEffectRule : ruleEffectRule EOF ;
>-	public final void entryRuleEffectRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:146:1: ( ruleEffectRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:147:1: ruleEffectRule EOF
>-			{
>-				before(grammarAccess.getEffectRuleRule());
>-				pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule241);
>-				ruleEffectRule();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:130:2: ( ( ( rule__ModifierSpecification__ValueAssignment ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:131:1: ( ( rule__ModifierSpecification__ValueAssignment ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:131:1: ( ( rule__ModifierSpecification__ValueAssignment ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:132:1: ( rule__ModifierSpecification__ValueAssignment )
>+ {
>+ before(grammarAccess.getModifierSpecificationAccess().getValueAssignment()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:133:1: ( rule__ModifierSpecification__ValueAssignment )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:133:2: rule__ModifierSpecification__ValueAssignment
>+ {
>+ pushFollow(FOLLOW_rule__ModifierSpecification__ValueAssignment_in_ruleModifierSpecification214);
>+ rule__ModifierSpecification__ValueAssignment();
> 
>-				after(grammarAccess.getEffectRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleEffectRule248);
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end entryRuleEffectRule
>+ after(grammarAccess.getModifierSpecificationAccess().getValueAssignment()); 
> 
>+ }
> 
>-	// $ANTLR start ruleEffectRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:154:1: ruleEffectRule : ( ( rule__EffectRule__Group__0 ) ) ;
>-	public final void ruleEffectRule() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:158:2: ( ( ( rule__EffectRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:159:1: ( ( rule__EffectRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:159:1: ( ( rule__EffectRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:160:1: ( rule__EffectRule__Group__0 )
>-				{
>-					before(grammarAccess.getEffectRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:161:1: ( rule__EffectRule__Group__0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:161:2: rule__EffectRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__EffectRule__Group__0_in_ruleEffectRule274);
>-						rule__EffectRule__Group__0();
>-						_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-					}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleModifierSpecification"
> 
>-					after(grammarAccess.getEffectRuleAccess().getGroup());
> 
>-				}
>+ // $ANTLR start "entryRuleEffectRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:145:1: entryRuleEffectRule : ruleEffectRule EOF ;
>+ public final void entryRuleEffectRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:146:1: ( ruleEffectRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:147:1: ruleEffectRule EOF
>+ {
>+ before(grammarAccess.getEffectRuleRule()); 
>+ pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule241);
>+ ruleEffectRule();
> 
>+ state._fsp--;
> 
>-			}
>+ after(grammarAccess.getEffectRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleEffectRule248); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleEffectRule"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end ruleEffectRule
>+ // $ANTLR start "ruleEffectRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:154:1: ruleEffectRule : ( ( rule__EffectRule__Group__0 ) ) ;
>+ public final void ruleEffectRule() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:158:2: ( ( ( rule__EffectRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:159:1: ( ( rule__EffectRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:159:1: ( ( rule__EffectRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:160:1: ( rule__EffectRule__Group__0 )
>+ {
>+ before(grammarAccess.getEffectRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:161:1: ( rule__EffectRule__Group__0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:161:2: rule__EffectRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__EffectRule__Group__0_in_ruleEffectRule274);
>+ rule__EffectRule__Group__0();
> 
>-	// $ANTLR start entryRuleQualifiedName
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:173:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
>-	public final void entryRuleQualifiedName() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:174:1: ( ruleQualifiedName EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:175:1: ruleQualifiedName EOF
>-			{
>-				before(grammarAccess.getQualifiedNameRule());
>-				pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName301);
>-				ruleQualifiedName();
>-				_fsp--;
>+ state._fsp--;
> 
>-				after(grammarAccess.getQualifiedNameRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName308);
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getEffectRuleAccess().getGroup()); 
> 
>-	// $ANTLR end entryRuleQualifiedName
>+ }
> 
> 
>-	// $ANTLR start ruleQualifiedName
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:182:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
>-	public final void ruleQualifiedName() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:186:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:187:1: ( ( rule__QualifiedName__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:187:1: ( ( rule__QualifiedName__Group__0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:188:1: ( rule__QualifiedName__Group__0 )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getGroup());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:189:1: ( rule__QualifiedName__Group__0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:189:2: rule__QualifiedName__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName334);
>-						rule__QualifiedName__Group__0();
>-						_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleEffectRule"
> 
>-					}
> 
>-					after(grammarAccess.getQualifiedNameAccess().getGroup());
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:173:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
>+ public final void entryRuleQualifiedName() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:174:1: ( ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:175:1: ruleQualifiedName EOF
>+ {
>+ before(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName301);
>+ ruleQualifiedName();
> 
>-				}
>+ state._fsp--;
> 
>+ after(grammarAccess.getQualifiedNameRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName308); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleQualifiedName"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:182:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
>+ public final void ruleQualifiedName() throws RecognitionException {
> 
>-	// $ANTLR end ruleQualifiedName
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:186:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:187:1: ( ( rule__QualifiedName__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:187:1: ( ( rule__QualifiedName__Group__0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:188:1: ( rule__QualifiedName__Group__0 )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:189:1: ( rule__QualifiedName__Group__0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:189:2: rule__QualifiedName__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName334);
>+ rule__QualifiedName__Group__0();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start entryRuleTypeRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:201:1: entryRuleTypeRule : ruleTypeRule EOF ;
>-	public final void entryRuleTypeRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:202:1: ( ruleTypeRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:203:1: ruleTypeRule EOF
>-			{
>-				before(grammarAccess.getTypeRuleRule());
>-				pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule361);
>-				ruleTypeRule();
>-				_fsp--;
> 
>-				after(grammarAccess.getTypeRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleTypeRule368);
>+ }
> 
>-			}
>+ after(grammarAccess.getQualifiedNameAccess().getGroup()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end entryRuleTypeRule
> 
>+ }
> 
>-	// $ANTLR start ruleTypeRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:210:1: ruleTypeRule : ( ( rule__TypeRule__Group__0 ) ) ;
>-	public final void ruleTypeRule() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:214:2: ( ( ( rule__TypeRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:215:1: ( ( rule__TypeRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:215:1: ( ( rule__TypeRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:216:1: ( rule__TypeRule__Group__0 )
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:217:1: ( rule__TypeRule__Group__0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:217:2: rule__TypeRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule394);
>-						rule__TypeRule__Group__0();
>-						_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleQualifiedName"
> 
> 
>-					}
>+ // $ANTLR start "entryRuleTypeRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:201:1: entryRuleTypeRule : ruleTypeRule EOF ;
>+ public final void entryRuleTypeRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:202:1: ( ruleTypeRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:203:1: ruleTypeRule EOF
>+ {
>+ before(grammarAccess.getTypeRuleRule()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule361);
>+ ruleTypeRule();
> 
>-					after(grammarAccess.getTypeRuleAccess().getGroup());
>+ state._fsp--;
> 
>-				}
>+ after(grammarAccess.getTypeRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule368); 
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleTypeRule"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "ruleTypeRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:210:1: ruleTypeRule : ( ( rule__TypeRule__Group__0 ) ) ;
>+ public final void ruleTypeRule() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:214:2: ( ( ( rule__TypeRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:215:1: ( ( rule__TypeRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:215:1: ( ( rule__TypeRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:216:1: ( rule__TypeRule__Group__0 )
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:217:1: ( rule__TypeRule__Group__0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:217:2: rule__TypeRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule394);
>+ rule__TypeRule__Group__0();
> 
>-	// $ANTLR end ruleTypeRule
>+ state._fsp--;
> 
> 
>-	// $ANTLR start entryRuleMultiplicityRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:229:1: entryRuleMultiplicityRule : ruleMultiplicityRule EOF ;
>-	public final void entryRuleMultiplicityRule() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:230:1: ( ruleMultiplicityRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:231:1: ruleMultiplicityRule EOF
>-			{
>-				before(grammarAccess.getMultiplicityRuleRule());
>-				pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule421);
>-				ruleMultiplicityRule();
>-				_fsp--;
>+ }
> 
>-				after(grammarAccess.getMultiplicityRuleRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleMultiplicityRule428);
>+ after(grammarAccess.getTypeRuleAccess().getGroup()); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end entryRuleMultiplicityRule
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start ruleMultiplicityRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:238:1: ruleMultiplicityRule : ( ( rule__MultiplicityRule__Group__0 ) ) ;
>-	public final void ruleMultiplicityRule() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleTypeRule"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:242:2: ( ( ( rule__MultiplicityRule__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:243:1: ( ( rule__MultiplicityRule__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:243:1: ( ( rule__MultiplicityRule__Group__0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:244:1: ( rule__MultiplicityRule__Group__0 )
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getGroup());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:245:1: ( rule__MultiplicityRule__Group__0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:245:2: rule__MultiplicityRule__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__MultiplicityRule__Group__0_in_ruleMultiplicityRule454);
>-						rule__MultiplicityRule__Group__0();
>-						_fsp--;
> 
>+ // $ANTLR start "entryRuleMultiplicityRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:229:1: entryRuleMultiplicityRule : ruleMultiplicityRule EOF ;
>+ public final void entryRuleMultiplicityRule() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:230:1: ( ruleMultiplicityRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:231:1: ruleMultiplicityRule EOF
>+ {
>+ before(grammarAccess.getMultiplicityRuleRule()); 
>+ pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule421);
>+ ruleMultiplicityRule();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getMultiplicityRuleAccess().getGroup());
>+ after(grammarAccess.getMultiplicityRuleRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule428); 
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleMultiplicityRule"
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "ruleMultiplicityRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:238:1: ruleMultiplicityRule : ( ( rule__MultiplicityRule__Group__0 ) ) ;
>+ public final void ruleMultiplicityRule() throws RecognitionException {
> 
>-			restoreStackSize(stackSize);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:242:2: ( ( ( rule__MultiplicityRule__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:243:1: ( ( rule__MultiplicityRule__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:243:1: ( ( rule__MultiplicityRule__Group__0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:244:1: ( rule__MultiplicityRule__Group__0 )
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:245:1: ( rule__MultiplicityRule__Group__0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:245:2: rule__MultiplicityRule__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__0_in_ruleMultiplicityRule454);
>+ rule__MultiplicityRule__Group__0();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end ruleMultiplicityRule
> 
>+ }
> 
>-	// $ANTLR start entryRuleBoundSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:257:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
>-	public final void entryRuleBoundSpecification() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:258:1: ( ruleBoundSpecification EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:259:1: ruleBoundSpecification EOF
>-			{
>-				before(grammarAccess.getBoundSpecificationRule());
>-				pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification481);
>-				ruleBoundSpecification();
>-				_fsp--;
>+ after(grammarAccess.getMultiplicityRuleAccess().getGroup()); 
> 
>-				after(grammarAccess.getBoundSpecificationRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleBoundSpecification488);
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end entryRuleBoundSpecification
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start ruleBoundSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:266:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
>-	public final void ruleBoundSpecification() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleMultiplicityRule"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:270:2: ( ( ( rule__BoundSpecification__ValueAssignment ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:271:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:271:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:272:1: ( rule__BoundSpecification__ValueAssignment )
>-				{
>-					before(grammarAccess.getBoundSpecificationAccess().getValueAssignment());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:273:1: ( rule__BoundSpecification__ValueAssignment )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:273:2: rule__BoundSpecification__ValueAssignment
>-					{
>-						pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification514);
>-						rule__BoundSpecification__ValueAssignment();
>-						_fsp--;
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:257:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
>+ public final void entryRuleBoundSpecification() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:258:1: ( ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:259:1: ruleBoundSpecification EOF
>+ {
>+ before(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification481);
>+ ruleBoundSpecification();
> 
>+ state._fsp--;
> 
>-					}
>+ after(grammarAccess.getBoundSpecificationRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification488); 
> 
>-					after(grammarAccess.getBoundSpecificationAccess().getValueAssignment());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
> 
>-			}
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:266:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
>+ public final void ruleBoundSpecification() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:270:2: ( ( ( rule__BoundSpecification__ValueAssignment ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:271:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:271:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:272:1: ( rule__BoundSpecification__ValueAssignment )
>+ {
>+ before(grammarAccess.getBoundSpecificationAccess().getValueAssignment()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:273:1: ( rule__BoundSpecification__ValueAssignment )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:273:2: rule__BoundSpecification__ValueAssignment
>+ {
>+ pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification514);
>+ rule__BoundSpecification__ValueAssignment();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end ruleBoundSpecification
>+ }
> 
>+ after(grammarAccess.getBoundSpecificationAccess().getValueAssignment()); 
> 
>-	// $ANTLR start ruleModifierKind
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:286:1: ruleModifierKind : ( ( rule__ModifierKind__Alternatives ) ) ;
>-	public final void ruleModifierKind() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:290:1: ( ( ( rule__ModifierKind__Alternatives ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:291:1: ( ( rule__ModifierKind__Alternatives ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:291:1: ( ( rule__ModifierKind__Alternatives ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:292:1: ( rule__ModifierKind__Alternatives )
>-				{
>-					before(grammarAccess.getModifierKindAccess().getAlternatives());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:293:1: ( rule__ModifierKind__Alternatives )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:293:2: rule__ModifierKind__Alternatives
>-					{
>-						pushFollow(FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind551);
>-						rule__ModifierKind__Alternatives();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getModifierKindAccess().getAlternatives());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleBoundSpecification"
> 
>-				}
> 
>+ // $ANTLR start "ruleModifierKind"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:286:1: ruleModifierKind : ( ( rule__ModifierKind__Alternatives ) ) ;
>+ public final void ruleModifierKind() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:290:1: ( ( ( rule__ModifierKind__Alternatives ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:291:1: ( ( rule__ModifierKind__Alternatives ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:291:1: ( ( rule__ModifierKind__Alternatives ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:292:1: ( rule__ModifierKind__Alternatives )
>+ {
>+ before(grammarAccess.getModifierKindAccess().getAlternatives()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:293:1: ( rule__ModifierKind__Alternatives )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:293:2: rule__ModifierKind__Alternatives
>+ {
>+ pushFollow(FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind551);
>+ rule__ModifierKind__Alternatives();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end ruleModifierKind
>+ after(grammarAccess.getModifierKindAccess().getAlternatives()); 
> 
>+ }
> 
>-	// $ANTLR start ruleEffectKind
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:305:1: ruleEffectKind : ( ( rule__EffectKind__Alternatives ) ) ;
>-	public final void ruleEffectKind() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:309:1: ( ( ( rule__EffectKind__Alternatives ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:310:1: ( ( rule__EffectKind__Alternatives ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:310:1: ( ( rule__EffectKind__Alternatives ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:311:1: ( rule__EffectKind__Alternatives )
>-				{
>-					before(grammarAccess.getEffectKindAccess().getAlternatives());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:312:1: ( rule__EffectKind__Alternatives )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:312:2: rule__EffectKind__Alternatives
>-					{
>-						pushFollow(FOLLOW_rule__EffectKind__Alternatives_in_ruleEffectKind587);
>-						rule__EffectKind__Alternatives();
>-						_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-					}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleModifierKind"
> 
>-					after(grammarAccess.getEffectKindAccess().getAlternatives());
> 
>-				}
>+ // $ANTLR start "ruleEffectKind"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:305:1: ruleEffectKind : ( ( rule__EffectKind__Alternatives ) ) ;
>+ public final void ruleEffectKind() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:309:1: ( ( ( rule__EffectKind__Alternatives ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:310:1: ( ( rule__EffectKind__Alternatives ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:310:1: ( ( rule__EffectKind__Alternatives ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:311:1: ( rule__EffectKind__Alternatives )
>+ {
>+ before(grammarAccess.getEffectKindAccess().getAlternatives()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:312:1: ( rule__EffectKind__Alternatives )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:312:2: rule__EffectKind__Alternatives
>+ {
>+ pushFollow(FOLLOW_rule__EffectKind__Alternatives_in_ruleEffectKind587);
>+ rule__EffectKind__Alternatives();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getEffectKindAccess().getAlternatives()); 
> 
>-	// $ANTLR end ruleEffectKind
>+ }
> 
> 
>-	// $ANTLR start ruleVisibilityKind
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:324:1: ruleVisibilityKind : ( ( rule__VisibilityKind__Alternatives ) ) ;
>-	public final void ruleVisibilityKind() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:328:1: ( ( ( rule__VisibilityKind__Alternatives ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:329:1: ( ( rule__VisibilityKind__Alternatives ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:329:1: ( ( rule__VisibilityKind__Alternatives ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:330:1: ( rule__VisibilityKind__Alternatives )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getAlternatives());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:331:1: ( rule__VisibilityKind__Alternatives )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:331:2: rule__VisibilityKind__Alternatives
>-					{
>-						pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind623);
>-						rule__VisibilityKind__Alternatives();
>-						_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleEffectKind"
> 
>-					}
> 
>-					after(grammarAccess.getVisibilityKindAccess().getAlternatives());
>+ // $ANTLR start "ruleVisibilityKind"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:324:1: ruleVisibilityKind : ( ( rule__VisibilityKind__Alternatives ) ) ;
>+ public final void ruleVisibilityKind() throws RecognitionException {
> 
>-				}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:328:1: ( ( ( rule__VisibilityKind__Alternatives ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:329:1: ( ( rule__VisibilityKind__Alternatives ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:329:1: ( ( rule__VisibilityKind__Alternatives ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:330:1: ( rule__VisibilityKind__Alternatives )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getAlternatives()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:331:1: ( rule__VisibilityKind__Alternatives )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:331:2: rule__VisibilityKind__Alternatives
>+ {
>+ pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind623);
>+ rule__VisibilityKind__Alternatives();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getVisibilityKindAccess().getAlternatives()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end ruleVisibilityKind
> 
>+ }
> 
>-	// $ANTLR start ruleDirection
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:343:1: ruleDirection : ( ( rule__Direction__Alternatives ) ) ;
>-	public final void ruleDirection() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:347:1: ( ( ( rule__Direction__Alternatives ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:348:1: ( ( rule__Direction__Alternatives ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:348:1: ( ( rule__Direction__Alternatives ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:349:1: ( rule__Direction__Alternatives )
>-				{
>-					before(grammarAccess.getDirectionAccess().getAlternatives());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:350:1: ( rule__Direction__Alternatives )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:350:2: rule__Direction__Alternatives
>-					{
>-						pushFollow(FOLLOW_rule__Direction__Alternatives_in_ruleDirection659);
>-						rule__Direction__Alternatives();
>-						_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleVisibilityKind"
> 
> 
>-					}
>+ // $ANTLR start "ruleDirection"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:343:1: ruleDirection : ( ( rule__Direction__Alternatives ) ) ;
>+ public final void ruleDirection() throws RecognitionException {
> 
>-					after(grammarAccess.getDirectionAccess().getAlternatives());
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:347:1: ( ( ( rule__Direction__Alternatives ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:348:1: ( ( rule__Direction__Alternatives ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:348:1: ( ( rule__Direction__Alternatives ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:349:1: ( rule__Direction__Alternatives )
>+ {
>+ before(grammarAccess.getDirectionAccess().getAlternatives()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:350:1: ( rule__Direction__Alternatives )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:350:2: rule__Direction__Alternatives
>+ {
>+ pushFollow(FOLLOW_rule__Direction__Alternatives_in_ruleDirection659);
>+ rule__Direction__Alternatives();
> 
>-				}
>+ state._fsp--;
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getDirectionAccess().getAlternatives()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end ruleDirection
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__ParameterRule__Alternatives_4
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:361:1: rule__ParameterRule__Alternatives_4 : ( ( ( rule__ParameterRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );
>-	public final void rule__ParameterRule__Alternatives_4() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleDirection"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:365:1: ( ( ( rule__ParameterRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) )
>-			int alt1 = 2;
>-			int LA1_0 = input.LA(1);
> 
>-			if((LA1_0 == RULE_ID)) {
>-				alt1 = 1;
>-			} else if((LA1_0 == 12)) {
>-				alt1 = 2;
>-			} else {
>-				NoViableAltException nvae = new NoViableAltException("361:1: rule__ParameterRule__Alternatives_4 : ( ( ( rule__ParameterRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );", 1, 0, input);
>+ // $ANTLR start "rule__ParameterRule__Alternatives_4"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:361:1: rule__ParameterRule__Alternatives_4 : ( ( ( rule__ParameterRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );
>+ public final void rule__ParameterRule__Alternatives_4() throws RecognitionException {
> 
>-				throw nvae;
>-			}
>-			switch(alt1) {
>-			case 1:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:366:1: ( ( rule__ParameterRule__TypeAssignment_4_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:366:1: ( ( rule__ParameterRule__TypeAssignment_4_0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:367:1: ( rule__ParameterRule__TypeAssignment_4_0 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getTypeAssignment_4_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:368:1: ( rule__ParameterRule__TypeAssignment_4_0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:368:2: rule__ParameterRule__TypeAssignment_4_0
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__TypeAssignment_4_0_in_rule__ParameterRule__Alternatives_4694);
>-						rule__ParameterRule__TypeAssignment_4_0();
>-						_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:365:1: ( ( ( rule__ParameterRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) )
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>+ if ( (LA1_0==RULE_ID) ) {
>+ alt1=1;
>+ }
>+ else if ( (LA1_0==12) ) {
>+ alt1=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 1, 0, input);
> 
>-					}
>+ throw nvae;
>+ }
>+ switch (alt1) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:366:1: ( ( rule__ParameterRule__TypeAssignment_4_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:366:1: ( ( rule__ParameterRule__TypeAssignment_4_0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:367:1: ( rule__ParameterRule__TypeAssignment_4_0 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getTypeAssignment_4_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:368:1: ( rule__ParameterRule__TypeAssignment_4_0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:368:2: rule__ParameterRule__TypeAssignment_4_0
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__TypeAssignment_4_0_in_rule__ParameterRule__Alternatives_4694);
>+ rule__ParameterRule__TypeAssignment_4_0();
> 
>-					after(grammarAccess.getParameterRuleAccess().getTypeAssignment_4_0());
>+ state._fsp--;
> 
>-				}
> 
>+ }
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:372:6: ( '<Undefined>' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:372:6: ( '<Undefined>' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:373:1: '<Undefined>'
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1());
>-					match(input, 12, FOLLOW_12_in_rule__ParameterRule__Alternatives_4713);
>-					after(grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1());
>+ after(grammarAccess.getParameterRuleAccess().getTypeAssignment_4_0()); 
> 
>-				}
>+ }
> 
> 
>-			}
>-				break;
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:372:6: ( '<Undefined>' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:372:6: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:373:1: '<Undefined>'
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1()); 
>+ match(input,12,FOLLOW_12_in_rule__ParameterRule__Alternatives_4713); 
>+ after(grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1()); 
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
>+ break;
> 
>-	// $ANTLR end rule__ParameterRule__Alternatives_4
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__ModifierKind__Alternatives
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:385:1: rule__ModifierKind__Alternatives : ( ( ( 'exception' ) ) | ( ( 'stream' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );
>-	public final void rule__ModifierKind__Alternatives() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Alternatives_4"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:389:1: ( ( ( 'exception' ) ) | ( ( 'stream' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) )
>-			int alt2 = 4;
>-			switch(input.LA(1)) {
>-			case 13:
>-			{
>-				alt2 = 1;
>-			}
>-				break;
>-			case 14:
>-			{
>-				alt2 = 2;
>-			}
>-				break;
>-			case 15:
>-			{
>-				alt2 = 3;
>-			}
>-				break;
>-			case 16:
>-			{
>-				alt2 = 4;
>-			}
>-				break;
>-			default:
>-				NoViableAltException nvae = new NoViableAltException("385:1: rule__ModifierKind__Alternatives : ( ( ( 'exception' ) ) | ( ( 'stream' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );", 2, 0, input);
>+ // $ANTLR start "rule__ModifierKind__Alternatives"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:385:1: rule__ModifierKind__Alternatives : ( ( ( 'exception' ) ) | ( ( 'stream' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );
>+ public final void rule__ModifierKind__Alternatives() throws RecognitionException {
> 
>-				throw nvae;
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:389:1: ( ( ( 'exception' ) ) | ( ( 'stream' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) )
>+ int alt2=4;
>+ switch ( input.LA(1) ) {
>+ case 13:
>+ {
>+ alt2=1;
>+ }
>+ break;
>+ case 14:
>+ {
>+ alt2=2;
>+ }
>+ break;
>+ case 15:
>+ {
>+ alt2=3;
>+ }
>+ break;
>+ case 16:
>+ {
>+ alt2=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>-			switch(alt2) {
>-			case 1:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:390:1: ( ( 'exception' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:390:1: ( ( 'exception' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:391:1: ( 'exception' )
>-				{
>-					before(grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:392:1: ( 'exception' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:392:3: 'exception'
>-					{
>-						match(input, 13, FOLLOW_13_in_rule__ModifierKind__Alternatives748);
>+ throw nvae;
>+ }
> 
>-					}
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:390:1: ( ( 'exception' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:390:1: ( ( 'exception' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:391:1: ( 'exception' )
>+ {
>+ before(grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:392:1: ( 'exception' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:392:3: 'exception'
>+ {
>+ match(input,13,FOLLOW_13_in_rule__ModifierKind__Alternatives748); 
> 
>-					after(grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0());
>+ }
> 
>-				}
>+ after(grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0()); 
> 
>+ }
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:397:6: ( ( 'stream' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:397:6: ( ( 'stream' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:398:1: ( 'stream' )
>-				{
>-					before(grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:399:1: ( 'stream' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:399:3: 'stream'
>-					{
>-						match(input, 14, FOLLOW_14_in_rule__ModifierKind__Alternatives769);
> 
>-					}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:397:6: ( ( 'stream' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:397:6: ( ( 'stream' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:398:1: ( 'stream' )
>+ {
>+ before(grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:399:1: ( 'stream' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:399:3: 'stream'
>+ {
>+ match(input,14,FOLLOW_14_in_rule__ModifierKind__Alternatives769); 
> 
>-					after(grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1());
>+ }
> 
>-				}
>+ after(grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1()); 
> 
>+ }
> 
>-			}
>-				break;
>-			case 3:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:404:6: ( ( 'ordered' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:404:6: ( ( 'ordered' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:405:1: ( 'ordered' )
>-				{
>-					before(grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:406:1: ( 'ordered' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:406:3: 'ordered'
>-					{
>-						match(input, 15, FOLLOW_15_in_rule__ModifierKind__Alternatives790);
> 
>-					}
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:404:6: ( ( 'ordered' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:404:6: ( ( 'ordered' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:405:1: ( 'ordered' )
>+ {
>+ before(grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:406:1: ( 'ordered' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:406:3: 'ordered'
>+ {
>+ match(input,15,FOLLOW_15_in_rule__ModifierKind__Alternatives790); 
> 
>-					after(grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2());
>+ }
> 
>-				}
>+ after(grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2()); 
> 
>+ }
> 
>-			}
>-				break;
>-			case 4:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:411:6: ( ( 'unique' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:411:6: ( ( 'unique' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:412:1: ( 'unique' )
>-				{
>-					before(grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:413:1: ( 'unique' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:413:3: 'unique'
>-					{
>-						match(input, 16, FOLLOW_16_in_rule__ModifierKind__Alternatives811);
> 
>-					}
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:411:6: ( ( 'unique' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:411:6: ( ( 'unique' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:412:1: ( 'unique' )
>+ {
>+ before(grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:413:1: ( 'unique' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:413:3: 'unique'
>+ {
>+ match(input,16,FOLLOW_16_in_rule__ModifierKind__Alternatives811); 
> 
>-					after(grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3());
>+ }
> 
>-				}
>+ after(grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3()); 
> 
>+ }
> 
>-			}
>-				break;
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ break;
> 
>-			restoreStackSize(stackSize);
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__ModifierKind__Alternatives
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifierKind__Alternatives"
> 
> 
>-	// $ANTLR start rule__EffectKind__Alternatives
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:423:1: rule__EffectKind__Alternatives : ( ( ( 'create' ) ) | ( ( 'read' ) ) | ( ( 'update' ) ) | ( ( 'delete' ) ) );
>-	public final void rule__EffectKind__Alternatives() throws RecognitionException {
>+ // $ANTLR start "rule__EffectKind__Alternatives"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:423:1: rule__EffectKind__Alternatives : ( ( ( 'create' ) ) | ( ( 'read' ) ) | ( ( 'update' ) ) | ( ( 'delete' ) ) );
>+ public final void rule__EffectKind__Alternatives() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:427:1: ( ( ( 'create' ) ) | ( ( 'read' ) ) | ( ( 'update' ) ) | ( ( 'delete' ) ) )
>+ int alt3=4;
>+ switch ( input.LA(1) ) {
>+ case 17:
>+ {
>+ alt3=1;
>+ }
>+ break;
>+ case 18:
>+ {
>+ alt3=2;
>+ }
>+ break;
>+ case 19:
>+ {
>+ alt3=3;
>+ }
>+ break;
>+ case 20:
>+ {
>+ alt3=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 3, 0, input);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:427:1: ( ( ( 'create' ) ) | ( ( 'read' ) ) | ( ( 'update' ) ) | ( ( 'delete' ) ) )
>-			int alt3 = 4;
>-			switch(input.LA(1)) {
>-			case 17:
>-			{
>-				alt3 = 1;
>-			}
>-				break;
>-			case 18:
>-			{
>-				alt3 = 2;
>-			}
>-				break;
>-			case 19:
>-			{
>-				alt3 = 3;
>-			}
>-				break;
>-			case 20:
>-			{
>-				alt3 = 4;
>-			}
>-				break;
>-			default:
>-				NoViableAltException nvae = new NoViableAltException("423:1: rule__EffectKind__Alternatives : ( ( ( 'create' ) ) | ( ( 'read' ) ) | ( ( 'update' ) ) | ( ( 'delete' ) ) );", 3, 0, input);
>+ throw nvae;
>+ }
> 
>-				throw nvae;
>-			}
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:428:1: ( ( 'create' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:428:1: ( ( 'create' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:429:1: ( 'create' )
>+ {
>+ before(grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:430:1: ( 'create' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:430:3: 'create'
>+ {
>+ match(input,17,FOLLOW_17_in_rule__EffectKind__Alternatives847); 
> 
>-			switch(alt3) {
>-			case 1:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:428:1: ( ( 'create' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:428:1: ( ( 'create' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:429:1: ( 'create' )
>-				{
>-					before(grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:430:1: ( 'create' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:430:3: 'create'
>-					{
>-						match(input, 17, FOLLOW_17_in_rule__EffectKind__Alternatives847);
>+ }
> 
>-					}
>+ after(grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0()); 
> 
>-					after(grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0());
>+ }
> 
>-				}
> 
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:435:6: ( ( 'read' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:435:6: ( ( 'read' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:436:1: ( 'read' )
>+ {
>+ before(grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:437:1: ( 'read' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:437:3: 'read'
>+ {
>+ match(input,18,FOLLOW_18_in_rule__EffectKind__Alternatives868); 
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:435:6: ( ( 'read' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:435:6: ( ( 'read' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:436:1: ( 'read' )
>-				{
>-					before(grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:437:1: ( 'read' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:437:3: 'read'
>-					{
>-						match(input, 18, FOLLOW_18_in_rule__EffectKind__Alternatives868);
>+ }
> 
>-					}
>+ after(grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1()); 
> 
>-					after(grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1());
>+ }
> 
>-				}
> 
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:442:6: ( ( 'update' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:442:6: ( ( 'update' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:443:1: ( 'update' )
>+ {
>+ before(grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:444:1: ( 'update' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:444:3: 'update'
>+ {
>+ match(input,19,FOLLOW_19_in_rule__EffectKind__Alternatives889); 
> 
>-			}
>-				break;
>-			case 3:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:442:6: ( ( 'update' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:442:6: ( ( 'update' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:443:1: ( 'update' )
>-				{
>-					before(grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:444:1: ( 'update' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:444:3: 'update'
>-					{
>-						match(input, 19, FOLLOW_19_in_rule__EffectKind__Alternatives889);
>+ }
> 
>-					}
>+ after(grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2()); 
> 
>-					after(grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2());
>+ }
> 
>-				}
> 
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:449:6: ( ( 'delete' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:449:6: ( ( 'delete' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:450:1: ( 'delete' )
>+ {
>+ before(grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:451:1: ( 'delete' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:451:3: 'delete'
>+ {
>+ match(input,20,FOLLOW_20_in_rule__EffectKind__Alternatives910); 
> 
>-			}
>-				break;
>-			case 4:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:449:6: ( ( 'delete' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:449:6: ( ( 'delete' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:450:1: ( 'delete' )
>-				{
>-					before(grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:451:1: ( 'delete' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:451:3: 'delete'
>-					{
>-						match(input, 20, FOLLOW_20_in_rule__EffectKind__Alternatives910);
>+ }
> 
>-					}
>+ after(grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3()); 
> 
>-					after(grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3());
>+ }
> 
>-				}
> 
>+ }
>+ break;
> 
>-			}
>-				break;
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectKind__Alternatives"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__EffectKind__Alternatives
>+ // $ANTLR start "rule__VisibilityKind__Alternatives"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:461:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );
>+ public final void rule__VisibilityKind__Alternatives() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:465:1: ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) )
>+ int alt4=4;
>+ switch ( input.LA(1) ) {
>+ case 21:
>+ {
>+ alt4=1;
>+ }
>+ break;
>+ case 22:
>+ {
>+ alt4=2;
>+ }
>+ break;
>+ case 23:
>+ {
>+ alt4=3;
>+ }
>+ break;
>+ case 24:
>+ {
>+ alt4=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 4, 0, input);
> 
>-	// $ANTLR start rule__VisibilityKind__Alternatives
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:461:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );
>-	public final void rule__VisibilityKind__Alternatives() throws RecognitionException {
>+ throw nvae;
>+ }
> 
>-		int stackSize = keepStackSize();
>+ switch (alt4) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:466:1: ( ( '+' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:466:1: ( ( '+' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:467:1: ( '+' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:468:1: ( '+' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:468:3: '+'
>+ {
>+ match(input,21,FOLLOW_21_in_rule__VisibilityKind__Alternatives946); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:465:1: ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) )
>-			int alt4 = 4;
>-			switch(input.LA(1)) {
>-			case 21:
>-			{
>-				alt4 = 1;
>-			}
>-				break;
>-			case 22:
>-			{
>-				alt4 = 2;
>-			}
>-				break;
>-			case 23:
>-			{
>-				alt4 = 3;
>-			}
>-				break;
>-			case 24:
>-			{
>-				alt4 = 4;
>-			}
>-				break;
>-			default:
>-				NoViableAltException nvae = new NoViableAltException("461:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );", 4, 0, input);
>+ }
> 
>-				throw nvae;
>-			}
>+ after(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
> 
>-			switch(alt4) {
>-			case 1:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:466:1: ( ( '+' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:466:1: ( ( '+' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:467:1: ( '+' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:468:1: ( '+' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:468:3: '+'
>-					{
>-						match(input, 21, FOLLOW_21_in_rule__VisibilityKind__Alternatives946);
>+ }
> 
>-					}
> 
>-					after(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0());
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:473:6: ( ( '-' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:473:6: ( ( '-' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:474:1: ( '-' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:475:1: ( '-' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:475:3: '-'
>+ {
>+ match(input,22,FOLLOW_22_in_rule__VisibilityKind__Alternatives967); 
> 
>-				}
>+ }
> 
>+ after(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:473:6: ( ( '-' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:473:6: ( ( '-' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:474:1: ( '-' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:475:1: ( '-' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:475:3: '-'
>-					{
>-						match(input, 22, FOLLOW_22_in_rule__VisibilityKind__Alternatives967);
>+ }
> 
>-					}
> 
>-					after(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1());
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:480:6: ( ( '#' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:480:6: ( ( '#' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:481:1: ( '#' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:482:1: ( '#' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:482:3: '#'
>+ {
>+ match(input,23,FOLLOW_23_in_rule__VisibilityKind__Alternatives988); 
> 
>-				}
>+ }
> 
>+ after(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
> 
>-			}
>-				break;
>-			case 3:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:480:6: ( ( '#' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:480:6: ( ( '#' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:481:1: ( '#' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:482:1: ( '#' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:482:3: '#'
>-					{
>-						match(input, 23, FOLLOW_23_in_rule__VisibilityKind__Alternatives988);
>+ }
> 
>-					}
> 
>-					after(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2());
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:487:6: ( ( '~' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:487:6: ( ( '~' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:488:1: ( '~' )
>+ {
>+ before(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:489:1: ( '~' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:489:3: '~'
>+ {
>+ match(input,24,FOLLOW_24_in_rule__VisibilityKind__Alternatives1009); 
> 
>-				}
>+ }
> 
>+ after(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
> 
>-			}
>-				break;
>-			case 4:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:487:6: ( ( '~' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:487:6: ( ( '~' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:488:1: ( '~' )
>-				{
>-					before(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:489:1: ( '~' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:489:3: '~'
>-					{
>-						match(input, 24, FOLLOW_24_in_rule__VisibilityKind__Alternatives1009);
>+ }
> 
>-					}
> 
>-					after(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3());
>+ }
>+ break;
> 
>-				}
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>-				break;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__VisibilityKind__Alternatives"
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "rule__Direction__Alternatives"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:499:1: rule__Direction__Alternatives : ( ( ( 'in' ) ) | ( ( 'out' ) ) | ( ( 'inout' ) ) | ( ( 'return' ) ) );
>+ public final void rule__Direction__Alternatives() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:503:1: ( ( ( 'in' ) ) | ( ( 'out' ) ) | ( ( 'inout' ) ) | ( ( 'return' ) ) )
>+ int alt5=4;
>+ switch ( input.LA(1) ) {
>+ case 25:
>+ {
>+ alt5=1;
>+ }
>+ break;
>+ case 26:
>+ {
>+ alt5=2;
>+ }
>+ break;
>+ case 27:
>+ {
>+ alt5=3;
>+ }
>+ break;
>+ case 28:
>+ {
>+ alt5=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 5, 0, input);
> 
>-	// $ANTLR end rule__VisibilityKind__Alternatives
>+ throw nvae;
>+ }
> 
>+ switch (alt5) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:504:1: ( ( 'in' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:504:1: ( ( 'in' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:505:1: ( 'in' )
>+ {
>+ before(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:506:1: ( 'in' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:506:3: 'in'
>+ {
>+ match(input,25,FOLLOW_25_in_rule__Direction__Alternatives1045); 
> 
>-	// $ANTLR start rule__Direction__Alternatives
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:499:1: rule__Direction__Alternatives : ( ( ( 'in' ) ) | ( ( 'out' ) ) | ( ( 'inout' ) ) | ( ( 'return' ) ) );
>-	public final void rule__Direction__Alternatives() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:503:1: ( ( ( 'in' ) ) | ( ( 'out' ) ) | ( ( 'inout' ) ) | ( ( 'return' ) ) )
>-			int alt5 = 4;
>-			switch(input.LA(1)) {
>-			case 25:
>-			{
>-				alt5 = 1;
>-			}
>-				break;
>-			case 26:
>-			{
>-				alt5 = 2;
>-			}
>-				break;
>-			case 27:
>-			{
>-				alt5 = 3;
>-			}
>-				break;
>-			case 28:
>-			{
>-				alt5 = 4;
>-			}
>-				break;
>-			default:
>-				NoViableAltException nvae = new NoViableAltException("499:1: rule__Direction__Alternatives : ( ( ( 'in' ) ) | ( ( 'out' ) ) | ( ( 'inout' ) ) | ( ( 'return' ) ) );", 5, 0, input);
>+ }
> 
>-				throw nvae;
>-			}
> 
>-			switch(alt5) {
>-			case 1:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:504:1: ( ( 'in' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:504:1: ( ( 'in' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:505:1: ( 'in' )
>-				{
>-					before(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:506:1: ( 'in' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:506:3: 'in'
>-					{
>-						match(input, 25, FOLLOW_25_in_rule__Direction__Alternatives1045);
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:511:6: ( ( 'out' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:511:6: ( ( 'out' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:512:1: ( 'out' )
>+ {
>+ before(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:513:1: ( 'out' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:513:3: 'out'
>+ {
>+ match(input,26,FOLLOW_26_in_rule__Direction__Alternatives1066); 
> 
>-					}
>+ }
> 
>-					after(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0());
>+ after(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); 
> 
>-				}
>+ }
> 
> 
>-			}
>-				break;
>-			case 2:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:511:6: ( ( 'out' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:511:6: ( ( 'out' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:512:1: ( 'out' )
>-				{
>-					before(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:513:1: ( 'out' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:513:3: 'out'
>-					{
>-						match(input, 26, FOLLOW_26_in_rule__Direction__Alternatives1066);
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:518:6: ( ( 'inout' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:518:6: ( ( 'inout' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:519:1: ( 'inout' )
>+ {
>+ before(grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:520:1: ( 'inout' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:520:3: 'inout'
>+ {
>+ match(input,27,FOLLOW_27_in_rule__Direction__Alternatives1087); 
> 
>-					}
>+ }
> 
>-					after(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1());
>+ after(grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2()); 
> 
>-				}
>+ }
> 
> 
>-			}
>-				break;
>-			case 3:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:518:6: ( ( 'inout' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:518:6: ( ( 'inout' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:519:1: ( 'inout' )
>-				{
>-					before(grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:520:1: ( 'inout' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:520:3: 'inout'
>-					{
>-						match(input, 27, FOLLOW_27_in_rule__Direction__Alternatives1087);
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:525:6: ( ( 'return' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:525:6: ( ( 'return' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:526:1: ( 'return' )
>+ {
>+ before(grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:527:1: ( 'return' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:527:3: 'return'
>+ {
>+ match(input,28,FOLLOW_28_in_rule__Direction__Alternatives1108); 
> 
>-					}
>+ }
> 
>-					after(grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2());
>+ after(grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3()); 
> 
>-				}
>+ }
> 
> 
>-			}
>-				break;
>-			case 4:
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:525:6: ( ( 'return' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:525:6: ( ( 'return' ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:526:1: ( 'return' )
>-				{
>-					before(grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:527:1: ( 'return' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:527:3: 'return'
>-					{
>-						match(input, 28, FOLLOW_28_in_rule__Direction__Alternatives1108);
>+ }
>+ break;
> 
>-					}
>+ }
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					after(grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3());
>+ 	restoreStackSize(stackSize);
> 
>-				}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__Direction__Alternatives"
> 
> 
>-			}
>-				break;
>+ // $ANTLR start "rule__ParameterRule__Group__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:539:1: rule__ParameterRule__Group__0 : rule__ParameterRule__Group__0__Impl rule__ParameterRule__Group__1 ;
>+ public final void rule__ParameterRule__Group__0() throws RecognitionException {
> 
>-			}
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:543:1: ( rule__ParameterRule__Group__0__Impl rule__ParameterRule__Group__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:544:2: rule__ParameterRule__Group__0__Impl rule__ParameterRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__0__Impl_in_rule__ParameterRule__Group__01141);
>+ rule__ParameterRule__Group__0__Impl();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__1_in_rule__ParameterRule__Group__01144);
>+ rule__ParameterRule__Group__1();
> 
>-	// $ANTLR end rule__Direction__Alternatives
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__ParameterRule__Group__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:539:1: rule__ParameterRule__Group__0 : rule__ParameterRule__Group__0__Impl rule__ParameterRule__Group__1 ;
>-	public final void rule__ParameterRule__Group__0() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:543:1: ( rule__ParameterRule__Group__0__Impl rule__ParameterRule__Group__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:544:2: rule__ParameterRule__Group__0__Impl rule__ParameterRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__0__Impl_in_rule__ParameterRule__Group__01141);
>-				rule__ParameterRule__Group__0__Impl();
>-				_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__1_in_rule__ParameterRule__Group__01144);
>-				rule__ParameterRule__Group__1();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__0"
> 
> 
>-			}
>+ // $ANTLR start "rule__ParameterRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:551:1: rule__ParameterRule__Group__0__Impl : ( ( rule__ParameterRule__VisibilityAssignment_0 ) ) ;
>+ public final void rule__ParameterRule__Group__0__Impl() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:555:1: ( ( ( rule__ParameterRule__VisibilityAssignment_0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:556:1: ( ( rule__ParameterRule__VisibilityAssignment_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:556:1: ( ( rule__ParameterRule__VisibilityAssignment_0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:557:1: ( rule__ParameterRule__VisibilityAssignment_0 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getVisibilityAssignment_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:558:1: ( rule__ParameterRule__VisibilityAssignment_0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:558:2: rule__ParameterRule__VisibilityAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__VisibilityAssignment_0_in_rule__ParameterRule__Group__0__Impl1171);
>+ rule__ParameterRule__VisibilityAssignment_0();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__Group__0
>+ }
> 
>+ after(grammarAccess.getParameterRuleAccess().getVisibilityAssignment_0()); 
> 
>-	// $ANTLR start rule__ParameterRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:551:1: rule__ParameterRule__Group__0__Impl : ( ( rule__ParameterRule__VisibilityAssignment_0 ) ) ;
>-	public final void rule__ParameterRule__Group__0__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:555:1: ( ( ( rule__ParameterRule__VisibilityAssignment_0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:556:1: ( ( rule__ParameterRule__VisibilityAssignment_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:556:1: ( ( rule__ParameterRule__VisibilityAssignment_0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:557:1: ( rule__ParameterRule__VisibilityAssignment_0 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getVisibilityAssignment_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:558:1: ( rule__ParameterRule__VisibilityAssignment_0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:558:2: rule__ParameterRule__VisibilityAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__VisibilityAssignment_0_in_rule__ParameterRule__Group__0__Impl1171);
>-						rule__ParameterRule__VisibilityAssignment_0();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getParameterRuleAccess().getVisibilityAssignment_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__0__Impl"
> 
>-				}
> 
>+ // $ANTLR start "rule__ParameterRule__Group__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:568:1: rule__ParameterRule__Group__1 : rule__ParameterRule__Group__1__Impl rule__ParameterRule__Group__2 ;
>+ public final void rule__ParameterRule__Group__1() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:572:1: ( rule__ParameterRule__Group__1__Impl rule__ParameterRule__Group__2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:573:2: rule__ParameterRule__Group__1__Impl rule__ParameterRule__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__1__Impl_in_rule__ParameterRule__Group__11201);
>+ rule__ParameterRule__Group__1__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__2_in_rule__ParameterRule__Group__11204);
>+ rule__ParameterRule__Group__2();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ParameterRule__Group__0__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__ParameterRule__Group__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:568:1: rule__ParameterRule__Group__1 : rule__ParameterRule__Group__1__Impl rule__ParameterRule__Group__2 ;
>-	public final void rule__ParameterRule__Group__1() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:572:1: ( rule__ParameterRule__Group__1__Impl rule__ParameterRule__Group__2 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:573:2: rule__ParameterRule__Group__1__Impl rule__ParameterRule__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__1__Impl_in_rule__ParameterRule__Group__11201);
>-				rule__ParameterRule__Group__1__Impl();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__1"
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__2_in_rule__ParameterRule__Group__11204);
>-				rule__ParameterRule__Group__2();
>-				_fsp--;
> 
>+ // $ANTLR start "rule__ParameterRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:580:1: rule__ParameterRule__Group__1__Impl : ( ( rule__ParameterRule__DirectionAssignment_1 ) ) ;
>+ public final void rule__ParameterRule__Group__1__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:584:1: ( ( ( rule__ParameterRule__DirectionAssignment_1 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:585:1: ( ( rule__ParameterRule__DirectionAssignment_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:585:1: ( ( rule__ParameterRule__DirectionAssignment_1 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:586:1: ( rule__ParameterRule__DirectionAssignment_1 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getDirectionAssignment_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:587:1: ( rule__ParameterRule__DirectionAssignment_1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:587:2: rule__ParameterRule__DirectionAssignment_1
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__DirectionAssignment_1_in_rule__ParameterRule__Group__1__Impl1231);
>+ rule__ParameterRule__DirectionAssignment_1();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ParameterRule__Group__1
>+ after(grammarAccess.getParameterRuleAccess().getDirectionAssignment_1()); 
> 
>+ }
> 
>-	// $ANTLR start rule__ParameterRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:580:1: rule__ParameterRule__Group__1__Impl : ( ( rule__ParameterRule__DirectionAssignment_1 ) ) ;
>-	public final void rule__ParameterRule__Group__1__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:584:1: ( ( ( rule__ParameterRule__DirectionAssignment_1 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:585:1: ( ( rule__ParameterRule__DirectionAssignment_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:585:1: ( ( rule__ParameterRule__DirectionAssignment_1 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:586:1: ( rule__ParameterRule__DirectionAssignment_1 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getDirectionAssignment_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:587:1: ( rule__ParameterRule__DirectionAssignment_1 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:587:2: rule__ParameterRule__DirectionAssignment_1
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__DirectionAssignment_1_in_rule__ParameterRule__Group__1__Impl1231);
>-						rule__ParameterRule__DirectionAssignment_1();
>-						_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-					}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__1__Impl"
> 
>-					after(grammarAccess.getParameterRuleAccess().getDirectionAssignment_1());
> 
>-				}
>+ // $ANTLR start "rule__ParameterRule__Group__2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:597:1: rule__ParameterRule__Group__2 : rule__ParameterRule__Group__2__Impl rule__ParameterRule__Group__3 ;
>+ public final void rule__ParameterRule__Group__2() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:601:1: ( rule__ParameterRule__Group__2__Impl rule__ParameterRule__Group__3 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:602:2: rule__ParameterRule__Group__2__Impl rule__ParameterRule__Group__3
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__2__Impl_in_rule__ParameterRule__Group__21261);
>+ rule__ParameterRule__Group__2__Impl();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__3_in_rule__ParameterRule__Group__21264);
>+ rule__ParameterRule__Group__3();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__Group__1__Impl
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__ParameterRule__Group__2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:597:1: rule__ParameterRule__Group__2 : rule__ParameterRule__Group__2__Impl rule__ParameterRule__Group__3 ;
>-	public final void rule__ParameterRule__Group__2() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__2"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:601:1: ( rule__ParameterRule__Group__2__Impl rule__ParameterRule__Group__3 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:602:2: rule__ParameterRule__Group__2__Impl rule__ParameterRule__Group__3
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__2__Impl_in_rule__ParameterRule__Group__21261);
>-				rule__ParameterRule__Group__2__Impl();
>-				_fsp--;
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__3_in_rule__ParameterRule__Group__21264);
>-				rule__ParameterRule__Group__3();
>-				_fsp--;
>+ // $ANTLR start "rule__ParameterRule__Group__2__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:609:1: rule__ParameterRule__Group__2__Impl : ( ( rule__ParameterRule__NameAssignment_2 ) ) ;
>+ public final void rule__ParameterRule__Group__2__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:613:1: ( ( ( rule__ParameterRule__NameAssignment_2 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:614:1: ( ( rule__ParameterRule__NameAssignment_2 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:614:1: ( ( rule__ParameterRule__NameAssignment_2 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:615:1: ( rule__ParameterRule__NameAssignment_2 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getNameAssignment_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:616:1: ( rule__ParameterRule__NameAssignment_2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:616:2: rule__ParameterRule__NameAssignment_2
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__NameAssignment_2_in_rule__ParameterRule__Group__2__Impl1291);
>+ rule__ParameterRule__NameAssignment_2();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getParameterRuleAccess().getNameAssignment_2()); 
> 
>-	// $ANTLR end rule__ParameterRule__Group__2
>+ }
> 
> 
>-	// $ANTLR start rule__ParameterRule__Group__2__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:609:1: rule__ParameterRule__Group__2__Impl : ( ( rule__ParameterRule__NameAssignment_2 ) ) ;
>-	public final void rule__ParameterRule__Group__2__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:613:1: ( ( ( rule__ParameterRule__NameAssignment_2 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:614:1: ( ( rule__ParameterRule__NameAssignment_2 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:614:1: ( ( rule__ParameterRule__NameAssignment_2 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:615:1: ( rule__ParameterRule__NameAssignment_2 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getNameAssignment_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:616:1: ( rule__ParameterRule__NameAssignment_2 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:616:2: rule__ParameterRule__NameAssignment_2
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__NameAssignment_2_in_rule__ParameterRule__Group__2__Impl1291);
>-						rule__ParameterRule__NameAssignment_2();
>-						_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__2__Impl"
> 
>-					}
> 
>-					after(grammarAccess.getParameterRuleAccess().getNameAssignment_2());
>+ // $ANTLR start "rule__ParameterRule__Group__3"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:626:1: rule__ParameterRule__Group__3 : rule__ParameterRule__Group__3__Impl rule__ParameterRule__Group__4 ;
>+ public final void rule__ParameterRule__Group__3() throws RecognitionException {
> 
>-				}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:630:1: ( rule__ParameterRule__Group__3__Impl rule__ParameterRule__Group__4 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:631:2: rule__ParameterRule__Group__3__Impl rule__ParameterRule__Group__4
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__3__Impl_in_rule__ParameterRule__Group__31321);
>+ rule__ParameterRule__Group__3__Impl();
> 
>+ state._fsp--;
> 
>-			}
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__4_in_rule__ParameterRule__Group__31324);
>+ rule__ParameterRule__Group__4();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ParameterRule__Group__2__Impl
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__ParameterRule__Group__3
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:626:1: rule__ParameterRule__Group__3 : rule__ParameterRule__Group__3__Impl rule__ParameterRule__Group__4 ;
>-	public final void rule__ParameterRule__Group__3() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__3"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:630:1: ( rule__ParameterRule__Group__3__Impl rule__ParameterRule__Group__4 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:631:2: rule__ParameterRule__Group__3__Impl rule__ParameterRule__Group__4
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__3__Impl_in_rule__ParameterRule__Group__31321);
>-				rule__ParameterRule__Group__3__Impl();
>-				_fsp--;
>+ // $ANTLR start "rule__ParameterRule__Group__3__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:638:1: rule__ParameterRule__Group__3__Impl : ( ':' ) ;
>+ public final void rule__ParameterRule__Group__3__Impl() throws RecognitionException {
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__4_in_rule__ParameterRule__Group__31324);
>-				rule__ParameterRule__Group__4();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:642:1: ( ( ':' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:643:1: ( ':' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:643:1: ( ':' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:644:1: ':'
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getColonKeyword_3()); 
>+ match(input,29,FOLLOW_29_in_rule__ParameterRule__Group__3__Impl1352); 
>+ after(grammarAccess.getParameterRuleAccess().getColonKeyword_3()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__ParameterRule__Group__3
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__3__Impl"
> 
> 
>-	// $ANTLR start rule__ParameterRule__Group__3__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:638:1: rule__ParameterRule__Group__3__Impl : ( ':' ) ;
>-	public final void rule__ParameterRule__Group__3__Impl() throws RecognitionException {
>+ // $ANTLR start "rule__ParameterRule__Group__4"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:657:1: rule__ParameterRule__Group__4 : rule__ParameterRule__Group__4__Impl rule__ParameterRule__Group__5 ;
>+ public final void rule__ParameterRule__Group__4() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:661:1: ( rule__ParameterRule__Group__4__Impl rule__ParameterRule__Group__5 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:662:2: rule__ParameterRule__Group__4__Impl rule__ParameterRule__Group__5
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__4__Impl_in_rule__ParameterRule__Group__41383);
>+ rule__ParameterRule__Group__4__Impl();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:642:1: ( ( ':' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:643:1: ( ':' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:643:1: ( ':' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:644:1: ':'
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getColonKeyword_3());
>-					match(input, 29, FOLLOW_29_in_rule__ParameterRule__Group__3__Impl1352);
>-					after(grammarAccess.getParameterRuleAccess().getColonKeyword_3());
>+ state._fsp--;
> 
>-				}
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__5_in_rule__ParameterRule__Group__41386);
>+ rule__ParameterRule__Group__5();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__ParameterRule__Group__3__Impl
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__4"
> 
> 
>-	// $ANTLR start rule__ParameterRule__Group__4
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:657:1: rule__ParameterRule__Group__4 : rule__ParameterRule__Group__4__Impl rule__ParameterRule__Group__5 ;
>-	public final void rule__ParameterRule__Group__4() throws RecognitionException {
>+ // $ANTLR start "rule__ParameterRule__Group__4__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:669:1: rule__ParameterRule__Group__4__Impl : ( ( rule__ParameterRule__Alternatives_4 ) ) ;
>+ public final void rule__ParameterRule__Group__4__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:673:1: ( ( ( rule__ParameterRule__Alternatives_4 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:674:1: ( ( rule__ParameterRule__Alternatives_4 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:674:1: ( ( rule__ParameterRule__Alternatives_4 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:675:1: ( rule__ParameterRule__Alternatives_4 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getAlternatives_4()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:676:1: ( rule__ParameterRule__Alternatives_4 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:676:2: rule__ParameterRule__Alternatives_4
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Alternatives_4_in_rule__ParameterRule__Group__4__Impl1413);
>+ rule__ParameterRule__Alternatives_4();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:661:1: ( rule__ParameterRule__Group__4__Impl rule__ParameterRule__Group__5 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:662:2: rule__ParameterRule__Group__4__Impl rule__ParameterRule__Group__5
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__4__Impl_in_rule__ParameterRule__Group__41383);
>-				rule__ParameterRule__Group__4__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__5_in_rule__ParameterRule__Group__41386);
>-				rule__ParameterRule__Group__5();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ after(grammarAccess.getParameterRuleAccess().getAlternatives_4()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ParameterRule__Group__4
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__ParameterRule__Group__4__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:669:1: rule__ParameterRule__Group__4__Impl : ( ( rule__ParameterRule__Alternatives_4 ) ) ;
>-	public final void rule__ParameterRule__Group__4__Impl() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__4__Impl"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:673:1: ( ( ( rule__ParameterRule__Alternatives_4 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:674:1: ( ( rule__ParameterRule__Alternatives_4 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:674:1: ( ( rule__ParameterRule__Alternatives_4 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:675:1: ( rule__ParameterRule__Alternatives_4 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getAlternatives_4());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:676:1: ( rule__ParameterRule__Alternatives_4 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:676:2: rule__ParameterRule__Alternatives_4
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__Alternatives_4_in_rule__ParameterRule__Group__4__Impl1413);
>-						rule__ParameterRule__Alternatives_4();
>-						_fsp--;
>+ // $ANTLR start "rule__ParameterRule__Group__5"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:686:1: rule__ParameterRule__Group__5 : rule__ParameterRule__Group__5__Impl rule__ParameterRule__Group__6 ;
>+ public final void rule__ParameterRule__Group__5() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:690:1: ( rule__ParameterRule__Group__5__Impl rule__ParameterRule__Group__6 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:691:2: rule__ParameterRule__Group__5__Impl rule__ParameterRule__Group__6
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__5__Impl_in_rule__ParameterRule__Group__51443);
>+ rule__ParameterRule__Group__5__Impl();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getParameterRuleAccess().getAlternatives_4());
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__6_in_rule__ParameterRule__Group__51446);
>+ rule__ParameterRule__Group__6();
> 
>-				}
>+ state._fsp--;
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			restoreStackSize(stackSize);
>+ 	restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__5"
> 
>-	// $ANTLR end rule__ParameterRule__Group__4__Impl
> 
>+ // $ANTLR start "rule__ParameterRule__Group__5__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:698:1: rule__ParameterRule__Group__5__Impl : ( ( rule__ParameterRule__MultiplicityAssignment_5 )? ) ;
>+ public final void rule__ParameterRule__Group__5__Impl() throws RecognitionException {
> 
>-	// $ANTLR start rule__ParameterRule__Group__5
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:686:1: rule__ParameterRule__Group__5 : rule__ParameterRule__Group__5__Impl rule__ParameterRule__Group__6 ;
>-	public final void rule__ParameterRule__Group__5() throws RecognitionException {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:702:1: ( ( ( rule__ParameterRule__MultiplicityAssignment_5 )? ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:703:1: ( ( rule__ParameterRule__MultiplicityAssignment_5 )? )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:703:1: ( ( rule__ParameterRule__MultiplicityAssignment_5 )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:704:1: ( rule__ParameterRule__MultiplicityAssignment_5 )?
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getMultiplicityAssignment_5()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:705:1: ( rule__ParameterRule__MultiplicityAssignment_5 )?
>+ int alt6=2;
>+ int LA6_0 = input.LA(1);
> 
>-		int stackSize = keepStackSize();
>+ if ( (LA6_0==35) ) {
>+ alt6=1;
>+ }
>+ switch (alt6) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:705:2: rule__ParameterRule__MultiplicityAssignment_5
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__MultiplicityAssignment_5_in_rule__ParameterRule__Group__5__Impl1473);
>+ rule__ParameterRule__MultiplicityAssignment_5();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:690:1: ( rule__ParameterRule__Group__5__Impl rule__ParameterRule__Group__6 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:691:2: rule__ParameterRule__Group__5__Impl rule__ParameterRule__Group__6
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__5__Impl_in_rule__ParameterRule__Group__51443);
>-				rule__ParameterRule__Group__5__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__6_in_rule__ParameterRule__Group__51446);
>-				rule__ParameterRule__Group__6();
>-				_fsp--;
> 
>+ }
>+ break;
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getParameterRuleAccess().getMultiplicityAssignment_5()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__Group__5
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__ParameterRule__Group__5__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:698:1: rule__ParameterRule__Group__5__Impl : ( ( rule__ParameterRule__MultiplicityAssignment_5 )? ) ;
>-	public final void rule__ParameterRule__Group__5__Impl() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__5__Impl"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:702:1: ( ( ( rule__ParameterRule__MultiplicityAssignment_5 )? ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:703:1: ( ( rule__ParameterRule__MultiplicityAssignment_5 )? )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:703:1: ( ( rule__ParameterRule__MultiplicityAssignment_5 )? )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:704:1: ( rule__ParameterRule__MultiplicityAssignment_5 )?
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getMultiplicityAssignment_5());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:705:1: ( rule__ParameterRule__MultiplicityAssignment_5 )?
>-					int alt6 = 2;
>-					int LA6_0 = input.LA(1);
> 
>-					if((LA6_0 == 35)) {
>-						alt6 = 1;
>-					}
>-					switch(alt6) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:705:2: rule__ParameterRule__MultiplicityAssignment_5
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__MultiplicityAssignment_5_in_rule__ParameterRule__Group__5__Impl1473);
>-						rule__ParameterRule__MultiplicityAssignment_5();
>-						_fsp--;
>+ // $ANTLR start "rule__ParameterRule__Group__6"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:715:1: rule__ParameterRule__Group__6 : rule__ParameterRule__Group__6__Impl rule__ParameterRule__Group__7 ;
>+ public final void rule__ParameterRule__Group__6() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:719:1: ( rule__ParameterRule__Group__6__Impl rule__ParameterRule__Group__7 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:720:2: rule__ParameterRule__Group__6__Impl rule__ParameterRule__Group__7
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__6__Impl_in_rule__ParameterRule__Group__61504);
>+ rule__ParameterRule__Group__6__Impl();
> 
>-					}
>-						break;
>+ state._fsp--;
> 
>-					}
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__7_in_rule__ParameterRule__Group__61507);
>+ rule__ParameterRule__Group__7();
> 
>-					after(grammarAccess.getParameterRuleAccess().getMultiplicityAssignment_5());
>+ state._fsp--;
> 
>-				}
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__6"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__Group__5__Impl
>+ // $ANTLR start "rule__ParameterRule__Group__6__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:727:1: rule__ParameterRule__Group__6__Impl : ( ( rule__ParameterRule__ModifiersAssignment_6 )? ) ;
>+ public final void rule__ParameterRule__Group__6__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:731:1: ( ( ( rule__ParameterRule__ModifiersAssignment_6 )? ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:732:1: ( ( rule__ParameterRule__ModifiersAssignment_6 )? )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:732:1: ( ( rule__ParameterRule__ModifiersAssignment_6 )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:733:1: ( rule__ParameterRule__ModifiersAssignment_6 )?
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getModifiersAssignment_6()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:734:1: ( rule__ParameterRule__ModifiersAssignment_6 )?
>+ int alt7=2;
>+ int LA7_0 = input.LA(1);
> 
>-	// $ANTLR start rule__ParameterRule__Group__6
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:715:1: rule__ParameterRule__Group__6 : rule__ParameterRule__Group__6__Impl rule__ParameterRule__Group__7 ;
>-	public final void rule__ParameterRule__Group__6() throws RecognitionException {
>+ if ( (LA7_0==30) ) {
>+ int LA7_1 = input.LA(2);
> 
>-		int stackSize = keepStackSize();
>+ if ( ((LA7_1>=13 && LA7_1<=16)) ) {
>+ alt7=1;
>+ }
>+ }
>+ switch (alt7) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:734:2: rule__ParameterRule__ModifiersAssignment_6
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__ModifiersAssignment_6_in_rule__ParameterRule__Group__6__Impl1534);
>+ rule__ParameterRule__ModifiersAssignment_6();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:719:1: ( rule__ParameterRule__Group__6__Impl rule__ParameterRule__Group__7 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:720:2: rule__ParameterRule__Group__6__Impl rule__ParameterRule__Group__7
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__6__Impl_in_rule__ParameterRule__Group__61504);
>-				rule__ParameterRule__Group__6__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__7_in_rule__ParameterRule__Group__61507);
>-				rule__ParameterRule__Group__7();
>-				_fsp--;
> 
>+ }
>+ break;
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getParameterRuleAccess().getModifiersAssignment_6()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__Group__6
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__ParameterRule__Group__6__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:727:1: rule__ParameterRule__Group__6__Impl : ( ( rule__ParameterRule__ModifiersAssignment_6 )? ) ;
>-	public final void rule__ParameterRule__Group__6__Impl() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__6__Impl"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:731:1: ( ( ( rule__ParameterRule__ModifiersAssignment_6 )? ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:732:1: ( ( rule__ParameterRule__ModifiersAssignment_6 )? )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:732:1: ( ( rule__ParameterRule__ModifiersAssignment_6 )? )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:733:1: ( rule__ParameterRule__ModifiersAssignment_6 )?
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getModifiersAssignment_6());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:734:1: ( rule__ParameterRule__ModifiersAssignment_6 )?
>-					int alt7 = 2;
>-					int LA7_0 = input.LA(1);
> 
>-					if((LA7_0 == 30)) {
>-						int LA7_1 = input.LA(2);
>+ // $ANTLR start "rule__ParameterRule__Group__7"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:744:1: rule__ParameterRule__Group__7 : rule__ParameterRule__Group__7__Impl ;
>+ public final void rule__ParameterRule__Group__7() throws RecognitionException {
> 
>-						if(((LA7_1 >= 13 && LA7_1 <= 16))) {
>-							alt7 = 1;
>-						}
>-					}
>-					switch(alt7) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:734:2: rule__ParameterRule__ModifiersAssignment_6
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__ModifiersAssignment_6_in_rule__ParameterRule__Group__6__Impl1534);
>-						rule__ParameterRule__ModifiersAssignment_6();
>-						_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:748:1: ( rule__ParameterRule__Group__7__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:749:2: rule__ParameterRule__Group__7__Impl
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__Group__7__Impl_in_rule__ParameterRule__Group__71565);
>+ rule__ParameterRule__Group__7__Impl();
> 
>+ state._fsp--;
> 
>-					}
>-						break;
> 
>-					}
>+ }
> 
>-					after(grammarAccess.getParameterRuleAccess().getModifiersAssignment_6());
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-				}
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__7"
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "rule__ParameterRule__Group__7__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:755:1: rule__ParameterRule__Group__7__Impl : ( ( rule__ParameterRule__EffectAssignment_7 ) ) ;
>+ public final void rule__ParameterRule__Group__7__Impl() throws RecognitionException {
> 
>-			restoreStackSize(stackSize);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:759:1: ( ( ( rule__ParameterRule__EffectAssignment_7 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:760:1: ( ( rule__ParameterRule__EffectAssignment_7 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:760:1: ( ( rule__ParameterRule__EffectAssignment_7 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:761:1: ( rule__ParameterRule__EffectAssignment_7 )
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getEffectAssignment_7()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:762:1: ( rule__ParameterRule__EffectAssignment_7 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:762:2: rule__ParameterRule__EffectAssignment_7
>+ {
>+ pushFollow(FOLLOW_rule__ParameterRule__EffectAssignment_7_in_rule__ParameterRule__Group__7__Impl1592);
>+ rule__ParameterRule__EffectAssignment_7();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ParameterRule__Group__6__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__ParameterRule__Group__7
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:744:1: rule__ParameterRule__Group__7 : rule__ParameterRule__Group__7__Impl ;
>-	public final void rule__ParameterRule__Group__7() throws RecognitionException {
>+ after(grammarAccess.getParameterRuleAccess().getEffectAssignment_7()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:748:1: ( rule__ParameterRule__Group__7__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:749:2: rule__ParameterRule__Group__7__Impl
>-			{
>-				pushFollow(FOLLOW_rule__ParameterRule__Group__7__Impl_in_rule__ParameterRule__Group__71565);
>-				rule__ParameterRule__Group__7__Impl();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__Group__7__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__Group__7
>+ // $ANTLR start "rule__ModifiersRule__Group__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:788:1: rule__ModifiersRule__Group__0 : rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1 ;
>+ public final void rule__ModifiersRule__Group__0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:792:1: ( rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:793:2: rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__01638);
>+ rule__ModifiersRule__Group__0__Impl();
> 
>-	// $ANTLR start rule__ParameterRule__Group__7__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:755:1: rule__ParameterRule__Group__7__Impl : ( ( rule__ParameterRule__EffectAssignment_7 ) ) ;
>-	public final void rule__ParameterRule__Group__7__Impl() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__01641);
>+ rule__ModifiersRule__Group__1();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:759:1: ( ( ( rule__ParameterRule__EffectAssignment_7 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:760:1: ( ( rule__ParameterRule__EffectAssignment_7 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:760:1: ( ( rule__ParameterRule__EffectAssignment_7 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:761:1: ( rule__ParameterRule__EffectAssignment_7 )
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getEffectAssignment_7());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:762:1: ( rule__ParameterRule__EffectAssignment_7 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:762:2: rule__ParameterRule__EffectAssignment_7
>-					{
>-						pushFollow(FOLLOW_rule__ParameterRule__EffectAssignment_7_in_rule__ParameterRule__Group__7__Impl1592);
>-						rule__ParameterRule__EffectAssignment_7();
>-						_fsp--;
>+ state._fsp--;
> 
> 
>-					}
>+ }
> 
>-					after(grammarAccess.getParameterRuleAccess().getEffectAssignment_7());
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-				}
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__0"
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "rule__ModifiersRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:800:1: rule__ModifiersRule__Group__0__Impl : ( '{' ) ;
>+ public final void rule__ModifiersRule__Group__0__Impl() throws RecognitionException {
> 
>-			restoreStackSize(stackSize);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:804:1: ( ( '{' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:805:1: ( '{' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:805:1: ( '{' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:806:1: '{'
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0()); 
>+ match(input,30,FOLLOW_30_in_rule__ModifiersRule__Group__0__Impl1669); 
>+ after(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ParameterRule__Group__7__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__ModifiersRule__Group__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:788:1: rule__ModifiersRule__Group__0 : rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1 ;
>-	public final void rule__ModifiersRule__Group__0() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:792:1: ( rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:793:2: rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__01638);
>-				rule__ModifiersRule__Group__0__Impl();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__0__Impl"
> 
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__01641);
>-				rule__ModifiersRule__Group__1();
>-				_fsp--;
> 
>+ // $ANTLR start "rule__ModifiersRule__Group__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:819:1: rule__ModifiersRule__Group__1 : rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2 ;
>+ public final void rule__ModifiersRule__Group__1() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:823:1: ( rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:824:2: rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__11700);
>+ rule__ModifiersRule__Group__1__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__11703);
>+ rule__ModifiersRule__Group__2();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ModifiersRule__Group__0
> 
>+ }
> 
>-	// $ANTLR start rule__ModifiersRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:800:1: rule__ModifiersRule__Group__0__Impl : ( '{' ) ;
>-	public final void rule__ModifiersRule__Group__0__Impl() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:804:1: ( ( '{' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:805:1: ( '{' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:805:1: ( '{' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:806:1: '{'
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0());
>-					match(input, 30, FOLLOW_30_in_rule__ModifiersRule__Group__0__Impl1669);
>-					after(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__1"
> 
>-				}
> 
>+ // $ANTLR start "rule__ModifiersRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:831:1: rule__ModifiersRule__Group__1__Impl : ( ( rule__ModifiersRule__ValuesAssignment_1 ) ) ;
>+ public final void rule__ModifiersRule__Group__1__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:835:1: ( ( ( rule__ModifiersRule__ValuesAssignment_1 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:836:1: ( ( rule__ModifiersRule__ValuesAssignment_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:836:1: ( ( rule__ModifiersRule__ValuesAssignment_1 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:837:1: ( rule__ModifiersRule__ValuesAssignment_1 )
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getValuesAssignment_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:838:1: ( rule__ModifiersRule__ValuesAssignment_1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:838:2: rule__ModifiersRule__ValuesAssignment_1
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl1730);
>+ rule__ModifiersRule__ValuesAssignment_1();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ModifiersRule__Group__0__Impl
>+ after(grammarAccess.getModifiersRuleAccess().getValuesAssignment_1()); 
> 
>+ }
> 
>-	// $ANTLR start rule__ModifiersRule__Group__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:819:1: rule__ModifiersRule__Group__1 : rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2 ;
>-	public final void rule__ModifiersRule__Group__1() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:823:1: ( rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:824:2: rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__11700);
>-				rule__ModifiersRule__Group__1__Impl();
>-				_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__11703);
>-				rule__ModifiersRule__Group__2();
>-				_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__1__Impl"
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "rule__ModifiersRule__Group__2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:848:1: rule__ModifiersRule__Group__2 : rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3 ;
>+ public final void rule__ModifiersRule__Group__2() throws RecognitionException {
> 
>-			restoreStackSize(stackSize);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:852:1: ( rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:853:2: rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__21760);
>+ rule__ModifiersRule__Group__2__Impl();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ModifiersRule__Group__1
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__21763);
>+ rule__ModifiersRule__Group__3();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__ModifiersRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:831:1: rule__ModifiersRule__Group__1__Impl : ( ( rule__ModifiersRule__ValuesAssignment_1 ) ) ;
>-	public final void rule__ModifiersRule__Group__1__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:835:1: ( ( ( rule__ModifiersRule__ValuesAssignment_1 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:836:1: ( ( rule__ModifiersRule__ValuesAssignment_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:836:1: ( ( rule__ModifiersRule__ValuesAssignment_1 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:837:1: ( rule__ModifiersRule__ValuesAssignment_1 )
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getValuesAssignment_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:838:1: ( rule__ModifiersRule__ValuesAssignment_1 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:838:2: rule__ModifiersRule__ValuesAssignment_1
>-					{
>-						pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl1730);
>-						rule__ModifiersRule__ValuesAssignment_1();
>-						_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-					}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__2"
> 
>-					after(grammarAccess.getModifiersRuleAccess().getValuesAssignment_1());
> 
>-				}
>+ // $ANTLR start "rule__ModifiersRule__Group__2__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:860:1: rule__ModifiersRule__Group__2__Impl : ( ( rule__ModifiersRule__Group_2__0 )* ) ;
>+ public final void rule__ModifiersRule__Group__2__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:864:1: ( ( ( rule__ModifiersRule__Group_2__0 )* ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:865:1: ( ( rule__ModifiersRule__Group_2__0 )* )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:865:1: ( ( rule__ModifiersRule__Group_2__0 )* )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:866:1: ( rule__ModifiersRule__Group_2__0 )*
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getGroup_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:867:1: ( rule__ModifiersRule__Group_2__0 )*
>+ loop8:
>+ do {
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>-			}
>+ if ( (LA8_0==32) ) {
>+ alt8=1;
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ switch (alt8) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:867:2: rule__ModifiersRule__Group_2__0
>+ 	 {
>+ 	 pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl1790);
>+ 	 rule__ModifiersRule__Group_2__0();
> 
>-		}
>-		return;
>-	}
>+ 	 state._fsp--;
> 
>-	// $ANTLR end rule__ModifiersRule__Group__1__Impl
> 
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR start rule__ModifiersRule__Group__2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:848:1: rule__ModifiersRule__Group__2 : rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3 ;
>-	public final void rule__ModifiersRule__Group__2() throws RecognitionException {
>+ 	default :
>+ 	 break loop8;
>+ }
>+ } while (true);
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getModifiersRuleAccess().getGroup_2()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:852:1: ( rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:853:2: rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3
>-			{
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__21760);
>-				rule__ModifiersRule__Group__2__Impl();
>-				_fsp--;
>+ }
> 
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__21763);
>-				rule__ModifiersRule__Group__3();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__2__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ModifiersRule__Group__2
>+ // $ANTLR start "rule__ModifiersRule__Group__3"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:877:1: rule__ModifiersRule__Group__3 : rule__ModifiersRule__Group__3__Impl ;
>+ public final void rule__ModifiersRule__Group__3() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:881:1: ( rule__ModifiersRule__Group__3__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:882:2: rule__ModifiersRule__Group__3__Impl
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__31821);
>+ rule__ModifiersRule__Group__3__Impl();
> 
>-	// $ANTLR start rule__ModifiersRule__Group__2__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:860:1: rule__ModifiersRule__Group__2__Impl : ( ( rule__ModifiersRule__Group_2__0 )* ) ;
>-	public final void rule__ModifiersRule__Group__2__Impl() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:864:1: ( ( ( rule__ModifiersRule__Group_2__0 )* ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:865:1: ( ( rule__ModifiersRule__Group_2__0 )* )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:865:1: ( ( rule__ModifiersRule__Group_2__0 )* )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:866:1: ( rule__ModifiersRule__Group_2__0 )*
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getGroup_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:867:1: ( rule__ModifiersRule__Group_2__0 )*
>-					loop8: do {
>-						int alt8 = 2;
>-						int LA8_0 = input.LA(1);
>+ }
> 
>-						if((LA8_0 == 32)) {
>-							alt8 = 1;
>-						}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-						switch(alt8) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:867:2: rule__ModifiersRule__Group_2__0
>-						{
>-							pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl1790);
>-							rule__ModifiersRule__Group_2__0();
>-							_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__3"
> 
> 
>-						}
>-							break;
>+ // $ANTLR start "rule__ModifiersRule__Group__3__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:888:1: rule__ModifiersRule__Group__3__Impl : ( '}' ) ;
>+ public final void rule__ModifiersRule__Group__3__Impl() throws RecognitionException {
> 
>-						default:
>-							break loop8;
>-						}
>-					} while(true);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:892:1: ( ( '}' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:893:1: ( '}' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:893:1: ( '}' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:894:1: '}'
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3()); 
>+ match(input,31,FOLLOW_31_in_rule__ModifiersRule__Group__3__Impl1849); 
>+ after(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3()); 
> 
>-					after(grammarAccess.getModifiersRuleAccess().getGroup_2());
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group__3__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ModifiersRule__Group__2__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group_2__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:915:1: rule__ModifiersRule__Group_2__0 : rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1 ;
>+ public final void rule__ModifiersRule__Group_2__0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:919:1: ( rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:920:2: rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__01888);
>+ rule__ModifiersRule__Group_2__0__Impl();
> 
>-	// $ANTLR start rule__ModifiersRule__Group__3
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:877:1: rule__ModifiersRule__Group__3 : rule__ModifiersRule__Group__3__Impl ;
>-	public final void rule__ModifiersRule__Group__3() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__01891);
>+ rule__ModifiersRule__Group_2__1();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:881:1: ( rule__ModifiersRule__Group__3__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:882:2: rule__ModifiersRule__Group__3__Impl
>-			{
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__31821);
>-				rule__ModifiersRule__Group__3__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			restoreStackSize(stackSize);
>+ 	restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group_2__0"
> 
>-	// $ANTLR end rule__ModifiersRule__Group__3
> 
>+ // $ANTLR start "rule__ModifiersRule__Group_2__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:927:1: rule__ModifiersRule__Group_2__0__Impl : ( ',' ) ;
>+ public final void rule__ModifiersRule__Group_2__0__Impl() throws RecognitionException {
> 
>-	// $ANTLR start rule__ModifiersRule__Group__3__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:888:1: rule__ModifiersRule__Group__3__Impl : ( '}' ) ;
>-	public final void rule__ModifiersRule__Group__3__Impl() throws RecognitionException {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:931:1: ( ( ',' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:932:1: ( ',' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:932:1: ( ',' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:933:1: ','
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0()); 
>+ match(input,32,FOLLOW_32_in_rule__ModifiersRule__Group_2__0__Impl1919); 
>+ after(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:892:1: ( ( '}' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:893:1: ( '}' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:893:1: ( '}' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:894:1: '}'
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3());
>-					match(input, 31, FOLLOW_31_in_rule__ModifiersRule__Group__3__Impl1849);
>-					after(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group_2__0__Impl"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__ModifiersRule__Group_2__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:946:1: rule__ModifiersRule__Group_2__1 : rule__ModifiersRule__Group_2__1__Impl ;
>+ public final void rule__ModifiersRule__Group_2__1() throws RecognitionException {
> 
>-	// $ANTLR end rule__ModifiersRule__Group__3__Impl
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:950:1: ( rule__ModifiersRule__Group_2__1__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:951:2: rule__ModifiersRule__Group_2__1__Impl
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__11950);
>+ rule__ModifiersRule__Group_2__1__Impl();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__ModifiersRule__Group_2__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:915:1: rule__ModifiersRule__Group_2__0 : rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1 ;
>-	public final void rule__ModifiersRule__Group_2__0() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:919:1: ( rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:920:2: rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1
>-			{
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__01888);
>-				rule__ModifiersRule__Group_2__0__Impl();
>-				_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__01891);
>-				rule__ModifiersRule__Group_2__1();
>-				_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group_2__1"
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "rule__ModifiersRule__Group_2__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:957:1: rule__ModifiersRule__Group_2__1__Impl : ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) ) ;
>+ public final void rule__ModifiersRule__Group_2__1__Impl() throws RecognitionException {
> 
>-			restoreStackSize(stackSize);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:961:1: ( ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:962:1: ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:962:1: ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:963:1: ( rule__ModifiersRule__ValuesAssignment_2_1 )
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:964:1: ( rule__ModifiersRule__ValuesAssignment_2_1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:964:2: rule__ModifiersRule__ValuesAssignment_2_1
>+ {
>+ pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl1977);
>+ rule__ModifiersRule__ValuesAssignment_2_1();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ModifiersRule__Group_2__0
> 
>+ }
> 
>-	// $ANTLR start rule__ModifiersRule__Group_2__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:927:1: rule__ModifiersRule__Group_2__0__Impl : ( ',' ) ;
>-	public final void rule__ModifiersRule__Group_2__0__Impl() throws RecognitionException {
>+ after(grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:931:1: ( ( ',' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:932:1: ( ',' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:932:1: ( ',' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:933:1: ','
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0());
>-					match(input, 32, FOLLOW_32_in_rule__ModifiersRule__Group_2__0__Impl1919);
>-					after(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__Group_2__1__Impl"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__EffectRule__Group__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:978:1: rule__EffectRule__Group__0 : rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1 ;
>+ public final void rule__EffectRule__Group__0() throws RecognitionException {
> 
>-	// $ANTLR end rule__ModifiersRule__Group_2__0__Impl
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:982:1: ( rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:983:2: rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__EffectRule__Group__0__Impl_in_rule__EffectRule__Group__02011);
>+ rule__EffectRule__Group__0__Impl();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__ModifiersRule__Group_2__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:946:1: rule__ModifiersRule__Group_2__1 : rule__ModifiersRule__Group_2__1__Impl ;
>-	public final void rule__ModifiersRule__Group_2__1() throws RecognitionException {
>+ pushFollow(FOLLOW_rule__EffectRule__Group__1_in_rule__EffectRule__Group__02014);
>+ rule__EffectRule__Group__1();
> 
>-		int stackSize = keepStackSize();
>+ state._fsp--;
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:950:1: ( rule__ModifiersRule__Group_2__1__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:951:2: rule__ModifiersRule__Group_2__1__Impl
>-			{
>-				pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__11950);
>-				rule__ModifiersRule__Group_2__1__Impl();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__0"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ModifiersRule__Group_2__1
>+ // $ANTLR start "rule__EffectRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:990:1: rule__EffectRule__Group__0__Impl : ( '{' ) ;
>+ public final void rule__EffectRule__Group__0__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:994:1: ( ( '{' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:995:1: ( '{' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:995:1: ( '{' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:996:1: '{'
>+ {
>+ before(grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0()); 
>+ match(input,30,FOLLOW_30_in_rule__EffectRule__Group__0__Impl2042); 
>+ after(grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0()); 
> 
>-	// $ANTLR start rule__ModifiersRule__Group_2__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:957:1: rule__ModifiersRule__Group_2__1__Impl : ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) ) ;
>-	public final void rule__ModifiersRule__Group_2__1__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:961:1: ( ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:962:1: ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:962:1: ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:963:1: ( rule__ModifiersRule__ValuesAssignment_2_1 )
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:964:1: ( rule__ModifiersRule__ValuesAssignment_2_1 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:964:2: rule__ModifiersRule__ValuesAssignment_2_1
>-					{
>-						pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl1977);
>-						rule__ModifiersRule__ValuesAssignment_2_1();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__0__Impl"
> 
>-				}
> 
>+ // $ANTLR start "rule__EffectRule__Group__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1009:1: rule__EffectRule__Group__1 : rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2 ;
>+ public final void rule__EffectRule__Group__1() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1013:1: ( rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1014:2: rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__EffectRule__Group__1__Impl_in_rule__EffectRule__Group__12073);
>+ rule__EffectRule__Group__1__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__EffectRule__Group__2_in_rule__EffectRule__Group__12076);
>+ rule__EffectRule__Group__2();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ModifiersRule__Group_2__1__Impl
> 
>+ }
> 
>-	// $ANTLR start rule__EffectRule__Group__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:978:1: rule__EffectRule__Group__0 : rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1 ;
>-	public final void rule__EffectRule__Group__0() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:982:1: ( rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:983:2: rule__EffectRule__Group__0__Impl rule__EffectRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__EffectRule__Group__0__Impl_in_rule__EffectRule__Group__02011);
>-				rule__EffectRule__Group__0__Impl();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__1"
> 
>-				pushFollow(FOLLOW_rule__EffectRule__Group__1_in_rule__EffectRule__Group__02014);
>-				rule__EffectRule__Group__1();
>-				_fsp--;
> 
>+ // $ANTLR start "rule__EffectRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1021:1: rule__EffectRule__Group__1__Impl : ( 'effect: ' ) ;
>+ public final void rule__EffectRule__Group__1__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1025:1: ( ( 'effect: ' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1026:1: ( 'effect: ' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1026:1: ( 'effect: ' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1027:1: 'effect: '
>+ {
>+ before(grammarAccess.getEffectRuleAccess().getEffectKeyword_1()); 
>+ match(input,33,FOLLOW_33_in_rule__EffectRule__Group__1__Impl2104); 
>+ after(grammarAccess.getEffectRuleAccess().getEffectKeyword_1()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__EffectRule__Group__0
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__EffectRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:990:1: rule__EffectRule__Group__0__Impl : ( '{' ) ;
>-	public final void rule__EffectRule__Group__0__Impl() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__1__Impl"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:994:1: ( ( '{' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:995:1: ( '{' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:995:1: ( '{' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:996:1: '{'
>-				{
>-					before(grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0());
>-					match(input, 30, FOLLOW_30_in_rule__EffectRule__Group__0__Impl2042);
>-					after(grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0());
>+ // $ANTLR start "rule__EffectRule__Group__2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1040:1: rule__EffectRule__Group__2 : rule__EffectRule__Group__2__Impl rule__EffectRule__Group__3 ;
>+ public final void rule__EffectRule__Group__2() throws RecognitionException {
> 
>-				}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1044:1: ( rule__EffectRule__Group__2__Impl rule__EffectRule__Group__3 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1045:2: rule__EffectRule__Group__2__Impl rule__EffectRule__Group__3
>+ {
>+ pushFollow(FOLLOW_rule__EffectRule__Group__2__Impl_in_rule__EffectRule__Group__22135);
>+ rule__EffectRule__Group__2__Impl();
> 
>+ state._fsp--;
> 
>-			}
>+ pushFollow(FOLLOW_rule__EffectRule__Group__3_in_rule__EffectRule__Group__22138);
>+ rule__EffectRule__Group__3();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__EffectRule__Group__0__Impl
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__EffectRule__Group__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1009:1: rule__EffectRule__Group__1 : rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2 ;
>-	public final void rule__EffectRule__Group__1() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__2"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1013:1: ( rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1014:2: rule__EffectRule__Group__1__Impl rule__EffectRule__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__EffectRule__Group__1__Impl_in_rule__EffectRule__Group__12073);
>-				rule__EffectRule__Group__1__Impl();
>-				_fsp--;
>+ // $ANTLR start "rule__EffectRule__Group__2__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1052:1: rule__EffectRule__Group__2__Impl : ( ( rule__EffectRule__EffectKindAssignment_2 ) ) ;
>+ public final void rule__EffectRule__Group__2__Impl() throws RecognitionException {
> 
>-				pushFollow(FOLLOW_rule__EffectRule__Group__2_in_rule__EffectRule__Group__12076);
>-				rule__EffectRule__Group__2();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1056:1: ( ( ( rule__EffectRule__EffectKindAssignment_2 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1057:1: ( ( rule__EffectRule__EffectKindAssignment_2 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1057:1: ( ( rule__EffectRule__EffectKindAssignment_2 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1058:1: ( rule__EffectRule__EffectKindAssignment_2 )
>+ {
>+ before(grammarAccess.getEffectRuleAccess().getEffectKindAssignment_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1059:1: ( rule__EffectRule__EffectKindAssignment_2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1059:2: rule__EffectRule__EffectKindAssignment_2
>+ {
>+ pushFollow(FOLLOW_rule__EffectRule__EffectKindAssignment_2_in_rule__EffectRule__Group__2__Impl2165);
>+ rule__EffectRule__EffectKindAssignment_2();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getEffectRuleAccess().getEffectKindAssignment_2()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__EffectRule__Group__1
> 
>+ }
> 
>-	// $ANTLR start rule__EffectRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1021:1: rule__EffectRule__Group__1__Impl : ( 'effect: ' ) ;
>-	public final void rule__EffectRule__Group__1__Impl() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1025:1: ( ( 'effect: ' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1026:1: ( 'effect: ' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1026:1: ( 'effect: ' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1027:1: 'effect: '
>-				{
>-					before(grammarAccess.getEffectRuleAccess().getEffectKeyword_1());
>-					match(input, 33, FOLLOW_33_in_rule__EffectRule__Group__1__Impl2104);
>-					after(grammarAccess.getEffectRuleAccess().getEffectKeyword_1());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__2__Impl"
> 
>-				}
> 
>+ // $ANTLR start "rule__EffectRule__Group__3"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1069:1: rule__EffectRule__Group__3 : rule__EffectRule__Group__3__Impl ;
>+ public final void rule__EffectRule__Group__3() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1073:1: ( rule__EffectRule__Group__3__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1074:2: rule__EffectRule__Group__3__Impl
>+ {
>+ pushFollow(FOLLOW_rule__EffectRule__Group__3__Impl_in_rule__EffectRule__Group__32195);
>+ rule__EffectRule__Group__3__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__EffectRule__Group__1__Impl
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__EffectRule__Group__2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1040:1: rule__EffectRule__Group__2 : rule__EffectRule__Group__2__Impl rule__EffectRule__Group__3 ;
>-	public final void rule__EffectRule__Group__2() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__3"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1044:1: ( rule__EffectRule__Group__2__Impl rule__EffectRule__Group__3 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1045:2: rule__EffectRule__Group__2__Impl rule__EffectRule__Group__3
>-			{
>-				pushFollow(FOLLOW_rule__EffectRule__Group__2__Impl_in_rule__EffectRule__Group__22135);
>-				rule__EffectRule__Group__2__Impl();
>-				_fsp--;
>+ // $ANTLR start "rule__EffectRule__Group__3__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1080:1: rule__EffectRule__Group__3__Impl : ( '}' ) ;
>+ public final void rule__EffectRule__Group__3__Impl() throws RecognitionException {
> 
>-				pushFollow(FOLLOW_rule__EffectRule__Group__3_in_rule__EffectRule__Group__22138);
>-				rule__EffectRule__Group__3();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1084:1: ( ( '}' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1085:1: ( '}' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1085:1: ( '}' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1086:1: '}'
>+ {
>+ before(grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3()); 
>+ match(input,31,FOLLOW_31_in_rule__EffectRule__Group__3__Impl2223); 
>+ after(grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__EffectRule__Group__2
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__Group__3__Impl"
> 
> 
>-	// $ANTLR start rule__EffectRule__Group__2__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1052:1: rule__EffectRule__Group__2__Impl : ( ( rule__EffectRule__EffectKindAssignment_2 ) ) ;
>-	public final void rule__EffectRule__Group__2__Impl() throws RecognitionException {
>+ // $ANTLR start "rule__QualifiedName__Group__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1107:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
>+ public final void rule__QualifiedName__Group__0() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1111:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1112:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__02262);
>+ rule__QualifiedName__Group__0__Impl();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1056:1: ( ( ( rule__EffectRule__EffectKindAssignment_2 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1057:1: ( ( rule__EffectRule__EffectKindAssignment_2 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1057:1: ( ( rule__EffectRule__EffectKindAssignment_2 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1058:1: ( rule__EffectRule__EffectKindAssignment_2 )
>-				{
>-					before(grammarAccess.getEffectRuleAccess().getEffectKindAssignment_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1059:1: ( rule__EffectRule__EffectKindAssignment_2 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1059:2: rule__EffectRule__EffectKindAssignment_2
>-					{
>-						pushFollow(FOLLOW_rule__EffectRule__EffectKindAssignment_2_in_rule__EffectRule__Group__2__Impl2165);
>-						rule__EffectRule__EffectKindAssignment_2();
>-						_fsp--;
>+ state._fsp--;
> 
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__02265);
>+ rule__QualifiedName__Group__1();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getEffectRuleAccess().getEffectKindAssignment_2());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__0"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__QualifiedName__Group__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1119:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
>+ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
> 
>-	// $ANTLR end rule__EffectRule__Group__2__Impl
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1123:1: ( ( ( rule__QualifiedName__PathAssignment_0 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1124:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1124:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1125:1: ( rule__QualifiedName__PathAssignment_0 )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1126:1: ( rule__QualifiedName__PathAssignment_0 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1126:2: rule__QualifiedName__PathAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl2292);
>+ rule__QualifiedName__PathAssignment_0();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__EffectRule__Group__3
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1069:1: rule__EffectRule__Group__3 : rule__EffectRule__Group__3__Impl ;
>-	public final void rule__EffectRule__Group__3() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1073:1: ( rule__EffectRule__Group__3__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1074:2: rule__EffectRule__Group__3__Impl
>-			{
>-				pushFollow(FOLLOW_rule__EffectRule__Group__3__Impl_in_rule__EffectRule__Group__32195);
>-				rule__EffectRule__Group__3__Impl();
>-				_fsp--;
>+ after(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__EffectRule__Group__3
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__0__Impl"
> 
> 
>-	// $ANTLR start rule__EffectRule__Group__3__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1080:1: rule__EffectRule__Group__3__Impl : ( '}' ) ;
>-	public final void rule__EffectRule__Group__3__Impl() throws RecognitionException {
>+ // $ANTLR start "rule__QualifiedName__Group__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1136:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
>+ public final void rule__QualifiedName__Group__1() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1140:1: ( rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1141:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__12322);
>+ rule__QualifiedName__Group__1__Impl();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1084:1: ( ( '}' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1085:1: ( '}' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1085:1: ( '}' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1086:1: '}'
>-				{
>-					before(grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3());
>-					match(input, 31, FOLLOW_31_in_rule__EffectRule__Group__3__Impl2223);
>-					after(grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3());
>+ state._fsp--;
> 
>-				}
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__12325);
>+ rule__QualifiedName__Group__2();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__EffectRule__Group__3__Impl
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__1"
> 
> 
>-	// $ANTLR start rule__QualifiedName__Group__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1107:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
>-	public final void rule__QualifiedName__Group__0() throws RecognitionException {
>+ // $ANTLR start "rule__QualifiedName__Group__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1148:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
>+ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1152:1: ( ( '::' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1153:1: ( '::' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1153:1: ( '::' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1154:1: '::'
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
>+ match(input,34,FOLLOW_34_in_rule__QualifiedName__Group__1__Impl2353); 
>+ after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1111:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1112:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__02262);
>-				rule__QualifiedName__Group__0__Impl();
>-				_fsp--;
>+ }
> 
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__02265);
>-				rule__QualifiedName__Group__1();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__1__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__Group__0
>+ // $ANTLR start "rule__QualifiedName__Group__2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1167:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
>+ public final void rule__QualifiedName__Group__2() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1171:1: ( rule__QualifiedName__Group__2__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1172:2: rule__QualifiedName__Group__2__Impl
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__22384);
>+ rule__QualifiedName__Group__2__Impl();
> 
>-	// $ANTLR start rule__QualifiedName__Group__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1119:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
>-	public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1123:1: ( ( ( rule__QualifiedName__PathAssignment_0 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1124:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1124:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1125:1: ( rule__QualifiedName__PathAssignment_0 )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1126:1: ( rule__QualifiedName__PathAssignment_0 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1126:2: rule__QualifiedName__PathAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl2292);
>-						rule__QualifiedName__PathAssignment_0();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getQualifiedNameAccess().getPathAssignment_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__2"
> 
>-				}
> 
>+ // $ANTLR start "rule__QualifiedName__Group__2__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1178:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
>+ public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1182:1: ( ( ( rule__QualifiedName__RemainingAssignment_2 )? ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1183:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1183:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1184:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1185:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ if ( (LA9_0==RULE_ID) ) {
>+ int LA9_1 = input.LA(2);
> 
>-			restoreStackSize(stackSize);
>+ if ( (LA9_1==34) ) {
>+ alt9=1;
>+ }
>+ }
>+ switch (alt9) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1185:2: rule__QualifiedName__RemainingAssignment_2
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl2411);
>+ rule__QualifiedName__RemainingAssignment_2();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__QualifiedName__Group__0__Impl
> 
>+ }
>+ break;
> 
>-	// $ANTLR start rule__QualifiedName__Group__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1136:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
>-	public final void rule__QualifiedName__Group__1() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1140:1: ( rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1141:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__12322);
>-				rule__QualifiedName__Group__1__Impl();
>-				_fsp--;
>+ }
> 
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__12325);
>-				rule__QualifiedName__Group__2();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__2__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__Group__1
>+ // $ANTLR start "rule__TypeRule__Group__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1201:1: rule__TypeRule__Group__0 : rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 ;
>+ public final void rule__TypeRule__Group__0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1205:1: ( rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1206:2: rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__02448);
>+ rule__TypeRule__Group__0__Impl();
> 
>-	// $ANTLR start rule__QualifiedName__Group__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1148:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
>-	public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
>+ pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__02451);
>+ rule__TypeRule__Group__1();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1152:1: ( ( '::' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1153:1: ( '::' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1153:1: ( '::' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1154:1: '::'
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>-					match(input, 34, FOLLOW_34_in_rule__QualifiedName__Group__1__Impl2353);
>-					after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>+ state._fsp--;
> 
>-				}
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__0"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__Group__1__Impl
>+ // $ANTLR start "rule__TypeRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1213:1: rule__TypeRule__Group__0__Impl : ( ( rule__TypeRule__PathAssignment_0 )? ) ;
>+ public final void rule__TypeRule__Group__0__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1217:1: ( ( ( rule__TypeRule__PathAssignment_0 )? ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1218:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1218:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1219:1: ( rule__TypeRule__PathAssignment_0 )?
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getPathAssignment_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1220:1: ( rule__TypeRule__PathAssignment_0 )?
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>-	// $ANTLR start rule__QualifiedName__Group__2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1167:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
>-	public final void rule__QualifiedName__Group__2() throws RecognitionException {
>+ if ( (LA10_0==RULE_ID) ) {
>+ int LA10_1 = input.LA(2);
> 
>-		int stackSize = keepStackSize();
>+ if ( (LA10_1==34) ) {
>+ alt10=1;
>+ }
>+ }
>+ switch (alt10) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1220:2: rule__TypeRule__PathAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl2478);
>+ rule__TypeRule__PathAssignment_0();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1171:1: ( rule__QualifiedName__Group__2__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1172:2: rule__QualifiedName__Group__2__Impl
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__22384);
>-				rule__QualifiedName__Group__2__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
> 
>-			}
>+ }
>+ break;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getTypeRuleAccess().getPathAssignment_0()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__QualifiedName__Group__2
> 
>+ }
> 
>-	// $ANTLR start rule__QualifiedName__Group__2__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1178:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
>-	public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1182:1: ( ( ( rule__QualifiedName__RemainingAssignment_2 )? ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1183:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1183:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1184:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1185:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__0__Impl"
> 
>-					if((LA9_0 == RULE_ID)) {
>-						int LA9_1 = input.LA(2);
> 
>-						if((LA9_1 == 34)) {
>-							alt9 = 1;
>-						}
>-					}
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1185:2: rule__QualifiedName__RemainingAssignment_2
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl2411);
>-						rule__QualifiedName__RemainingAssignment_2();
>-						_fsp--;
>+ // $ANTLR start "rule__TypeRule__Group__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1230:1: rule__TypeRule__Group__1 : rule__TypeRule__Group__1__Impl ;
>+ public final void rule__TypeRule__Group__1() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1234:1: ( rule__TypeRule__Group__1__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1235:2: rule__TypeRule__Group__1__Impl
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__12509);
>+ rule__TypeRule__Group__1__Impl();
> 
>-					}
>-						break;
>+ state._fsp--;
> 
>-					}
> 
>-					after(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__1"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "rule__TypeRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1241:1: rule__TypeRule__Group__1__Impl : ( ( rule__TypeRule__TypeAssignment_1 ) ) ;
>+ public final void rule__TypeRule__Group__1__Impl() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1245:1: ( ( ( rule__TypeRule__TypeAssignment_1 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1246:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1246:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1247:1: ( rule__TypeRule__TypeAssignment_1 )
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getTypeAssignment_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1248:1: ( rule__TypeRule__TypeAssignment_1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1248:2: rule__TypeRule__TypeAssignment_1
>+ {
>+ pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl2536);
>+ rule__TypeRule__TypeAssignment_1();
> 
>-	// $ANTLR end rule__QualifiedName__Group__2__Impl
>+ state._fsp--;
> 
> 
>-	// $ANTLR start rule__TypeRule__Group__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1201:1: rule__TypeRule__Group__0 : rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 ;
>-	public final void rule__TypeRule__Group__0() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getTypeRuleAccess().getTypeAssignment_1()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1205:1: ( rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1206:2: rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__02448);
>-				rule__TypeRule__Group__0__Impl();
>-				_fsp--;
>+ }
> 
>-				pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__02451);
>-				rule__TypeRule__Group__1();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__Group__1__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__TypeRule__Group__0
>+ // $ANTLR start "rule__MultiplicityRule__Group__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1262:1: rule__MultiplicityRule__Group__0 : rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1 ;
>+ public final void rule__MultiplicityRule__Group__0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1266:1: ( rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1267:2: rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__02570);
>+ rule__MultiplicityRule__Group__0__Impl();
> 
>-	// $ANTLR start rule__TypeRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1213:1: rule__TypeRule__Group__0__Impl : ( ( rule__TypeRule__PathAssignment_0 )? ) ;
>-	public final void rule__TypeRule__Group__0__Impl() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__02573);
>+ rule__MultiplicityRule__Group__1();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1217:1: ( ( ( rule__TypeRule__PathAssignment_0 )? ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1218:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1218:1: ( ( rule__TypeRule__PathAssignment_0 )? )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1219:1: ( rule__TypeRule__PathAssignment_0 )?
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getPathAssignment_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1220:1: ( rule__TypeRule__PathAssignment_0 )?
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ state._fsp--;
> 
>-					if((LA10_0 == RULE_ID)) {
>-						int LA10_1 = input.LA(2);
> 
>-						if((LA10_1 == 34)) {
>-							alt10 = 1;
>-						}
>-					}
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1220:2: rule__TypeRule__PathAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl2478);
>-						rule__TypeRule__PathAssignment_0();
>-						_fsp--;
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>-						break;
>+ 	restoreStackSize(stackSize);
> 
>-					}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__0"
> 
>-					after(grammarAccess.getTypeRuleAccess().getPathAssignment_0());
> 
>-				}
>+ // $ANTLR start "rule__MultiplicityRule__Group__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1274:1: rule__MultiplicityRule__Group__0__Impl : ( '[' ) ;
>+ public final void rule__MultiplicityRule__Group__0__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1278:1: ( ( '[' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1279:1: ( '[' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1279:1: ( '[' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1280:1: '['
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0()); 
>+ match(input,35,FOLLOW_35_in_rule__MultiplicityRule__Group__0__Impl2601); 
>+ after(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0()); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__TypeRule__Group__0__Impl
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__0__Impl"
> 
>-	// $ANTLR start rule__TypeRule__Group__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1230:1: rule__TypeRule__Group__1 : rule__TypeRule__Group__1__Impl ;
>-	public final void rule__TypeRule__Group__1() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__MultiplicityRule__Group__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1293:1: rule__MultiplicityRule__Group__1 : rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2 ;
>+ public final void rule__MultiplicityRule__Group__1() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1234:1: ( rule__TypeRule__Group__1__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1235:2: rule__TypeRule__Group__1__Impl
>-			{
>-				pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__12509);
>-				rule__TypeRule__Group__1__Impl();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1297:1: ( rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1298:2: rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__12632);
>+ rule__MultiplicityRule__Group__1__Impl();
> 
>+ state._fsp--;
> 
>-			}
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__12635);
>+ rule__MultiplicityRule__Group__2();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__TypeRule__Group__1
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__TypeRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1241:1: rule__TypeRule__Group__1__Impl : ( ( rule__TypeRule__TypeAssignment_1 ) ) ;
>-	public final void rule__TypeRule__Group__1__Impl() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__1"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1245:1: ( ( ( rule__TypeRule__TypeAssignment_1 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1246:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1246:1: ( ( rule__TypeRule__TypeAssignment_1 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1247:1: ( rule__TypeRule__TypeAssignment_1 )
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getTypeAssignment_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1248:1: ( rule__TypeRule__TypeAssignment_1 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1248:2: rule__TypeRule__TypeAssignment_1
>-					{
>-						pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl2536);
>-						rule__TypeRule__TypeAssignment_1();
>-						_fsp--;
>+ // $ANTLR start "rule__MultiplicityRule__Group__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1305:1: rule__MultiplicityRule__Group__1__Impl : ( ( rule__MultiplicityRule__BoundsAssignment_1 ) ) ;
>+ public final void rule__MultiplicityRule__Group__1__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1309:1: ( ( ( rule__MultiplicityRule__BoundsAssignment_1 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1310:1: ( ( rule__MultiplicityRule__BoundsAssignment_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1310:1: ( ( rule__MultiplicityRule__BoundsAssignment_1 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1311:1: ( rule__MultiplicityRule__BoundsAssignment_1 )
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1312:1: ( rule__MultiplicityRule__BoundsAssignment_1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1312:2: rule__MultiplicityRule__BoundsAssignment_1
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl2662);
>+ rule__MultiplicityRule__BoundsAssignment_1();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getTypeRuleAccess().getTypeAssignment_1());
> 
>-				}
>+ }
> 
>+ after(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1()); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__TypeRule__Group__1__Impl
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__1__Impl"
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1262:1: rule__MultiplicityRule__Group__0 : rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1 ;
>-	public final void rule__MultiplicityRule__Group__0() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__MultiplicityRule__Group__2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1322:1: rule__MultiplicityRule__Group__2 : rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3 ;
>+ public final void rule__MultiplicityRule__Group__2() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1266:1: ( rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1267:2: rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__02570);
>-				rule__MultiplicityRule__Group__0__Impl();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1326:1: ( rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1327:2: rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__22692);
>+ rule__MultiplicityRule__Group__2__Impl();
> 
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__02573);
>-				rule__MultiplicityRule__Group__1();
>-				_fsp--;
>+ state._fsp--;
> 
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__22695);
>+ rule__MultiplicityRule__Group__3();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__0
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__2"
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1274:1: rule__MultiplicityRule__Group__0__Impl : ( '[' ) ;
>-	public final void rule__MultiplicityRule__Group__0__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__MultiplicityRule__Group__2__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1334:1: rule__MultiplicityRule__Group__2__Impl : ( ( rule__MultiplicityRule__Group_2__0 )? ) ;
>+ public final void rule__MultiplicityRule__Group__2__Impl() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1278:1: ( ( '[' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1279:1: ( '[' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1279:1: ( '[' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1280:1: '['
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0());
>-					match(input, 35, FOLLOW_35_in_rule__MultiplicityRule__Group__0__Impl2601);
>-					after(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0());
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1338:1: ( ( ( rule__MultiplicityRule__Group_2__0 )? ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1339:1: ( ( rule__MultiplicityRule__Group_2__0 )? )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1339:1: ( ( rule__MultiplicityRule__Group_2__0 )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1340:1: ( rule__MultiplicityRule__Group_2__0 )?
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getGroup_2()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1341:1: ( rule__MultiplicityRule__Group_2__0 )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-				}
>+ if ( (LA11_0==37) ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1341:2: rule__MultiplicityRule__Group_2__0
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2722);
>+ rule__MultiplicityRule__Group_2__0();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ break;
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getMultiplicityRuleAccess().getGroup_2()); 
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__0__Impl
>+ }
> 
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1293:1: rule__MultiplicityRule__Group__1 : rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2 ;
>-	public final void rule__MultiplicityRule__Group__1() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1297:1: ( rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1298:2: rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__12632);
>-				rule__MultiplicityRule__Group__1__Impl();
>-				_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__12635);
>-				rule__MultiplicityRule__Group__2();
>-				_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__2__Impl"
> 
> 
>-			}
>+ // $ANTLR start "rule__MultiplicityRule__Group__3"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1351:1: rule__MultiplicityRule__Group__3 : rule__MultiplicityRule__Group__3__Impl ;
>+ public final void rule__MultiplicityRule__Group__3() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1355:1: ( rule__MultiplicityRule__Group__3__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1356:2: rule__MultiplicityRule__Group__3__Impl
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32753);
>+ rule__MultiplicityRule__Group__3__Impl();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__1
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1305:1: rule__MultiplicityRule__Group__1__Impl : ( ( rule__MultiplicityRule__BoundsAssignment_1 ) ) ;
>-	public final void rule__MultiplicityRule__Group__1__Impl() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__3"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1309:1: ( ( ( rule__MultiplicityRule__BoundsAssignment_1 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1310:1: ( ( rule__MultiplicityRule__BoundsAssignment_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1310:1: ( ( rule__MultiplicityRule__BoundsAssignment_1 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1311:1: ( rule__MultiplicityRule__BoundsAssignment_1 )
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1312:1: ( rule__MultiplicityRule__BoundsAssignment_1 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1312:2: rule__MultiplicityRule__BoundsAssignment_1
>-					{
>-						pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl2662);
>-						rule__MultiplicityRule__BoundsAssignment_1();
>-						_fsp--;
> 
>+ // $ANTLR start "rule__MultiplicityRule__Group__3__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1362:1: rule__MultiplicityRule__Group__3__Impl : ( ']' ) ;
>+ public final void rule__MultiplicityRule__Group__3__Impl() throws RecognitionException {
> 
>-					}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1366:1: ( ( ']' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1367:1: ( ']' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1367:1: ( ']' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1368:1: ']'
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3()); 
>+ match(input,36,FOLLOW_36_in_rule__MultiplicityRule__Group__3__Impl2781); 
>+ after(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3()); 
> 
>-					after(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1());
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group__3__Impl"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__1__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1389:1: rule__MultiplicityRule__Group_2__0 : rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1 ;
>+ public final void rule__MultiplicityRule__Group_2__0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1393:1: ( rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1394:2: rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02820);
>+ rule__MultiplicityRule__Group_2__0__Impl();
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1322:1: rule__MultiplicityRule__Group__2 : rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3 ;
>-	public final void rule__MultiplicityRule__Group__2() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02823);
>+ rule__MultiplicityRule__Group_2__1();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1326:1: ( rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1327:2: rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3
>-			{
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__22692);
>-				rule__MultiplicityRule__Group__2__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__22695);
>-				rule__MultiplicityRule__Group__3();
>-				_fsp--;
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__0"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__2
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__0__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1401:1: rule__MultiplicityRule__Group_2__0__Impl : ( '..' ) ;
>+ public final void rule__MultiplicityRule__Group_2__0__Impl() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1405:1: ( ( '..' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1406:1: ( '..' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1406:1: ( '..' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1407:1: '..'
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0()); 
>+ match(input,37,FOLLOW_37_in_rule__MultiplicityRule__Group_2__0__Impl2851); 
>+ after(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0()); 
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__2__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1334:1: rule__MultiplicityRule__Group__2__Impl : ( ( rule__MultiplicityRule__Group_2__0 )? ) ;
>-	public final void rule__MultiplicityRule__Group__2__Impl() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1338:1: ( ( ( rule__MultiplicityRule__Group_2__0 )? ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1339:1: ( ( rule__MultiplicityRule__Group_2__0 )? )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1339:1: ( ( rule__MultiplicityRule__Group_2__0 )? )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1340:1: ( rule__MultiplicityRule__Group_2__0 )?
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getGroup_2());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1341:1: ( rule__MultiplicityRule__Group_2__0 )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ }
> 
>-					if((LA11_0 == 37)) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1341:2: rule__MultiplicityRule__Group_2__0
>-					{
>-						pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2722);
>-						rule__MultiplicityRule__Group_2__0();
>-						_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-					}
>-						break;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__0__Impl"
> 
>-					}
> 
>-					after(grammarAccess.getMultiplicityRuleAccess().getGroup_2());
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1420:1: rule__MultiplicityRule__Group_2__1 : rule__MultiplicityRule__Group_2__1__Impl ;
>+ public final void rule__MultiplicityRule__Group_2__1() throws RecognitionException {
> 
>-				}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1424:1: ( rule__MultiplicityRule__Group_2__1__Impl )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1425:2: rule__MultiplicityRule__Group_2__1__Impl
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12882);
>+ rule__MultiplicityRule__Group_2__1__Impl();
> 
>+ state._fsp--;
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__2__Impl
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__1"
> 
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__3
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1351:1: rule__MultiplicityRule__Group__3 : rule__MultiplicityRule__Group__3__Impl ;
>-	public final void rule__MultiplicityRule__Group__3() throws RecognitionException {
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__1__Impl"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1431:1: rule__MultiplicityRule__Group_2__1__Impl : ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) ) ;
>+ public final void rule__MultiplicityRule__Group_2__1__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1435:1: ( ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1436:1: ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1436:1: ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1437:1: ( rule__MultiplicityRule__BoundsAssignment_2_1 )
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1438:1: ( rule__MultiplicityRule__BoundsAssignment_2_1 )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1438:2: rule__MultiplicityRule__BoundsAssignment_2_1
>+ {
>+ pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2909);
>+ rule__MultiplicityRule__BoundsAssignment_2_1();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1355:1: ( rule__MultiplicityRule__Group__3__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1356:2: rule__MultiplicityRule__Group__3__Impl
>-			{
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32753);
>-				rule__MultiplicityRule__Group__3__Impl();
>-				_fsp--;
>+ state._fsp--;
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__3
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__MultiplicityRule__Group__3__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1362:1: rule__MultiplicityRule__Group__3__Impl : ( ']' ) ;
>-	public final void rule__MultiplicityRule__Group__3__Impl() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__1__Impl"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1366:1: ( ( ']' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1367:1: ( ']' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1367:1: ( ']' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1368:1: ']'
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3());
>-					match(input, 36, FOLLOW_36_in_rule__MultiplicityRule__Group__3__Impl2781);
>-					after(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3());
> 
>-				}
>+ // $ANTLR start "rule__ParameterRule__VisibilityAssignment_0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1453:1: rule__ParameterRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ;
>+ public final void rule__ParameterRule__VisibilityAssignment_0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1457:1: ( ( ruleVisibilityKind ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1458:1: ( ruleVisibilityKind )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1458:1: ( ruleVisibilityKind )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1459:1: ruleVisibilityKind
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
>+ pushFollow(FOLLOW_ruleVisibilityKind_in_rule__ParameterRule__VisibilityAssignment_02948);
>+ ruleVisibilityKind();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__MultiplicityRule__Group__3__Impl
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__MultiplicityRule__Group_2__0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1389:1: rule__MultiplicityRule__Group_2__0 : rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1 ;
>-	public final void rule__MultiplicityRule__Group_2__0() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__VisibilityAssignment_0"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1393:1: ( rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1 )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1394:2: rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1
>-			{
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02820);
>-				rule__MultiplicityRule__Group_2__0__Impl();
>-				_fsp--;
> 
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02823);
>-				rule__MultiplicityRule__Group_2__1();
>-				_fsp--;
>+ // $ANTLR start "rule__ParameterRule__DirectionAssignment_1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1468:1: rule__ParameterRule__DirectionAssignment_1 : ( ruleDirection ) ;
>+ public final void rule__ParameterRule__DirectionAssignment_1() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1472:1: ( ( ruleDirection ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1473:1: ( ruleDirection )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1473:1: ( ruleDirection )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1474:1: ruleDirection
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0()); 
>+ pushFollow(FOLLOW_ruleDirection_in_rule__ParameterRule__DirectionAssignment_12979);
>+ ruleDirection();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__MultiplicityRule__Group_2__0
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__MultiplicityRule__Group_2__0__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1401:1: rule__MultiplicityRule__Group_2__0__Impl : ( '..' ) ;
>-	public final void rule__MultiplicityRule__Group_2__0__Impl() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__DirectionAssignment_1"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1405:1: ( ( '..' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1406:1: ( '..' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1406:1: ( '..' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1407:1: '..'
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0());
>-					match(input, 37, FOLLOW_37_in_rule__MultiplicityRule__Group_2__0__Impl2851);
>-					after(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0());
> 
>-				}
>+ // $ANTLR start "rule__ParameterRule__NameAssignment_2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1483:1: rule__ParameterRule__NameAssignment_2 : ( RULE_ID ) ;
>+ public final void rule__ParameterRule__NameAssignment_2() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1487:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1488:1: ( RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1488:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1489:1: RULE_ID
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ParameterRule__NameAssignment_23010); 
>+ after(grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0()); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__MultiplicityRule__Group_2__0__Impl
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__NameAssignment_2"
> 
>-	// $ANTLR start rule__MultiplicityRule__Group_2__1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1420:1: rule__MultiplicityRule__Group_2__1 : rule__MultiplicityRule__Group_2__1__Impl ;
>-	public final void rule__MultiplicityRule__Group_2__1() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__ParameterRule__TypeAssignment_4_0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1498:1: rule__ParameterRule__TypeAssignment_4_0 : ( ruleTypeRule ) ;
>+ public final void rule__ParameterRule__TypeAssignment_4_0() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1424:1: ( rule__MultiplicityRule__Group_2__1__Impl )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1425:2: rule__MultiplicityRule__Group_2__1__Impl
>-			{
>-				pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12882);
>-				rule__MultiplicityRule__Group_2__1__Impl();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1502:1: ( ( ruleTypeRule ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1503:1: ( ruleTypeRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1503:1: ( ruleTypeRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1504:1: ruleTypeRule
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_rule__ParameterRule__TypeAssignment_4_03041);
>+ ruleTypeRule();
> 
>+ state._fsp--;
> 
>-			}
>+ after(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__MultiplicityRule__Group_2__1
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__MultiplicityRule__Group_2__1__Impl
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1431:1: rule__MultiplicityRule__Group_2__1__Impl : ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) ) ;
>-	public final void rule__MultiplicityRule__Group_2__1__Impl() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__TypeAssignment_4_0"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1435:1: ( ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1436:1: ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1436:1: ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1437:1: ( rule__MultiplicityRule__BoundsAssignment_2_1 )
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1438:1: ( rule__MultiplicityRule__BoundsAssignment_2_1 )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1438:2: rule__MultiplicityRule__BoundsAssignment_2_1
>-					{
>-						pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2909);
>-						rule__MultiplicityRule__BoundsAssignment_2_1();
>-						_fsp--;
>+ // $ANTLR start "rule__ParameterRule__MultiplicityAssignment_5"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1513:1: rule__ParameterRule__MultiplicityAssignment_5 : ( ruleMultiplicityRule ) ;
>+ public final void rule__ParameterRule__MultiplicityAssignment_5() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1517:1: ( ( ruleMultiplicityRule ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1518:1: ( ruleMultiplicityRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1518:1: ( ruleMultiplicityRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1519:1: ruleMultiplicityRule
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
>+ pushFollow(FOLLOW_ruleMultiplicityRule_in_rule__ParameterRule__MultiplicityAssignment_53072);
>+ ruleMultiplicityRule();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1());
>+ after(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
> 
>-				}
>+ }
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			restoreStackSize(stackSize);
>+ 	restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__MultiplicityAssignment_5"
> 
>-	// $ANTLR end rule__MultiplicityRule__Group_2__1__Impl
> 
>+ // $ANTLR start "rule__ParameterRule__ModifiersAssignment_6"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1528:1: rule__ParameterRule__ModifiersAssignment_6 : ( ruleModifiersRule ) ;
>+ public final void rule__ParameterRule__ModifiersAssignment_6() throws RecognitionException {
> 
>-	// $ANTLR start rule__ParameterRule__VisibilityAssignment_0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1453:1: rule__ParameterRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ;
>-	public final void rule__ParameterRule__VisibilityAssignment_0() throws RecognitionException {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1532:1: ( ( ruleModifiersRule ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1533:1: ( ruleModifiersRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1533:1: ( ruleModifiersRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1534:1: ruleModifiersRule
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
>+ pushFollow(FOLLOW_ruleModifiersRule_in_rule__ParameterRule__ModifiersAssignment_63103);
>+ ruleModifiersRule();
> 
>-		int stackSize = keepStackSize();
>+ state._fsp--;
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1457:1: ( ( ruleVisibilityKind ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1458:1: ( ruleVisibilityKind )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1458:1: ( ruleVisibilityKind )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1459:1: ruleVisibilityKind
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0());
>-					pushFollow(FOLLOW_ruleVisibilityKind_in_rule__ParameterRule__VisibilityAssignment_02948);
>-					ruleVisibilityKind();
>-					_fsp--;
>+ after(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
> 
>-					after(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0());
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 	restoreStackSize(stackSize);
> 
>-			restoreStackSize(stackSize);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__ModifiersAssignment_6"
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ParameterRule__VisibilityAssignment_0
>+ // $ANTLR start "rule__ParameterRule__EffectAssignment_7"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1543:1: rule__ParameterRule__EffectAssignment_7 : ( ruleEffectRule ) ;
>+ public final void rule__ParameterRule__EffectAssignment_7() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1547:1: ( ( ruleEffectRule ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1548:1: ( ruleEffectRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1548:1: ( ruleEffectRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1549:1: ruleEffectRule
>+ {
>+ before(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0()); 
>+ pushFollow(FOLLOW_ruleEffectRule_in_rule__ParameterRule__EffectAssignment_73134);
>+ ruleEffectRule();
> 
>-	// $ANTLR start rule__ParameterRule__DirectionAssignment_1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1468:1: rule__ParameterRule__DirectionAssignment_1 : ( ruleDirection ) ;
>-	public final void rule__ParameterRule__DirectionAssignment_1() throws RecognitionException {
>+ state._fsp--;
> 
>-		int stackSize = keepStackSize();
>+ after(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1472:1: ( ( ruleDirection ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1473:1: ( ruleDirection )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1473:1: ( ruleDirection )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1474:1: ruleDirection
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0());
>-					pushFollow(FOLLOW_ruleDirection_in_rule__ParameterRule__DirectionAssignment_12979);
>-					ruleDirection();
>-					_fsp--;
>+ }
> 
>-					after(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ParameterRule__EffectAssignment_7"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__ModifiersRule__ValuesAssignment_1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1558:1: rule__ModifiersRule__ValuesAssignment_1 : ( ruleModifierSpecification ) ;
>+ public final void rule__ModifiersRule__ValuesAssignment_1() throws RecognitionException {
> 
>-	// $ANTLR end rule__ParameterRule__DirectionAssignment_1
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1562:1: ( ( ruleModifierSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1563:1: ( ruleModifierSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1563:1: ( ruleModifierSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1564:1: ruleModifierSpecification
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13165);
>+ ruleModifierSpecification();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__ParameterRule__NameAssignment_2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1483:1: rule__ParameterRule__NameAssignment_2 : ( RULE_ID ) ;
>-	public final void rule__ParameterRule__NameAssignment_2() throws RecognitionException {
>+ after(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1487:1: ( ( RULE_ID ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1488:1: ( RULE_ID )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1488:1: ( RULE_ID )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1489:1: RULE_ID
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0());
>-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__ParameterRule__NameAssignment_23010);
>-					after(grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__ValuesAssignment_1"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__ModifiersRule__ValuesAssignment_2_1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1573:1: rule__ModifiersRule__ValuesAssignment_2_1 : ( ruleModifierSpecification ) ;
>+ public final void rule__ModifiersRule__ValuesAssignment_2_1() throws RecognitionException {
> 
>-	// $ANTLR end rule__ParameterRule__NameAssignment_2
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1577:1: ( ( ruleModifierSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1578:1: ( ruleModifierSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1578:1: ( ruleModifierSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1579:1: ruleModifierSpecification
>+ {
>+ before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13196);
>+ ruleModifierSpecification();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__ParameterRule__TypeAssignment_4_0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1498:1: rule__ParameterRule__TypeAssignment_4_0 : ( ruleTypeRule ) ;
>-	public final void rule__ParameterRule__TypeAssignment_4_0() throws RecognitionException {
>+ after(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1502:1: ( ( ruleTypeRule ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1503:1: ( ruleTypeRule )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1503:1: ( ruleTypeRule )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1504:1: ruleTypeRule
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0());
>-					pushFollow(FOLLOW_ruleTypeRule_in_rule__ParameterRule__TypeAssignment_4_03041);
>-					ruleTypeRule();
>-					_fsp--;
> 
>-					after(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifiersRule__ValuesAssignment_2_1"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "rule__ModifierSpecification__ValueAssignment"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1588:1: rule__ModifierSpecification__ValueAssignment : ( ruleModifierKind ) ;
>+ public final void rule__ModifierSpecification__ValueAssignment() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1592:1: ( ( ruleModifierKind ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1593:1: ( ruleModifierKind )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1593:1: ( ruleModifierKind )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1594:1: ruleModifierKind
>+ {
>+ before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); 
>+ pushFollow(FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment3227);
>+ ruleModifierKind();
> 
>-	// $ANTLR end rule__ParameterRule__TypeAssignment_4_0
>+ state._fsp--;
> 
>+ after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); 
> 
>-	// $ANTLR start rule__ParameterRule__MultiplicityAssignment_5
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1513:1: rule__ParameterRule__MultiplicityAssignment_5 : ( ruleMultiplicityRule ) ;
>-	public final void rule__ParameterRule__MultiplicityAssignment_5() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1517:1: ( ( ruleMultiplicityRule ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1518:1: ( ruleMultiplicityRule )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1518:1: ( ruleMultiplicityRule )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1519:1: ruleMultiplicityRule
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0());
>-					pushFollow(FOLLOW_ruleMultiplicityRule_in_rule__ParameterRule__MultiplicityAssignment_53072);
>-					ruleMultiplicityRule();
>-					_fsp--;
>+ }
> 
>-					after(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0());
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-				}
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__ModifierSpecification__ValueAssignment"
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // $ANTLR start "rule__EffectRule__EffectKindAssignment_2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1603:1: rule__EffectRule__EffectKindAssignment_2 : ( ruleEffectKind ) ;
>+ public final void rule__EffectRule__EffectKindAssignment_2() throws RecognitionException {
> 
>-			restoreStackSize(stackSize);
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1607:1: ( ( ruleEffectKind ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1608:1: ( ruleEffectKind )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1608:1: ( ruleEffectKind )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1609:1: ruleEffectKind
>+ {
>+ before(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0()); 
>+ pushFollow(FOLLOW_ruleEffectKind_in_rule__EffectRule__EffectKindAssignment_23258);
>+ ruleEffectKind();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__ParameterRule__MultiplicityAssignment_5
>+ after(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0()); 
> 
>+ }
> 
>-	// $ANTLR start rule__ParameterRule__ModifiersAssignment_6
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1528:1: rule__ParameterRule__ModifiersAssignment_6 : ( ruleModifiersRule ) ;
>-	public final void rule__ParameterRule__ModifiersAssignment_6() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1532:1: ( ( ruleModifiersRule ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1533:1: ( ruleModifiersRule )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1533:1: ( ruleModifiersRule )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1534:1: ruleModifiersRule
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0());
>-					pushFollow(FOLLOW_ruleModifiersRule_in_rule__ParameterRule__ModifiersAssignment_63103);
>-					ruleModifiersRule();
>-					_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					after(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0());
>+ 	restoreStackSize(stackSize);
> 
>-				}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__EffectRule__EffectKindAssignment_2"
> 
> 
>-			}
>+ // $ANTLR start "rule__QualifiedName__PathAssignment_0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1618:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
>+ public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1622:1: ( ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1623:1: ( ( RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1623:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1624:1: ( RULE_ID )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1625:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1626:1: RULE_ID
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_03293); 
>+ after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ after(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 
>-	// $ANTLR end rule__ParameterRule__ModifiersAssignment_6
>+ }
> 
> 
>-	// $ANTLR start rule__ParameterRule__EffectAssignment_7
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1543:1: rule__ParameterRule__EffectAssignment_7 : ( ruleEffectRule ) ;
>-	public final void rule__ParameterRule__EffectAssignment_7() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1547:1: ( ( ruleEffectRule ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1548:1: ( ruleEffectRule )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1548:1: ( ruleEffectRule )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1549:1: ruleEffectRule
>-				{
>-					before(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0());
>-					pushFollow(FOLLOW_ruleEffectRule_in_rule__ParameterRule__EffectAssignment_73134);
>-					ruleEffectRule();
>-					_fsp--;
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__PathAssignment_0"
> 
>-				}
> 
>+ // $ANTLR start "rule__QualifiedName__RemainingAssignment_2"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1637:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
>+ public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1641:1: ( ( ruleQualifiedName ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1642:1: ( ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1642:1: ( ruleQualifiedName )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1643:1: ruleQualifiedName
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23328);
>+ ruleQualifiedName();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ParameterRule__EffectAssignment_7
> 
>+ }
> 
>-	// $ANTLR start rule__ModifiersRule__ValuesAssignment_1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1558:1: rule__ModifiersRule__ValuesAssignment_1 : ( ruleModifierSpecification ) ;
>-	public final void rule__ModifiersRule__ValuesAssignment_1() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1562:1: ( ( ruleModifierSpecification ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1563:1: ( ruleModifierSpecification )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1563:1: ( ruleModifierSpecification )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1564:1: ruleModifierSpecification
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0());
>-					pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13165);
>-					ruleModifierSpecification();
>-					_fsp--;
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__RemainingAssignment_2"
> 
>-					after(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0());
> 
>-				}
>+ // $ANTLR start "rule__TypeRule__PathAssignment_0"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1652:1: rule__TypeRule__PathAssignment_0 : ( ruleQualifiedName ) ;
>+ public final void rule__TypeRule__PathAssignment_0() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1656:1: ( ( ruleQualifiedName ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1657:1: ( ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1657:1: ( ruleQualifiedName )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1658:1: ruleQualifiedName
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03359);
>+ ruleQualifiedName();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__ModifiersRule__ValuesAssignment_1
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__ModifiersRule__ValuesAssignment_2_1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1573:1: rule__ModifiersRule__ValuesAssignment_2_1 : ( ruleModifierSpecification ) ;
>-	public final void rule__ModifiersRule__ValuesAssignment_2_1() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__PathAssignment_0"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1577:1: ( ( ruleModifierSpecification ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1578:1: ( ruleModifierSpecification )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1578:1: ( ruleModifierSpecification )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1579:1: ruleModifierSpecification
>-				{
>-					before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0());
>-					pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13196);
>-					ruleModifierSpecification();
>-					_fsp--;
> 
>-					after(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0());
>+ // $ANTLR start "rule__TypeRule__TypeAssignment_1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1667:1: rule__TypeRule__TypeAssignment_1 : ( ( RULE_ID ) ) ;
>+ public final void rule__TypeRule__TypeAssignment_1() throws RecognitionException {
> 
>-				}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1671:1: ( ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1672:1: ( ( RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1672:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1673:1: ( RULE_ID )
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0()); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1674:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1675:1: RULE_ID
>+ {
>+ before(grammarAccess.getTypeRuleAccess().getTypeTypeIDTerminalRuleCall_1_0_1()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_13394); 
>+ after(grammarAccess.getTypeRuleAccess().getTypeTypeIDTerminalRuleCall_1_0_1()); 
> 
>+ }
> 
>-			}
>+ after(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0()); 
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ }
> 
>-	// $ANTLR end rule__ModifiersRule__ValuesAssignment_2_1
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR start rule__ModifierSpecification__ValueAssignment
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1588:1: rule__ModifierSpecification__ValueAssignment : ( ruleModifierKind ) ;
>-	public final void rule__ModifierSpecification__ValueAssignment() throws RecognitionException {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__TypeRule__TypeAssignment_1"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1592:1: ( ( ruleModifierKind ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1593:1: ( ruleModifierKind )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1593:1: ( ruleModifierKind )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1594:1: ruleModifierKind
>-				{
>-					before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0());
>-					pushFollow(FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment3227);
>-					ruleModifierKind();
>-					_fsp--;
>+ // $ANTLR start "rule__MultiplicityRule__BoundsAssignment_1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1686:1: rule__MultiplicityRule__BoundsAssignment_1 : ( ruleBoundSpecification ) ;
>+ public final void rule__MultiplicityRule__BoundsAssignment_1() throws RecognitionException {
> 
>-					after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0());
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1690:1: ( ( ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1691:1: ( ruleBoundSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1691:1: ( ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1692:1: ruleBoundSpecification
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13429);
>+ ruleBoundSpecification();
> 
>-				}
>+ state._fsp--;
> 
>+ after(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__ModifierSpecification__ValueAssignment
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__BoundsAssignment_1"
> 
>-	// $ANTLR start rule__EffectRule__EffectKindAssignment_2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1603:1: rule__EffectRule__EffectKindAssignment_2 : ( ruleEffectKind ) ;
>-	public final void rule__EffectRule__EffectKindAssignment_2() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__MultiplicityRule__BoundsAssignment_2_1"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1701:1: rule__MultiplicityRule__BoundsAssignment_2_1 : ( ruleBoundSpecification ) ;
>+ public final void rule__MultiplicityRule__BoundsAssignment_2_1() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1607:1: ( ( ruleEffectKind ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1608:1: ( ruleEffectKind )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1608:1: ( ruleEffectKind )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1609:1: ruleEffectKind
>-				{
>-					before(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0());
>-					pushFollow(FOLLOW_ruleEffectKind_in_rule__EffectRule__EffectKindAssignment_23258);
>-					ruleEffectKind();
>-					_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1705:1: ( ( ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1706:1: ( ruleBoundSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1706:1: ( ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1707:1: ruleBoundSpecification
>+ {
>+ before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13460);
>+ ruleBoundSpecification();
> 
>-					after(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0());
>+ state._fsp--;
> 
>-				}
>+ after(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
> 
>+ }
> 
>-			}
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
> 
>-			restoreStackSize(stackSize);
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		}
>-		return;
>-	}
>+ 	restoreStackSize(stackSize);
> 
>-	// $ANTLR end rule__EffectRule__EffectKindAssignment_2
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__MultiplicityRule__BoundsAssignment_2_1"
> 
> 
>-	// $ANTLR start rule__QualifiedName__PathAssignment_0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1618:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
>-	public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
>+ // $ANTLR start "rule__BoundSpecification__ValueAssignment"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1716:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
>+ public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1720:1: ( ( RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1721:1: ( RULE_UNLIMITEDLITERAL )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1721:1: ( RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1722:1: RULE_UNLIMITEDLITERAL
>+ {
>+ before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
>+ match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment3491); 
>+ after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1622:1: ( ( ( RULE_ID ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1623:1: ( ( RULE_ID ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1623:1: ( ( RULE_ID ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1624:1: ( RULE_ID )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1625:1: ( RULE_ID )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1626:1: RULE_ID
>-					{
>-						before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1());
>-						match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_03293);
>-						after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1());
>+ }
> 
>-					}
> 
>-					after(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__BoundSpecification__ValueAssignment"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ // Delegated rules
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ 
> 
>-	// $ANTLR end rule__QualifiedName__PathAssignment_0
>+ public static final BitSet FOLLOW_ruleParameterRule_in_entryRuleParameterRule61 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleParameterRule68 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__0_in_ruleParameterRule94 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule121 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule128 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__0_in_ruleModifiersRule154 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification181 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification188 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifierSpecification__ValueAssignment_in_ruleModifierSpecification214 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleEffectRule_in_entryRuleEffectRule241 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleEffectRule248 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__0_in_ruleEffectRule274 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName301 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName308 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName334 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule361 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule368 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule394 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule421 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule428 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__0_in_ruleMultiplicityRule454 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification481 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification488 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification514 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind551 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectKind__Alternatives_in_ruleEffectKind587 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind623 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__Direction__Alternatives_in_ruleDirection659 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__TypeAssignment_4_0_in_rule__ParameterRule__Alternatives_4694 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_12_in_rule__ParameterRule__Alternatives_4713 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_13_in_rule__ModifierKind__Alternatives748 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_14_in_rule__ModifierKind__Alternatives769 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_15_in_rule__ModifierKind__Alternatives790 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_16_in_rule__ModifierKind__Alternatives811 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_17_in_rule__EffectKind__Alternatives847 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_18_in_rule__EffectKind__Alternatives868 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_19_in_rule__EffectKind__Alternatives889 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_20_in_rule__EffectKind__Alternatives910 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_21_in_rule__VisibilityKind__Alternatives946 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_22_in_rule__VisibilityKind__Alternatives967 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_23_in_rule__VisibilityKind__Alternatives988 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_24_in_rule__VisibilityKind__Alternatives1009 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_25_in_rule__Direction__Alternatives1045 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_26_in_rule__Direction__Alternatives1066 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_27_in_rule__Direction__Alternatives1087 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_28_in_rule__Direction__Alternatives1108 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__0__Impl_in_rule__ParameterRule__Group__01141 = new BitSet(new long[]{0x000000001E000000L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__1_in_rule__ParameterRule__Group__01144 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__VisibilityAssignment_0_in_rule__ParameterRule__Group__0__Impl1171 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__1__Impl_in_rule__ParameterRule__Group__11201 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__2_in_rule__ParameterRule__Group__11204 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__DirectionAssignment_1_in_rule__ParameterRule__Group__1__Impl1231 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__2__Impl_in_rule__ParameterRule__Group__21261 = new BitSet(new long[]{0x0000000020000000L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__3_in_rule__ParameterRule__Group__21264 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__NameAssignment_2_in_rule__ParameterRule__Group__2__Impl1291 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__3__Impl_in_rule__ParameterRule__Group__31321 = new BitSet(new long[]{0x0000000000001010L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__4_in_rule__ParameterRule__Group__31324 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_29_in_rule__ParameterRule__Group__3__Impl1352 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__4__Impl_in_rule__ParameterRule__Group__41383 = new BitSet(new long[]{0x0000000840000000L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__5_in_rule__ParameterRule__Group__41386 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Alternatives_4_in_rule__ParameterRule__Group__4__Impl1413 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__5__Impl_in_rule__ParameterRule__Group__51443 = new BitSet(new long[]{0x0000000840000000L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__6_in_rule__ParameterRule__Group__51446 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__MultiplicityAssignment_5_in_rule__ParameterRule__Group__5__Impl1473 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__6__Impl_in_rule__ParameterRule__Group__61504 = new BitSet(new long[]{0x0000000840000000L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__7_in_rule__ParameterRule__Group__61507 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__ModifiersAssignment_6_in_rule__ParameterRule__Group__6__Impl1534 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__Group__7__Impl_in_rule__ParameterRule__Group__71565 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ParameterRule__EffectAssignment_7_in_rule__ParameterRule__Group__7__Impl1592 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__01638 = new BitSet(new long[]{0x000000000001E000L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__01641 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_30_in_rule__ModifiersRule__Group__0__Impl1669 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__11700 = new BitSet(new long[]{0x0000000180000000L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__11703 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl1730 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__21760 = new BitSet(new long[]{0x0000000180000000L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__21763 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl1790 = new BitSet(new long[]{0x0000000100000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__31821 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_31_in_rule__ModifiersRule__Group__3__Impl1849 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__01888 = new BitSet(new long[]{0x000000000001E000L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__01891 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_32_in_rule__ModifiersRule__Group_2__0__Impl1919 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__11950 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl1977 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__0__Impl_in_rule__EffectRule__Group__02011 = new BitSet(new long[]{0x0000000200000000L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__1_in_rule__EffectRule__Group__02014 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_30_in_rule__EffectRule__Group__0__Impl2042 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__1__Impl_in_rule__EffectRule__Group__12073 = new BitSet(new long[]{0x00000000001E0000L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__2_in_rule__EffectRule__Group__12076 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_33_in_rule__EffectRule__Group__1__Impl2104 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__2__Impl_in_rule__EffectRule__Group__22135 = new BitSet(new long[]{0x0000000080000000L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__3_in_rule__EffectRule__Group__22138 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectRule__EffectKindAssignment_2_in_rule__EffectRule__Group__2__Impl2165 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__EffectRule__Group__3__Impl_in_rule__EffectRule__Group__32195 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_31_in_rule__EffectRule__Group__3__Impl2223 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__02262 = new BitSet(new long[]{0x0000000400000000L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__02265 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl2292 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__12322 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__12325 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_34_in_rule__QualifiedName__Group__1__Impl2353 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__22384 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl2411 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__02448 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__02451 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl2478 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__12509 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl2536 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__02570 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__02573 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_35_in_rule__MultiplicityRule__Group__0__Impl2601 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__12632 = new BitSet(new long[]{0x0000003000000000L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__12635 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl2662 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__22692 = new BitSet(new long[]{0x0000003000000000L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__22695 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2722 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32753 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_36_in_rule__MultiplicityRule__Group__3__Impl2781 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02820 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02823 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_37_in_rule__MultiplicityRule__Group_2__0__Impl2851 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12882 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2909 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__ParameterRule__VisibilityAssignment_02948 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleDirection_in_rule__ParameterRule__DirectionAssignment_12979 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__ParameterRule__NameAssignment_23010 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_rule__ParameterRule__TypeAssignment_4_03041 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleMultiplicityRule_in_rule__ParameterRule__MultiplicityAssignment_53072 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifiersRule_in_rule__ParameterRule__ModifiersAssignment_63103 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleEffectRule_in_rule__ParameterRule__EffectAssignment_73134 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13165 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13196 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment3227 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleEffectKind_in_rule__EffectRule__EffectKindAssignment_23258 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_03293 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23328 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03359 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_13394 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13429 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13460 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment3491 = new BitSet(new long[]{0x0000000000000002L});
> 
>-
>-	// $ANTLR start rule__QualifiedName__RemainingAssignment_2
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1637:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
>-	public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1641:1: ( ( ruleQualifiedName ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1642:1: ( ruleQualifiedName )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1642:1: ( ruleQualifiedName )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1643:1: ruleQualifiedName
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0());
>-					pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23328);
>-					ruleQualifiedName();
>-					_fsp--;
>-
>-					after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end rule__QualifiedName__RemainingAssignment_2
>-
>-
>-	// $ANTLR start rule__TypeRule__PathAssignment_0
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1652:1: rule__TypeRule__PathAssignment_0 : ( ruleQualifiedName ) ;
>-	public final void rule__TypeRule__PathAssignment_0() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1656:1: ( ( ruleQualifiedName ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1657:1: ( ruleQualifiedName )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1657:1: ( ruleQualifiedName )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1658:1: ruleQualifiedName
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0());
>-					pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03359);
>-					ruleQualifiedName();
>-					_fsp--;
>-
>-					after(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end rule__TypeRule__PathAssignment_0
>-
>-
>-	// $ANTLR start rule__TypeRule__TypeAssignment_1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1667:1: rule__TypeRule__TypeAssignment_1 : ( ( RULE_ID ) ) ;
>-	public final void rule__TypeRule__TypeAssignment_1() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1671:1: ( ( ( RULE_ID ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1672:1: ( ( RULE_ID ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1672:1: ( ( RULE_ID ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1673:1: ( RULE_ID )
>-				{
>-					before(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0());
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1674:1: ( RULE_ID )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1675:1: RULE_ID
>-					{
>-						before(grammarAccess.getTypeRuleAccess().getTypeTypeIDTerminalRuleCall_1_0_1());
>-						match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_13394);
>-						after(grammarAccess.getTypeRuleAccess().getTypeTypeIDTerminalRuleCall_1_0_1());
>-
>-					}
>-
>-					after(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end rule__TypeRule__TypeAssignment_1
>-
>-
>-	// $ANTLR start rule__MultiplicityRule__BoundsAssignment_1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1686:1: rule__MultiplicityRule__BoundsAssignment_1 : ( ruleBoundSpecification ) ;
>-	public final void rule__MultiplicityRule__BoundsAssignment_1() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1690:1: ( ( ruleBoundSpecification ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1691:1: ( ruleBoundSpecification )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1691:1: ( ruleBoundSpecification )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1692:1: ruleBoundSpecification
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0());
>-					pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13429);
>-					ruleBoundSpecification();
>-					_fsp--;
>-
>-					after(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end rule__MultiplicityRule__BoundsAssignment_1
>-
>-
>-	// $ANTLR start rule__MultiplicityRule__BoundsAssignment_2_1
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1701:1: rule__MultiplicityRule__BoundsAssignment_2_1 : ( ruleBoundSpecification ) ;
>-	public final void rule__MultiplicityRule__BoundsAssignment_2_1() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1705:1: ( ( ruleBoundSpecification ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1706:1: ( ruleBoundSpecification )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1706:1: ( ruleBoundSpecification )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1707:1: ruleBoundSpecification
>-				{
>-					before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0());
>-					pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13460);
>-					ruleBoundSpecification();
>-					_fsp--;
>-
>-					after(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end rule__MultiplicityRule__BoundsAssignment_2_1
>-
>-
>-	// $ANTLR start rule__BoundSpecification__ValueAssignment
>-	// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1716:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
>-	public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1720:1: ( ( RULE_UNLIMITEDLITERAL ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1721:1: ( RULE_UNLIMITEDLITERAL )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1721:1: ( RULE_UNLIMITEDLITERAL )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext.ui/src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/contentassist/antlr/internal/InternalUmlParameter.g:1722:1: RULE_UNLIMITEDLITERAL
>-				{
>-					before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0());
>-					match(input, RULE_UNLIMITEDLITERAL, FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment3491);
>-					after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0());
>-
>-				}
>-
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-
>-			restoreStackSize(stackSize);
>-
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end rule__BoundSpecification__ValueAssignment
>-
>-
>-
>-
>-	public static final BitSet FOLLOW_ruleParameterRule_in_entryRuleParameterRule61 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleParameterRule68 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__0_in_ruleParameterRule94 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule121 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule128 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__0_in_ruleModifiersRule154 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification181 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification188 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifierSpecification__ValueAssignment_in_ruleModifierSpecification214 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleEffectRule_in_entryRuleEffectRule241 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleEffectRule248 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__0_in_ruleEffectRule274 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName301 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName308 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName334 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule361 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule368 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule394 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule421 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule428 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__0_in_ruleMultiplicityRule454 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification481 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification488 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification514 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind551 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectKind__Alternatives_in_ruleEffectKind587 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind623 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__Direction__Alternatives_in_ruleDirection659 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__TypeAssignment_4_0_in_rule__ParameterRule__Alternatives_4694 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_12_in_rule__ParameterRule__Alternatives_4713 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_13_in_rule__ModifierKind__Alternatives748 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_14_in_rule__ModifierKind__Alternatives769 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_15_in_rule__ModifierKind__Alternatives790 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_16_in_rule__ModifierKind__Alternatives811 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_17_in_rule__EffectKind__Alternatives847 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_18_in_rule__EffectKind__Alternatives868 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_19_in_rule__EffectKind__Alternatives889 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_20_in_rule__EffectKind__Alternatives910 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_21_in_rule__VisibilityKind__Alternatives946 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_22_in_rule__VisibilityKind__Alternatives967 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_23_in_rule__VisibilityKind__Alternatives988 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_24_in_rule__VisibilityKind__Alternatives1009 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_25_in_rule__Direction__Alternatives1045 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_26_in_rule__Direction__Alternatives1066 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_27_in_rule__Direction__Alternatives1087 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_28_in_rule__Direction__Alternatives1108 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__0__Impl_in_rule__ParameterRule__Group__01141 = new BitSet(new long[]{ 0x000000001E000000L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__1_in_rule__ParameterRule__Group__01144 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__VisibilityAssignment_0_in_rule__ParameterRule__Group__0__Impl1171 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__1__Impl_in_rule__ParameterRule__Group__11201 = new BitSet(new long[]{ 0x0000000000000010L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__2_in_rule__ParameterRule__Group__11204 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__DirectionAssignment_1_in_rule__ParameterRule__Group__1__Impl1231 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__2__Impl_in_rule__ParameterRule__Group__21261 = new BitSet(new long[]{ 0x0000000020000000L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__3_in_rule__ParameterRule__Group__21264 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__NameAssignment_2_in_rule__ParameterRule__Group__2__Impl1291 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__3__Impl_in_rule__ParameterRule__Group__31321 = new BitSet(new long[]{ 0x0000000000001010L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__4_in_rule__ParameterRule__Group__31324 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_29_in_rule__ParameterRule__Group__3__Impl1352 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__4__Impl_in_rule__ParameterRule__Group__41383 = new BitSet(new long[]{ 0x0000000840000000L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__5_in_rule__ParameterRule__Group__41386 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Alternatives_4_in_rule__ParameterRule__Group__4__Impl1413 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__5__Impl_in_rule__ParameterRule__Group__51443 = new BitSet(new long[]{ 0x0000000040000000L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__6_in_rule__ParameterRule__Group__51446 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__MultiplicityAssignment_5_in_rule__ParameterRule__Group__5__Impl1473 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__6__Impl_in_rule__ParameterRule__Group__61504 = new BitSet(new long[]{ 0x0000000040000000L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__7_in_rule__ParameterRule__Group__61507 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__ModifiersAssignment_6_in_rule__ParameterRule__Group__6__Impl1534 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__Group__7__Impl_in_rule__ParameterRule__Group__71565 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ParameterRule__EffectAssignment_7_in_rule__ParameterRule__Group__7__Impl1592 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__01638 = new BitSet(new long[]{ 0x000000000001E000L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__01641 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_30_in_rule__ModifiersRule__Group__0__Impl1669 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__11700 = new BitSet(new long[]{ 0x0000000180000000L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__11703 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl1730 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__21760 = new BitSet(new long[]{ 0x0000000080000000L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__21763 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl1790 = new BitSet(new long[]{ 0x0000000100000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__31821 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_31_in_rule__ModifiersRule__Group__3__Impl1849 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__01888 = new BitSet(new long[]{ 0x000000000001E000L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__01891 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_32_in_rule__ModifiersRule__Group_2__0__Impl1919 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__11950 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl1977 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__0__Impl_in_rule__EffectRule__Group__02011 = new BitSet(new long[]{ 0x0000000200000000L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__1_in_rule__EffectRule__Group__02014 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_30_in_rule__EffectRule__Group__0__Impl2042 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__1__Impl_in_rule__EffectRule__Group__12073 = new BitSet(new long[]{ 0x00000000001E0000L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__2_in_rule__EffectRule__Group__12076 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_33_in_rule__EffectRule__Group__1__Impl2104 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__2__Impl_in_rule__EffectRule__Group__22135 = new BitSet(new long[]{ 0x0000000080000000L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__3_in_rule__EffectRule__Group__22138 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__EffectKindAssignment_2_in_rule__EffectRule__Group__2__Impl2165 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__EffectRule__Group__3__Impl_in_rule__EffectRule__Group__32195 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_31_in_rule__EffectRule__Group__3__Impl2223 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__02262 = new BitSet(new long[]{ 0x0000000400000000L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__02265 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl2292 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__12322 = new BitSet(new long[]{ 0x0000000000000012L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__12325 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_34_in_rule__QualifiedName__Group__1__Impl2353 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__22384 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl2411 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__02448 = new BitSet(new long[]{ 0x0000000000000010L });
>-
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__02451 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl2478 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__12509 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl2536 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__02570 = new BitSet(new long[]{ 0x0000000000000020L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__02573 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_35_in_rule__MultiplicityRule__Group__0__Impl2601 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__12632 = new BitSet(new long[]{ 0x0000003000000000L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__12635 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl2662 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__22692 = new BitSet(new long[]{ 0x0000001000000000L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__22695 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2722 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32753 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_36_in_rule__MultiplicityRule__Group__3__Impl2781 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02820 = new BitSet(new long[]{ 0x0000000000000020L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02823 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_37_in_rule__MultiplicityRule__Group_2__0__Impl2851 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12882 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2909 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__ParameterRule__VisibilityAssignment_02948 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleDirection_in_rule__ParameterRule__DirectionAssignment_12979 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__ParameterRule__NameAssignment_23010 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleTypeRule_in_rule__ParameterRule__TypeAssignment_4_03041 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleMultiplicityRule_in_rule__ParameterRule__MultiplicityAssignment_53072 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifiersRule_in_rule__ParameterRule__ModifiersAssignment_63103 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleEffectRule_in_rule__ParameterRule__EffectAssignment_73134 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13165 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13196 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment3227 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleEffectKind_in_rule__EffectRule__EffectKindAssignment_23258 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_03293 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23328 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03359 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_13394 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13429 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13460 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment3491 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/internal/UmlParameterActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/internal/UmlParameterActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/ui/internal/UmlParameterActivator.java	(working copy)
>@@ -3,70 +3,80 @@
> */
> package org.eclipse.papyrus.parameter.editor.xtext.ui.internal;
> 
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
>+
> import org.apache.log4j.Logger;
> 
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
> 
> import java.util.Map;
> import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlParameterActivator extends AbstractUIPlugin {
> 
>-	private Map<String, Injector> injectors = new HashMap<String, Injector>();
>-
>+	private Map<String,Injector> injectors = new HashMap<String,Injector>();
> 	private static UmlParameterActivator INSTANCE;
> 
> 	public Injector getInjector(String languageName) {
> 		return injectors.get(languageName);
> 	}
>-
>+	
> 	@Override
> 	public void start(BundleContext context) throws Exception {
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-
>-			injectors.put("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter", Guice.createInjector(Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter")).with(getUiModule("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter"))).with(getSharedStateModule())));
>-
>+			registerInjectorFor("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter");
>+			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
> 			throw e;
> 		}
> 	}
>-
>+	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlParameterActivator getInstance() {
> 		return INSTANCE;
> 	}
>-
>+	
> 	protected Module getRuntimeModule(String grammar) {
>-
>-		if("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter".equals(grammar)) {
>-			return new org.eclipse.papyrus.parameter.editor.xtext.UmlParameterRuntimeModule();
>+		if ("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter".equals(grammar)) {
>+		 return new org.eclipse.papyrus.parameter.editor.xtext.UmlParameterRuntimeModule();
> 		}
>-
>+		
> 		throw new IllegalArgumentException(grammar);
> 	}
>-
>+	
> 	protected Module getUiModule(String grammar) {
>-
>-		if("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter".equals(grammar)) {
>-			return new org.eclipse.papyrus.parameter.editor.xtext.ui.UmlParameterUiModule(this);
>+		if ("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter".equals(grammar)) {
>+		 return new org.eclipse.papyrus.parameter.editor.xtext.ui.UmlParameterUiModule(this);
> 		}
>-
>+		
> 		throw new IllegalArgumentException(grammar);
> 	}
>-
>+	
> 	protected Module getSharedStateModule() {
> 		return new org.eclipse.xtext.ui.shared.SharedStateModule();
> 	}
>-
>+	
> }
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>Index: src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterTransformer.java	(working copy)
>@@ -1,24 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.parameter.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UmlParameterTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-
>-}
>Index: src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,31 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.parameter.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UmlParameterOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = {
>-	// provide list of classes to adapt to, e.g.:
>-	// Entity.class
>-	// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>Index: src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/parameter/editor/xtext/ui/outline/UmlParameterOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.parameter.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlParameterOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>#P org.eclipse.papyrus.message.editor.xtext.ui
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.tokens	(working copy)
>@@ -1,6 +1,11 @@
> RULE_NAMERULE=5
> RULE_ID=7
> RULE_STRING=4
>+T__16=16
>+T__15=15
>+T__12=12
>+T__14=14
>+T__13=13
> RULE_ANY_OTHER=11
> RULE_INT=6
> RULE_WS=10
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g	(working copy)
>@@ -769,7 +769,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessageLexer.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.message.editor.xtext.ui.contentassist.antlr.internal;
> 
> // Hack: Use our own Lexer superclass by means of import. 
>@@ -28,118 +15,136 @@
> public static final int RULE_NAMERULE=5;
> public static final int RULE_ID=7;
> public static final int RULE_STRING=4;
>+ public static final int T__16=16;
>+ public static final int T__15=15;
>+ 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_ANY_OTHER=11;
> public static final int RULE_INT=6;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
>- public static final int T15=15;
> public static final int RULE_WS=10;
>- public static final int Tokens=17;
>- public static final int T16=16;
> public static final int RULE_SL_COMMENT=9;
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=8;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlMessageLexer() {;} 
> public InternalUmlMessageLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlMessageLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g"; }
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:10:5: ( ':' )
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:10:7: ':'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:7: ( ':' )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:9: ':'
> {
> match(':'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:5: ( '.' )
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:11:7: '.'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:7: ( '.' )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:9: '.'
> {
> match('.'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:5: ( '*' )
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:12:7: '*'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:7: ( '*' )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:9: '*'
> {
> match('*'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:5: ( '[' )
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:13:7: '['
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:7: ( '[' )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:9: '['
> {
> match('['); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:5: ( ']' )
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:14:7: ']'
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:15:7: ( ']' )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:15:9: ']'
> {
> match(']'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start RULE_NAMERULE
>+ // $ANTLR start "RULE_NAMERULE"
> public final void mRULE_NAMERULE() throws RecognitionException {
> try {
> int _type = RULE_NAMERULE;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:766:15: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )* )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:766:17: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )*
> {
>@@ -148,10 +153,9 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:766:37: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' | '0' .. '9' )*
> loop1:
>@@ -173,10 +177,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -190,17 +193,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_NAMERULE
>+ // $ANTLR end "RULE_NAMERULE"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:768:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:768:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>@@ -227,10 +232,9 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:768:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop3:
>@@ -252,10 +256,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -269,17 +272,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:770:10: ( ( '0' .. '9' )+ )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:770:12: ( '0' .. '9' )+
> {
>@@ -316,21 +321,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt7=2;
> int LA7_0 = input.LA(1);
> 
>@@ -342,16 +349,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("772:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 7, 0, input);
>+ new NoViableAltException("", 7, 0, input);
> 
> throw nvae;
> }
> switch (alt7) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -360,41 +367,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -410,10 +415,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop6:
> do {
> int alt6=3;
>@@ -422,41 +427,39 @@
> if ( (LA6_0=='\\') ) {
> alt6=1;
> }
>- else if ( ((LA6_0>='\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFE')) ) {
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
> alt6=2;
> }
> 
> 
> switch (alt6) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:772:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -477,17 +480,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:774:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:774:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
>@@ -505,13 +510,13 @@
> if ( (LA8_1=='/') ) {
> alt8=2;
> }
>- else if ( ((LA8_1>='\u0000' && LA8_1<='.')||(LA8_1>='0' && LA8_1<='\uFFFE')) ) {
>+ else if ( ((LA8_1>='\u0000' && LA8_1<='.')||(LA8_1>='0' && LA8_1<='\uFFFF')) ) {
> alt8=1;
> }
> 
> 
> }
>- else if ( ((LA8_0>='\u0000' && LA8_0<=')')||(LA8_0>='+' && LA8_0<='\uFFFE')) ) {
>+ else if ( ((LA8_0>='\u0000' && LA8_0<=')')||(LA8_0>='+' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
>@@ -535,17 +540,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:776:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:776:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
>@@ -557,7 +564,7 @@
> int alt9=2;
> int LA9_0 = input.LA(1);
> 
>- if ( ((LA9_0>='\u0000' && LA9_0<='\t')||(LA9_0>='\u000B' && LA9_0<='\f')||(LA9_0>='\u000E' && LA9_0<='\uFFFE')) ) {
>+ if ( ((LA9_0>='\u0000' && LA9_0<='\t')||(LA9_0>='\u000B' && LA9_0<='\f')||(LA9_0>='\u000E' && LA9_0<='\uFFFF')) ) {
> alt9=1;
> }
> 
>@@ -566,15 +573,14 @@
> 	case 1 :
> 	 // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:776: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -624,17 +630,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:778:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:778:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>@@ -659,10 +667,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -680,17 +687,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:780:16: ( . )
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:780:18: .
> {
>@@ -698,104 +707,105 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:8: ( T12 | T13 | T14 | T15 | T16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt13=13;
> alt13 = dfa13.predict(input);
> switch (alt13) {
> case 1 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:10: T12
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:10: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:14: T13
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:16: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:18: T14
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:22: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:22: T15
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:28: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:26: T16
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:34: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:30: RULE_NAMERULE
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:40: RULE_NAMERULE
> {
> mRULE_NAMERULE(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:44: RULE_ID
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:54: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:52: RULE_INT
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:62: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:61: RULE_STRING
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:71: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:73: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:83: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:89: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:99: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:105: RULE_WS
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:115: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:113: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:1:123: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -815,16 +825,16 @@
> static final String DFA13_minS =
> "\1\0\5\uffff\1\60\1\101\2\uffff\2\0\1\52\7\uffff\1\60\7\uffff";
> static final String DFA13_maxS =
>- "\1\ufffe\5\uffff\2\172\2\uffff\2\ufffe\1\57\7\uffff\1\172\7\uffff";
>+ "\1\uffff\5\uffff\2\172\2\uffff\2\uffff\1\57\7\uffff\1\172\7\uffff";
> static final String DFA13_acceptS =
> "\1\uffff\1\1\1\2\1\3\1\4\1\5\2\uffff\1\7\1\10\3\uffff\1\14\1\15"+
> "\1\1\1\2\1\3\1\4\1\5\1\uffff\1\6\1\7\1\10\1\11\1\12\1\13\1\14";
> static final String DFA13_specialS =
>- "\34\uffff}>";
>+ "\1\0\11\uffff\1\2\1\1\20\uffff}>";
> static final String[] DFA13_transitionS = {
> "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\12\4\16\1\13\2\16\1"+
> "\3\3\16\1\2\1\14\12\11\1\1\6\16\32\6\1\4\1\16\1\5\1\7\1\10\1"+
>- "\16\32\6\uff84\16",
>+ "\16\32\6\uff85\16",
> "",
> "",
> "",
>@@ -834,8 +844,8 @@
> "\32\26\4\uffff\1\26\1\uffff\32\26",
> "",
> "",
>- "\uffff\30",
>- "\uffff\30",
>+ "\0\30",
>+ "\0\30",
> "\1\31\4\uffff\1\32",
> "",
> "",
>@@ -884,7 +894,71 @@
> this.transition = DFA13_transition;
> }
> public String getDescription() {
>- return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | RULE_NAMERULE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA13_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA13_0==':') ) {s = 1;}
>+
>+ else if ( (LA13_0=='.') ) {s = 2;}
>+
>+ else if ( (LA13_0=='*') ) {s = 3;}
>+
>+ else if ( (LA13_0=='[') ) {s = 4;}
>+
>+ else if ( (LA13_0==']') ) {s = 5;}
>+
>+ else if ( ((LA13_0>='A' && LA13_0<='Z')||(LA13_0>='a' && LA13_0<='z')) ) {s = 6;}
>+
>+ else if ( (LA13_0=='^') ) {s = 7;}
>+
>+ else if ( (LA13_0=='_') ) {s = 8;}
>+
>+ else if ( ((LA13_0>='0' && LA13_0<='9')) ) {s = 9;}
>+
>+ else if ( (LA13_0=='\"') ) {s = 10;}
>+
>+ else if ( (LA13_0=='\'') ) {s = 11;}
>+
>+ else if ( (LA13_0=='/') ) {s = 12;}
>+
>+ else if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {s = 13;}
>+
>+ else if ( ((LA13_0>='\u0000' && LA13_0<='\b')||(LA13_0>='\u000B' && LA13_0<='\f')||(LA13_0>='\u000E' && LA13_0<='\u001F')||LA13_0=='!'||(LA13_0>='#' && LA13_0<='&')||(LA13_0>='(' && LA13_0<=')')||(LA13_0>='+' && LA13_0<='-')||(LA13_0>=';' && LA13_0<='@')||LA13_0=='\\'||LA13_0=='`'||(LA13_0>='{' && LA13_0<='\uFFFF')) ) {s = 14;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA13_11 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA13_11>='\u0000' && LA13_11<='\uFFFF')) ) {s = 24;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA13_10 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA13_10>='\u0000' && LA13_10<='\uFFFF')) ) {s = 24;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 13, _s, input);
>+ error(nvae);
>+ throw nvae;
> }
> }
> 
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessageParser.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.message.editor.xtext.ui.contentassist.antlr.internal; 
> 
> import java.io.InputStream;
>@@ -41,6 +28,11 @@
> public static final int RULE_NAMERULE=5;
> public static final int RULE_ID=7;
> public static final int RULE_STRING=4;
>+ public static final int T__16=16;
>+ public static final int T__15=15;
>+ 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_ANY_OTHER=11;
> public static final int RULE_INT=6;
> public static final int RULE_WS=10;
>@@ -48,12 +40,20 @@
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=8;
> 
>+ // delegates
>+ // delegators
>+
>+
> public InternalUmlMessageParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlMessageParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlMessageParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g"; }
> 
> 
>@@ -77,7 +77,7 @@
> 
> 
> 
>- // $ANTLR start entryRuleMessageRule
>+ // $ANTLR start "entryRuleMessageRule"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:61:1: entryRuleMessageRule : ruleMessageRule EOF ;
> public final void entryRuleMessageRule() throws RecognitionException {
> try {
>@@ -87,7 +87,8 @@
> before(grammarAccess.getMessageRuleRule()); 
> pushFollow(FOLLOW_ruleMessageRule_in_entryRuleMessageRule61);
> ruleMessageRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getMessageRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleMessageRule68); 
>@@ -103,10 +104,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleMessageRule
>+ // $ANTLR end "entryRuleMessageRule"
> 
> 
>- // $ANTLR start ruleMessageRule
>+ // $ANTLR start "ruleMessageRule"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:70:1: ruleMessageRule : ( ( rule__MessageRule__Group__0 ) ) ;
> public final void ruleMessageRule() throws RecognitionException {
> 
>@@ -125,8 +126,9 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group__0_in_ruleMessageRule94);
> rule__MessageRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -149,10 +151,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleMessageRule
>+ // $ANTLR end "ruleMessageRule"
> 
> 
>- // $ANTLR start entryRuleSequenceTermRule
>+ // $ANTLR start "entryRuleSequenceTermRule"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:89:1: entryRuleSequenceTermRule : ruleSequenceTermRule EOF ;
> public final void entryRuleSequenceTermRule() throws RecognitionException {
> try {
>@@ -162,7 +164,8 @@
> before(grammarAccess.getSequenceTermRuleRule()); 
> pushFollow(FOLLOW_ruleSequenceTermRule_in_entryRuleSequenceTermRule121);
> ruleSequenceTermRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getSequenceTermRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleSequenceTermRule128); 
>@@ -178,10 +181,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleSequenceTermRule
>+ // $ANTLR end "entryRuleSequenceTermRule"
> 
> 
>- // $ANTLR start ruleSequenceTermRule
>+ // $ANTLR start "ruleSequenceTermRule"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:98:1: ruleSequenceTermRule : ( ( rule__SequenceTermRule__Group__0 ) ) ;
> public final void ruleSequenceTermRule() throws RecognitionException {
> 
>@@ -200,8 +203,9 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__Group__0_in_ruleSequenceTermRule154);
> rule__SequenceTermRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -224,10 +228,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleSequenceTermRule
>+ // $ANTLR end "ruleSequenceTermRule"
> 
> 
>- // $ANTLR start entryRuleRecurrenceRule
>+ // $ANTLR start "entryRuleRecurrenceRule"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:117:1: entryRuleRecurrenceRule : ruleRecurrenceRule EOF ;
> public final void entryRuleRecurrenceRule() throws RecognitionException {
> try {
>@@ -237,7 +241,8 @@
> before(grammarAccess.getRecurrenceRuleRule()); 
> pushFollow(FOLLOW_ruleRecurrenceRule_in_entryRuleRecurrenceRule181);
> ruleRecurrenceRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getRecurrenceRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleRecurrenceRule188); 
>@@ -253,10 +258,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleRecurrenceRule
>+ // $ANTLR end "entryRuleRecurrenceRule"
> 
> 
>- // $ANTLR start ruleRecurrenceRule
>+ // $ANTLR start "ruleRecurrenceRule"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:126:1: ruleRecurrenceRule : ( ( rule__RecurrenceRule__Alternatives ) ) ;
> public final void ruleRecurrenceRule() throws RecognitionException {
> 
>@@ -275,8 +280,9 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Alternatives_in_ruleRecurrenceRule214);
> rule__RecurrenceRule__Alternatives();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -299,10 +305,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleRecurrenceRule
>+ // $ANTLR end "ruleRecurrenceRule"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Alternatives
>+ // $ANTLR start "rule__RecurrenceRule__Alternatives"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:145:1: rule__RecurrenceRule__Alternatives : ( ( ( rule__RecurrenceRule__Group_0__0 ) ) | ( ( rule__RecurrenceRule__Group_1__0 ) ) );
> public final void rule__RecurrenceRule__Alternatives() throws RecognitionException {
> 
>@@ -321,7 +327,7 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("145:1: rule__RecurrenceRule__Alternatives : ( ( ( rule__RecurrenceRule__Group_0__0 ) ) | ( ( rule__RecurrenceRule__Group_1__0 ) ) );", 1, 0, input);
>+ new NoViableAltException("", 1, 0, input);
> 
> throw nvae;
> }
>@@ -338,7 +344,8 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__0_in_rule__RecurrenceRule__Alternatives250);
> rule__RecurrenceRule__Group_0__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -362,7 +369,8 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__0_in_rule__RecurrenceRule__Alternatives268);
> rule__RecurrenceRule__Group_1__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -388,10 +396,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Alternatives
>+ // $ANTLR end "rule__RecurrenceRule__Alternatives"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__0
>+ // $ANTLR start "rule__MessageRule__Group__0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:169:1: rule__MessageRule__Group__0 : rule__MessageRule__Group__0__Impl rule__MessageRule__Group__1 ;
> public final void rule__MessageRule__Group__0() throws RecognitionException {
> 
>@@ -403,12 +411,14 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group__0__Impl_in_rule__MessageRule__Group__0299);
> rule__MessageRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MessageRule__Group__1_in_rule__MessageRule__Group__0302);
> rule__MessageRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -424,10 +434,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__0
>+ // $ANTLR end "rule__MessageRule__Group__0"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__0__Impl
>+ // $ANTLR start "rule__MessageRule__Group__0__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:181:1: rule__MessageRule__Group__0__Impl : ( ( rule__MessageRule__SequenceTermAssignment_0 ) ) ;
> public final void rule__MessageRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -446,8 +456,9 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__SequenceTermAssignment_0_in_rule__MessageRule__Group__0__Impl329);
> rule__MessageRule__SequenceTermAssignment_0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -470,10 +481,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__0__Impl
>+ // $ANTLR end "rule__MessageRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__1
>+ // $ANTLR start "rule__MessageRule__Group__1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:198:1: rule__MessageRule__Group__1 : rule__MessageRule__Group__1__Impl rule__MessageRule__Group__2 ;
> public final void rule__MessageRule__Group__1() throws RecognitionException {
> 
>@@ -485,11 +496,13 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359);
> rule__MessageRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MessageRule__Group__2_in_rule__MessageRule__Group__1362);
> rule__MessageRule__Group__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -506,10 +519,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__1
>+ // $ANTLR end "rule__MessageRule__Group__1"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__1__Impl
>+ // $ANTLR start "rule__MessageRule__Group__1__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:210:1: rule__MessageRule__Group__1__Impl : ( ( rule__MessageRule__Group_1__0 )* ) ;
> public final void rule__MessageRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -540,7 +553,8 @@
> 	 {
> 	 pushFollow(FOLLOW_rule__MessageRule__Group_1__0_in_rule__MessageRule__Group__1__Impl389);
> 	 rule__MessageRule__Group_1__0();
>- 	 _fsp--;
>+
>+ 	 state._fsp--;
> 
> 
> 	 }
>@@ -570,10 +584,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__1__Impl
>+ // $ANTLR end "rule__MessageRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__2
>+ // $ANTLR start "rule__MessageRule__Group__2"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:227:1: rule__MessageRule__Group__2 : rule__MessageRule__Group__2__Impl rule__MessageRule__Group__3 ;
> public final void rule__MessageRule__Group__2() throws RecognitionException {
> 
>@@ -585,11 +599,13 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group__2__Impl_in_rule__MessageRule__Group__2420);
> rule__MessageRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MessageRule__Group__3_in_rule__MessageRule__Group__2423);
> rule__MessageRule__Group__3();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -606,10 +622,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__2
>+ // $ANTLR end "rule__MessageRule__Group__2"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__2__Impl
>+ // $ANTLR start "rule__MessageRule__Group__2__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:239:1: rule__MessageRule__Group__2__Impl : ( ':' ) ;
> public final void rule__MessageRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -643,10 +659,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__2__Impl
>+ // $ANTLR end "rule__MessageRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__3
>+ // $ANTLR start "rule__MessageRule__Group__3"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:258:1: rule__MessageRule__Group__3 : rule__MessageRule__Group__3__Impl ;
> public final void rule__MessageRule__Group__3() throws RecognitionException {
> 
>@@ -658,7 +674,8 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group__3__Impl_in_rule__MessageRule__Group__3482);
> rule__MessageRule__Group__3__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -675,10 +692,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__3
>+ // $ANTLR end "rule__MessageRule__Group__3"
> 
> 
>- // $ANTLR start rule__MessageRule__Group__3__Impl
>+ // $ANTLR start "rule__MessageRule__Group__3__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:269:1: rule__MessageRule__Group__3__Impl : ( ( rule__MessageRule__NameAssignment_3 ) ) ;
> public final void rule__MessageRule__Group__3__Impl() throws RecognitionException {
> 
>@@ -697,8 +714,9 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__NameAssignment_3_in_rule__MessageRule__Group__3__Impl509);
> rule__MessageRule__NameAssignment_3();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -721,10 +739,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group__3__Impl
>+ // $ANTLR end "rule__MessageRule__Group__3__Impl"
> 
> 
>- // $ANTLR start rule__MessageRule__Group_1__0
>+ // $ANTLR start "rule__MessageRule__Group_1__0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:294:1: rule__MessageRule__Group_1__0 : rule__MessageRule__Group_1__0__Impl rule__MessageRule__Group_1__1 ;
> public final void rule__MessageRule__Group_1__0() throws RecognitionException {
> 
>@@ -736,11 +754,13 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group_1__0__Impl_in_rule__MessageRule__Group_1__0547);
> rule__MessageRule__Group_1__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MessageRule__Group_1__1_in_rule__MessageRule__Group_1__0550);
> rule__MessageRule__Group_1__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -757,10 +777,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group_1__0
>+ // $ANTLR end "rule__MessageRule__Group_1__0"
> 
> 
>- // $ANTLR start rule__MessageRule__Group_1__0__Impl
>+ // $ANTLR start "rule__MessageRule__Group_1__0__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:306:1: rule__MessageRule__Group_1__0__Impl : ( '.' ) ;
> public final void rule__MessageRule__Group_1__0__Impl() throws RecognitionException {
> 
>@@ -794,10 +814,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group_1__0__Impl
>+ // $ANTLR end "rule__MessageRule__Group_1__0__Impl"
> 
> 
>- // $ANTLR start rule__MessageRule__Group_1__1
>+ // $ANTLR start "rule__MessageRule__Group_1__1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:325:1: rule__MessageRule__Group_1__1 : rule__MessageRule__Group_1__1__Impl ;
> public final void rule__MessageRule__Group_1__1() throws RecognitionException {
> 
>@@ -809,8 +829,9 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__Group_1__1__Impl_in_rule__MessageRule__Group_1__1609);
> rule__MessageRule__Group_1__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -826,10 +847,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group_1__1
>+ // $ANTLR end "rule__MessageRule__Group_1__1"
> 
> 
>- // $ANTLR start rule__MessageRule__Group_1__1__Impl
>+ // $ANTLR start "rule__MessageRule__Group_1__1__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:336:1: rule__MessageRule__Group_1__1__Impl : ( ( rule__MessageRule__SequenceTermAssignment_1_1 ) ) ;
> public final void rule__MessageRule__Group_1__1__Impl() throws RecognitionException {
> 
>@@ -848,8 +869,9 @@
> {
> pushFollow(FOLLOW_rule__MessageRule__SequenceTermAssignment_1_1_in_rule__MessageRule__Group_1__1__Impl636);
> rule__MessageRule__SequenceTermAssignment_1_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -872,10 +894,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__Group_1__1__Impl
>+ // $ANTLR end "rule__MessageRule__Group_1__1__Impl"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__Group__0
>+ // $ANTLR start "rule__SequenceTermRule__Group__0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:357:1: rule__SequenceTermRule__Group__0 : rule__SequenceTermRule__Group__0__Impl rule__SequenceTermRule__Group__1 ;
> public final void rule__SequenceTermRule__Group__0() throws RecognitionException {
> 
>@@ -887,12 +909,14 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670);
> rule__SequenceTermRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__SequenceTermRule__Group__1_in_rule__SequenceTermRule__Group__0673);
> rule__SequenceTermRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -908,10 +932,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__Group__0
>+ // $ANTLR end "rule__SequenceTermRule__Group__0"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__Group__0__Impl
>+ // $ANTLR start "rule__SequenceTermRule__Group__0__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:369:1: rule__SequenceTermRule__Group__0__Impl : ( ( rule__SequenceTermRule__SequencialOrderAssignment_0 ) ) ;
> public final void rule__SequenceTermRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -930,7 +954,8 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__SequencialOrderAssignment_0_in_rule__SequenceTermRule__Group__0__Impl700);
> rule__SequenceTermRule__SequencialOrderAssignment_0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -954,10 +979,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__Group__0__Impl
>+ // $ANTLR end "rule__SequenceTermRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__Group__1
>+ // $ANTLR start "rule__SequenceTermRule__Group__1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:386:1: rule__SequenceTermRule__Group__1 : rule__SequenceTermRule__Group__1__Impl rule__SequenceTermRule__Group__2 ;
> public final void rule__SequenceTermRule__Group__1() throws RecognitionException {
> 
>@@ -969,12 +994,14 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730);
> rule__SequenceTermRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__SequenceTermRule__Group__2_in_rule__SequenceTermRule__Group__1733);
> rule__SequenceTermRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -990,10 +1017,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__Group__1
>+ // $ANTLR end "rule__SequenceTermRule__Group__1"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__Group__1__Impl
>+ // $ANTLR start "rule__SequenceTermRule__Group__1__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:398:1: rule__SequenceTermRule__Group__1__Impl : ( ( rule__SequenceTermRule__SequenceNameAssignment_1 )? ) ;
> public final void rule__SequenceTermRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1020,7 +1047,8 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__SequenceNameAssignment_1_in_rule__SequenceTermRule__Group__1__Impl760);
> rule__SequenceTermRule__SequenceNameAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1047,10 +1075,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__Group__1__Impl
>+ // $ANTLR end "rule__SequenceTermRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__Group__2
>+ // $ANTLR start "rule__SequenceTermRule__Group__2"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:415:1: rule__SequenceTermRule__Group__2 : rule__SequenceTermRule__Group__2__Impl ;
> public final void rule__SequenceTermRule__Group__2() throws RecognitionException {
> 
>@@ -1062,7 +1090,8 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__Group__2__Impl_in_rule__SequenceTermRule__Group__2791);
> rule__SequenceTermRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1079,10 +1108,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__Group__2
>+ // $ANTLR end "rule__SequenceTermRule__Group__2"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__Group__2__Impl
>+ // $ANTLR start "rule__SequenceTermRule__Group__2__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:426:1: rule__SequenceTermRule__Group__2__Impl : ( ( rule__SequenceTermRule__RecurrenceAssignment_2 )? ) ;
> public final void rule__SequenceTermRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -1109,8 +1138,9 @@
> {
> pushFollow(FOLLOW_rule__SequenceTermRule__RecurrenceAssignment_2_in_rule__SequenceTermRule__Group__2__Impl818);
> rule__SequenceTermRule__RecurrenceAssignment_2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -1136,10 +1166,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__Group__2__Impl
>+ // $ANTLR end "rule__SequenceTermRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__0
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:449:1: rule__RecurrenceRule__Group_0__0 : rule__RecurrenceRule__Group_0__0__Impl rule__RecurrenceRule__Group_0__1 ;
> public final void rule__RecurrenceRule__Group_0__0() throws RecognitionException {
> 
>@@ -1151,11 +1181,13 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__0__Impl_in_rule__RecurrenceRule__Group_0__0855);
> rule__RecurrenceRule__Group_0__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__1_in_rule__RecurrenceRule__Group_0__0858);
> rule__RecurrenceRule__Group_0__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1172,10 +1204,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__0
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__0"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__0__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__0__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:461:1: rule__RecurrenceRule__Group_0__0__Impl : ( '*' ) ;
> public final void rule__RecurrenceRule__Group_0__0__Impl() throws RecognitionException {
> 
>@@ -1209,10 +1241,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__0__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__0__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__1
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:480:1: rule__RecurrenceRule__Group_0__1 : rule__RecurrenceRule__Group_0__1__Impl rule__RecurrenceRule__Group_0__2 ;
> public final void rule__RecurrenceRule__Group_0__1() throws RecognitionException {
> 
>@@ -1224,11 +1256,13 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__1__Impl_in_rule__RecurrenceRule__Group_0__1917);
> rule__RecurrenceRule__Group_0__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__2_in_rule__RecurrenceRule__Group_0__1920);
> rule__RecurrenceRule__Group_0__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1245,10 +1279,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__1
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__1"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__1__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__1__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:492:1: rule__RecurrenceRule__Group_0__1__Impl : ( '[' ) ;
> public final void rule__RecurrenceRule__Group_0__1__Impl() throws RecognitionException {
> 
>@@ -1282,10 +1316,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__1__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__1__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__2
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__2"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:511:1: rule__RecurrenceRule__Group_0__2 : rule__RecurrenceRule__Group_0__2__Impl rule__RecurrenceRule__Group_0__3 ;
> public final void rule__RecurrenceRule__Group_0__2() throws RecognitionException {
> 
>@@ -1297,12 +1331,14 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__2__Impl_in_rule__RecurrenceRule__Group_0__2979);
> rule__RecurrenceRule__Group_0__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__3_in_rule__RecurrenceRule__Group_0__2982);
> rule__RecurrenceRule__Group_0__3();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1318,10 +1354,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__2
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__2"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__2__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__2__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:523:1: rule__RecurrenceRule__Group_0__2__Impl : ( RULE_STRING ) ;
> public final void rule__RecurrenceRule__Group_0__2__Impl() throws RecognitionException {
> 
>@@ -1355,10 +1391,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__2__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__2__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__3
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__3"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:540:1: rule__RecurrenceRule__Group_0__3 : rule__RecurrenceRule__Group_0__3__Impl ;
> public final void rule__RecurrenceRule__Group_0__3() throws RecognitionException {
> 
>@@ -1370,7 +1406,8 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_0__3__Impl_in_rule__RecurrenceRule__Group_0__31038);
> rule__RecurrenceRule__Group_0__3__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1387,10 +1424,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__3
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__3"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_0__3__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_0__3__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:551:1: rule__RecurrenceRule__Group_0__3__Impl : ( ']' ) ;
> public final void rule__RecurrenceRule__Group_0__3__Impl() throws RecognitionException {
> 
>@@ -1424,10 +1461,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_0__3__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_0__3__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_1__0
>+ // $ANTLR start "rule__RecurrenceRule__Group_1__0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:578:1: rule__RecurrenceRule__Group_1__0 : rule__RecurrenceRule__Group_1__0__Impl rule__RecurrenceRule__Group_1__1 ;
> public final void rule__RecurrenceRule__Group_1__0() throws RecognitionException {
> 
>@@ -1439,12 +1476,14 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__0__Impl_in_rule__RecurrenceRule__Group_1__01105);
> rule__RecurrenceRule__Group_1__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__1_in_rule__RecurrenceRule__Group_1__01108);
> rule__RecurrenceRule__Group_1__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1460,10 +1499,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_1__0
>+ // $ANTLR end "rule__RecurrenceRule__Group_1__0"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_1__0__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_1__0__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:590:1: rule__RecurrenceRule__Group_1__0__Impl : ( '[' ) ;
> public final void rule__RecurrenceRule__Group_1__0__Impl() throws RecognitionException {
> 
>@@ -1497,10 +1536,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_1__0__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_1__0__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_1__1
>+ // $ANTLR start "rule__RecurrenceRule__Group_1__1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:609:1: rule__RecurrenceRule__Group_1__1 : rule__RecurrenceRule__Group_1__1__Impl rule__RecurrenceRule__Group_1__2 ;
> public final void rule__RecurrenceRule__Group_1__1() throws RecognitionException {
> 
>@@ -1512,11 +1551,13 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__1__Impl_in_rule__RecurrenceRule__Group_1__11167);
> rule__RecurrenceRule__Group_1__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__2_in_rule__RecurrenceRule__Group_1__11170);
> rule__RecurrenceRule__Group_1__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1533,10 +1574,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_1__1
>+ // $ANTLR end "rule__RecurrenceRule__Group_1__1"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_1__1__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_1__1__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:621:1: rule__RecurrenceRule__Group_1__1__Impl : ( RULE_STRING ) ;
> public final void rule__RecurrenceRule__Group_1__1__Impl() throws RecognitionException {
> 
>@@ -1570,10 +1611,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_1__1__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_1__1__Impl"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_1__2
>+ // $ANTLR start "rule__RecurrenceRule__Group_1__2"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:638:1: rule__RecurrenceRule__Group_1__2 : rule__RecurrenceRule__Group_1__2__Impl ;
> public final void rule__RecurrenceRule__Group_1__2() throws RecognitionException {
> 
>@@ -1585,8 +1626,9 @@
> {
> pushFollow(FOLLOW_rule__RecurrenceRule__Group_1__2__Impl_in_rule__RecurrenceRule__Group_1__21226);
> rule__RecurrenceRule__Group_1__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1602,10 +1644,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_1__2
>+ // $ANTLR end "rule__RecurrenceRule__Group_1__2"
> 
> 
>- // $ANTLR start rule__RecurrenceRule__Group_1__2__Impl
>+ // $ANTLR start "rule__RecurrenceRule__Group_1__2__Impl"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:649:1: rule__RecurrenceRule__Group_1__2__Impl : ( ']' ) ;
> public final void rule__RecurrenceRule__Group_1__2__Impl() throws RecognitionException {
> 
>@@ -1639,10 +1681,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RecurrenceRule__Group_1__2__Impl
>+ // $ANTLR end "rule__RecurrenceRule__Group_1__2__Impl"
> 
> 
>- // $ANTLR start rule__MessageRule__SequenceTermAssignment_0
>+ // $ANTLR start "rule__MessageRule__SequenceTermAssignment_0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:675:1: rule__MessageRule__SequenceTermAssignment_0 : ( ruleSequenceTermRule ) ;
> public final void rule__MessageRule__SequenceTermAssignment_0() throws RecognitionException {
> 
>@@ -1658,7 +1700,8 @@
> before(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0()); 
> pushFollow(FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_01296);
> ruleSequenceTermRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_0_0()); 
> 
>@@ -1679,10 +1722,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__SequenceTermAssignment_0
>+ // $ANTLR end "rule__MessageRule__SequenceTermAssignment_0"
> 
> 
>- // $ANTLR start rule__MessageRule__SequenceTermAssignment_1_1
>+ // $ANTLR start "rule__MessageRule__SequenceTermAssignment_1_1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:690:1: rule__MessageRule__SequenceTermAssignment_1_1 : ( ruleSequenceTermRule ) ;
> public final void rule__MessageRule__SequenceTermAssignment_1_1() throws RecognitionException {
> 
>@@ -1698,7 +1741,8 @@
> before(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0()); 
> pushFollow(FOLLOW_ruleSequenceTermRule_in_rule__MessageRule__SequenceTermAssignment_1_11327);
> ruleSequenceTermRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getMessageRuleAccess().getSequenceTermSequenceTermRuleParserRuleCall_1_1_0()); 
> 
>@@ -1719,10 +1763,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__SequenceTermAssignment_1_1
>+ // $ANTLR end "rule__MessageRule__SequenceTermAssignment_1_1"
> 
> 
>- // $ANTLR start rule__MessageRule__NameAssignment_3
>+ // $ANTLR start "rule__MessageRule__NameAssignment_3"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:705:1: rule__MessageRule__NameAssignment_3 : ( RULE_NAMERULE ) ;
> public final void rule__MessageRule__NameAssignment_3() throws RecognitionException {
> 
>@@ -1756,10 +1800,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MessageRule__NameAssignment_3
>+ // $ANTLR end "rule__MessageRule__NameAssignment_3"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__SequencialOrderAssignment_0
>+ // $ANTLR start "rule__SequenceTermRule__SequencialOrderAssignment_0"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:720:1: rule__SequenceTermRule__SequencialOrderAssignment_0 : ( RULE_INT ) ;
> public final void rule__SequenceTermRule__SequencialOrderAssignment_0() throws RecognitionException {
> 
>@@ -1793,10 +1837,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__SequencialOrderAssignment_0
>+ // $ANTLR end "rule__SequenceTermRule__SequencialOrderAssignment_0"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__SequenceNameAssignment_1
>+ // $ANTLR start "rule__SequenceTermRule__SequenceNameAssignment_1"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:735:1: rule__SequenceTermRule__SequenceNameAssignment_1 : ( RULE_ID ) ;
> public final void rule__SequenceTermRule__SequenceNameAssignment_1() throws RecognitionException {
> 
>@@ -1830,10 +1874,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__SequenceNameAssignment_1
>+ // $ANTLR end "rule__SequenceTermRule__SequenceNameAssignment_1"
> 
> 
>- // $ANTLR start rule__SequenceTermRule__RecurrenceAssignment_2
>+ // $ANTLR start "rule__SequenceTermRule__RecurrenceAssignment_2"
> // ../org.eclipse.papyrus.message.editor.xtext.ui/src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/internal/InternalUmlMessage.g:750:1: rule__SequenceTermRule__RecurrenceAssignment_2 : ( ruleRecurrenceRule ) ;
> public final void rule__SequenceTermRule__RecurrenceAssignment_2() throws RecognitionException {
> 
>@@ -1849,7 +1893,8 @@
> before(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0()); 
> pushFollow(FOLLOW_ruleRecurrenceRule_in_rule__SequenceTermRule__RecurrenceAssignment_21451);
> ruleRecurrenceRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getSequenceTermRuleAccess().getRecurrenceRecurrenceRuleParserRuleCall_2_0()); 
> 
>@@ -1870,8 +1915,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SequenceTermRule__RecurrenceAssignment_2
>+ // $ANTLR end "rule__SequenceTermRule__RecurrenceAssignment_2"
> 
>+ // Delegated rules
>+
> 
> 
> 
>@@ -1889,7 +1936,7 @@
> public static final BitSet FOLLOW_rule__MessageRule__Group__0__Impl_in_rule__MessageRule__Group__0299 = new BitSet(new long[]{0x0000000000003000L});
> public static final BitSet FOLLOW_rule__MessageRule__Group__1_in_rule__MessageRule__Group__0302 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MessageRule__SequenceTermAssignment_0_in_rule__MessageRule__Group__0__Impl329 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359 = new BitSet(new long[]{0x0000000000001000L});
>+ public static final BitSet FOLLOW_rule__MessageRule__Group__1__Impl_in_rule__MessageRule__Group__1359 = new BitSet(new long[]{0x0000000000003000L});
> public static final BitSet FOLLOW_rule__MessageRule__Group__2_in_rule__MessageRule__Group__1362 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MessageRule__Group_1__0_in_rule__MessageRule__Group__1__Impl389 = new BitSet(new long[]{0x0000000000002002L});
> public static final BitSet FOLLOW_rule__MessageRule__Group__2__Impl_in_rule__MessageRule__Group__2420 = new BitSet(new long[]{0x0000000000000020L});
>@@ -1902,10 +1949,10 @@
> public static final BitSet FOLLOW_13_in_rule__MessageRule__Group_1__0__Impl578 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MessageRule__Group_1__1__Impl_in_rule__MessageRule__Group_1__1609 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MessageRule__SequenceTermAssignment_1_1_in_rule__MessageRule__Group_1__1__Impl636 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670 = new BitSet(new long[]{0x000000000000C082L});
>+ public static final BitSet FOLLOW_rule__SequenceTermRule__Group__0__Impl_in_rule__SequenceTermRule__Group__0670 = new BitSet(new long[]{0x000000000000C080L});
> public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1_in_rule__SequenceTermRule__Group__0673 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__SequenceTermRule__SequencialOrderAssignment_0_in_rule__SequenceTermRule__Group__0__Impl700 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730 = new BitSet(new long[]{0x000000000000C002L});
>+ public static final BitSet FOLLOW_rule__SequenceTermRule__Group__1__Impl_in_rule__SequenceTermRule__Group__1730 = new BitSet(new long[]{0x000000000000C080L});
> public static final BitSet FOLLOW_rule__SequenceTermRule__Group__2_in_rule__SequenceTermRule__Group__1733 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__SequenceTermRule__SequenceNameAssignment_1_in_rule__SequenceTermRule__Group__1__Impl760 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__SequenceTermRule__Group__2__Impl_in_rule__SequenceTermRule__Group__2791 = new BitSet(new long[]{0x0000000000000002L});
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/UmlMessageParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/UmlMessageParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/antlr/UmlMessageParser.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.message.editor.xtext.ui.contentassist.antlr;
> 
> import java.util.Collection;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/contentassist/AbstractUmlMessageProposalProvider.java	(working copy)
>@@ -1,16 +1,6 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.message.editor.xtext.ui.contentassist;
> 
> import org.eclipse.emf.ecore.EObject;
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/internal/UmlMessageActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/internal/UmlMessageActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/internal/UmlMessageActivator.java	(working copy)
>@@ -1,34 +1,25 @@
>-
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+ * generated by Xtext
>+ */
> package org.eclipse.papyrus.message.editor.xtext.ui.internal;
> 
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
>+
> import org.apache.log4j.Logger;
> 
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
> 
> import java.util.Map;
> import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlMessageActivator extends AbstractUIPlugin {
> 
>@@ -44,10 +35,7 @@
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-			
>-			injectors.put("org.eclipse.papyrus.message.editor.xtext.UmlMessage", Guice.createInjector(
>-				Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.message.editor.xtext.UmlMessage")).with(getUiModule("org.eclipse.papyrus.message.editor.xtext.UmlMessage"))).with(getSharedStateModule())
>-			));
>+			registerInjectorFor("org.eclipse.papyrus.message.editor.xtext.UmlMessage");
> 			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
>@@ -55,20 +43,31 @@
> 		}
> 	}
> 	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlMessageActivator getInstance() {
> 		return INSTANCE;
> 	}
> 	
> 	protected Module getRuntimeModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.message.editor.xtext.UmlMessage".equals(grammar)) {
> 		 return new org.eclipse.papyrus.message.editor.xtext.UmlMessageRuntimeModule();
> 		}
> 		
> 		throw new IllegalArgumentException(grammar);
> 	}
>+	
> 	protected Module getUiModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.message.editor.xtext.UmlMessage".equals(grammar)) {
> 		 return new org.eclipse.papyrus.message.editor.xtext.ui.UmlMessageUiModule(this);
> 		}
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/UmlMessageExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/UmlMessageExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/UmlMessageExecutableExtensionFactory.java	(working copy)
>@@ -1,18 +1,6 @@
>-
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>- 
>+/*
>+ * generated by Xtext
>+ */
> package org.eclipse.papyrus.message.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -21,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- *@generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlMessageExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>Index: src-gen/org/eclipse/papyrus/message/editor/xtext/ui/AbstractUmlMessageUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/message/editor/xtext/ui/AbstractUmlMessageUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/message/editor/xtext/ui/AbstractUmlMessageUiModule.java	(working copy)
>@@ -1,17 +1,7 @@
> 
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>+/*
>+ * generated by Xtext
>+ */
> package org.eclipse.papyrus.message.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.DefaultUiModule;
>@@ -34,21 +24,11 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.XtextDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.message.editor.xtext.parser.antlr.internal.InternalUmlMessageLexer.class);
> 	}
>@@ -58,6 +38,11 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
> 	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
> 		return org.eclipse.papyrus.message.editor.xtext.ui.labeling.UmlMessageLabelProvider.class;
>@@ -68,14 +53,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.message.editor.xtext.ui.labeling.UmlMessageDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.message.editor.xtext.ui.outline.UmlMessageTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.message.editor.xtext.ui.outline.UmlMessageOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.message.editor.xtext.ui.outline.UmlMessageOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.message.editor.xtext.ui.outline.UmlMessageOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -17,7 +17,11 @@
> org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.8.0",
> org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
> org.eclipse.uml2.uml;bundle-version="3.1.0",
>- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0"
>+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
>+ org.eclipse.core.expressions;bundle-version="3.4.200",
>+ org.eclipse.papyrus.core;bundle-version="0.8.0",
>+ org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j,
> org.eclipse.gmf.runtime.diagram.ui.editparts,
> org.eclipse.gmf.runtime.emf.commands.core.command,
>Index: src/org/eclipse/papyrus/message/editor/xtext/ui/contributions/MessagePopupEditor.java
>===================================================================
>--- src/org/eclipse/papyrus/message/editor/xtext/ui/contributions/MessagePopupEditor.java	(revision 4043)
>+++ src/org/eclipse/papyrus/message/editor/xtext/ui/contributions/MessagePopupEditor.java	(working copy)
>@@ -22,6 +22,7 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.validation.internal.util.Log;
> import org.eclipse.gmf.runtime.common.core.command.CommandResult;
> import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
> import org.eclipse.papyrus.core.utils.EditorUtils;
>@@ -29,7 +30,6 @@
> import org.eclipse.papyrus.log.LogHelper;
> import org.eclipse.papyrus.message.editor.xtext.ui.internal.UmlMessageActivator;
> import org.eclipse.papyrus.message.editor.xtext.umlMessage.MessageRule;
>-import org.eclipse.papyrus.properties.runtime.Activator;
> import org.eclipse.uml2.uml.Interaction;
> import org.eclipse.uml2.uml.Message;
> import org.eclipse.xtext.gmf.glue.PopupEditorConfiguration;
>@@ -173,7 +173,8 @@
> 				try {
> 					OperationHistoryFactory.getOperationHistory().execute(updateCommand, new NullProgressMonitor(), null);
> 				} catch (ExecutionException e) {
>-					((LogHelper)Activator.log).error(e);
>+					//org.eclipse.papyrus.properties.runtime.Activator.log.error(e) ;
>+					//((LogHelper)Activator.log).error(e);
> 				}
> 
> 			}
>Index: src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.message.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlMessageOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>Index: src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,43 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.message.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-// TODO: Auto-generated Javadoc
>-/**
>- * A factory for creating UmlMessageOutlineNodeAdapter objects.
>- */
>-public class UmlMessageOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	/** The Constant types. */
>-	private static final Class<?>[] types = { 
>-		// provide list of classes to adapt to, e.g.:
>-		// Entity.class
>-		// Service.class
>-	};
>-
>-	/**
>-	 * @see org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory#getAdapterList()
>-	 *
>-	 * @return the adapter list
>-	 */
>-	
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>-
>Index: src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/message/editor/xtext/ui/outline/UmlMessageTransformer.java	(working copy)
>@@ -1,23 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.message.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure.
>- */
>-public class UmlMessageTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-	
>-}
>#P org.eclipse.papyrus.connectionpointreference.editor.xtext.ui
>Index: src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UMLConnectionPointReferenceOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>Index: src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,22 +0,0 @@
>-/*
>-* generated by Xtext
>-*/
>-package org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UMLConnectionPointReferenceOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = { 
>-		// provide list of classes to adapt to, e.g.:
>-		// Entity.class
>-		// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>-
>Index: src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/outline/UMLConnectionPointReferenceTransformer.java	(working copy)
>@@ -1,14 +0,0 @@
>-/*
>-* generated by Xtext
>-*/
>-package org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UMLConnectionPointReferenceTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-	
>-}
>Index: src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java
>===================================================================
>--- src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java	(revision 4043)
>+++ src/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contributions/ConnectionPointReferencePopupEditorConfiguration.java	(working copy)
>@@ -20,6 +20,7 @@
> import org.eclipse.uml2.uml.ConnectionPointReference;
> import org.eclipse.uml2.uml.Pseudostate;
> import org.eclipse.xtext.gmf.glue.PopupEditorConfiguration;
>+import org.eclipse.xtext.gmf.glue.edit.part.DefaultXtextSemanticValidator;
> import org.eclipse.xtext.gmf.glue.edit.part.IXtextEMFReconciler;
> 
> import com.google.inject.Injector;
>@@ -120,7 +121,7 @@
> 				}
> 			}
> 		};
>-		return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension);
>+		return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new DefaultXtextSemanticValidator());
> 	}
> 	
> 	/**
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -14,13 +14,13 @@
> org.eclipse.xtext.builder,
> org.antlr.runtime,
> org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.8.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0",
> org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.papyrus.umlutils;bundle-version="0.8.0",
> org.eclipse.core.expressions;bundle-version="3.4.200",
> org.eclipse.papyrus.core;bundle-version="0.8.0",
>- org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0"
>+ org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.contentassist.antlr
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/AbstractUMLConnectionPointReferenceUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/AbstractUMLConnectionPointReferenceUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/AbstractUMLConnectionPointReferenceUiModule.java	(working copy)
>@@ -24,21 +24,11 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.XtextDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.connectionpointreference.editor.xtext.parser.antlr.internal.InternalUMLConnectionPointReferenceLexer.class);
> 	}
>@@ -48,6 +38,11 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
> 	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
> 		return org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.labeling.UMLConnectionPointReferenceLabelProvider.class;
>@@ -58,14 +53,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.labeling.UMLConnectionPointReferenceDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline.UMLConnectionPointReferenceTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline.UMLConnectionPointReferenceOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline.UMLConnectionPointReferenceOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.outline.UMLConnectionPointReferenceOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.contentAssist.JavaBasedContentAssistFragment
>@@ -95,7 +90,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.builderState.ShadowingResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>@@ -103,6 +98,16 @@
> 		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>+	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.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
>+	}
>+
>+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {
>+		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider> bindIssueResolutionProvider() {
> 		return org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.quickfix.UMLConnectionPointReferenceQuickfixProvider.class;
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/UMLConnectionPointReferenceExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/UMLConnectionPointReferenceExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/UMLConnectionPointReferenceExecutableExtensionFactory.java	(working copy)
>@@ -1,8 +1,6 @@
>-
> /*
> * generated by Xtext
> */
>- 
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -11,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- *@generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UMLConnectionPointReferenceExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/internal/UMLConnectionPointReferenceActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/internal/UMLConnectionPointReferenceActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/internal/UMLConnectionPointReferenceActivator.java	(working copy)
>@@ -1,24 +1,25 @@
>-
> /*
> * generated by Xtext
> */
> package org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.internal;
> 
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
>+
> import org.apache.log4j.Logger;
> 
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
> 
> import java.util.Map;
> import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UMLConnectionPointReferenceActivator extends AbstractUIPlugin {
> 
>@@ -34,10 +35,7 @@
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-			
>-			injectors.put("org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReference", Guice.createInjector(
>-				Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReference")).with(getUiModule("org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReference"))).with(getSharedStateModule())
>-			));
>+			registerInjectorFor("org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReference");
> 			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
>@@ -45,20 +43,31 @@
> 		}
> 	}
> 	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UMLConnectionPointReferenceActivator getInstance() {
> 		return INSTANCE;
> 	}
> 	
> 	protected Module getRuntimeModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReference".equals(grammar)) {
> 		 return new org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReferenceRuntimeModule();
> 		}
> 		
> 		throw new IllegalArgumentException(grammar);
> 	}
>+	
> 	protected Module getUiModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.connectionpointreference.editor.xtext.UMLConnectionPointReference".equals(grammar)) {
> 		 return new org.eclipse.papyrus.connectionpointreference.editor.xtext.ui.UMLConnectionPointReferenceUiModule(this);
> 		}
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g	(working copy)
>@@ -506,7 +506,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReferenceParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReferenceParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReferenceParser.java	(working copy)
>@@ -27,6 +27,9 @@
> };
> public static final int RULE_ID=4;
> public static final int RULE_STRING=6;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__13=13;
> public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
> public static final int RULE_WS=9;
>@@ -34,12 +37,20 @@
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=7;
> 
>+ // delegates
>+ // delegators
>+
>+
> public InternalUMLConnectionPointReferenceParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUMLConnectionPointReferenceParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUMLConnectionPointReferenceParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g"; }
> 
> 
>@@ -63,7 +74,7 @@
> 
> 
> 
>- // $ANTLR start entryRuleConnectionPointReferenceRule
>+ // $ANTLR start "entryRuleConnectionPointReferenceRule"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:61:1: entryRuleConnectionPointReferenceRule : ruleConnectionPointReferenceRule EOF ;
> public final void entryRuleConnectionPointReferenceRule() throws RecognitionException {
> try {
>@@ -73,7 +84,8 @@
> before(grammarAccess.getConnectionPointReferenceRuleRule()); 
> pushFollow(FOLLOW_ruleConnectionPointReferenceRule_in_entryRuleConnectionPointReferenceRule61);
> ruleConnectionPointReferenceRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getConnectionPointReferenceRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleConnectionPointReferenceRule68); 
>@@ -89,10 +101,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleConnectionPointReferenceRule
>+ // $ANTLR end "entryRuleConnectionPointReferenceRule"
> 
> 
>- // $ANTLR start ruleConnectionPointReferenceRule
>+ // $ANTLR start "ruleConnectionPointReferenceRule"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:70:1: ruleConnectionPointReferenceRule : ( ( rule__ConnectionPointReferenceRule__Alternatives )? ) ;
> public final void ruleConnectionPointReferenceRule() throws RecognitionException {
> 
>@@ -119,7 +131,8 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Alternatives_in_ruleConnectionPointReferenceRule94);
> rule__ConnectionPointReferenceRule__Alternatives();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -146,10 +159,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleConnectionPointReferenceRule
>+ // $ANTLR end "ruleConnectionPointReferenceRule"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Alternatives
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Alternatives"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:89:1: rule__ConnectionPointReferenceRule__Alternatives : ( ( ( rule__ConnectionPointReferenceRule__Group_0__0 ) ) | ( ( rule__ConnectionPointReferenceRule__Group_1__0 ) ) );
> public final void rule__ConnectionPointReferenceRule__Alternatives() throws RecognitionException {
> 
>@@ -168,7 +181,7 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("89:1: rule__ConnectionPointReferenceRule__Alternatives : ( ( ( rule__ConnectionPointReferenceRule__Group_0__0 ) ) | ( ( rule__ConnectionPointReferenceRule__Group_1__0 ) ) );", 2, 0, input);
>+ new NoViableAltException("", 2, 0, input);
> 
> throw nvae;
> }
>@@ -185,7 +198,8 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0__0_in_rule__ConnectionPointReferenceRule__Alternatives131);
> rule__ConnectionPointReferenceRule__Group_0__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -209,7 +223,8 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1__0_in_rule__ConnectionPointReferenceRule__Alternatives149);
> rule__ConnectionPointReferenceRule__Group_1__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -235,10 +250,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Alternatives
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Alternatives"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0__0
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0__0"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:113:1: rule__ConnectionPointReferenceRule__Group_0__0 : rule__ConnectionPointReferenceRule__Group_0__0__Impl rule__ConnectionPointReferenceRule__Group_0__1 ;
> public final void rule__ConnectionPointReferenceRule__Group_0__0() throws RecognitionException {
> 
>@@ -250,12 +265,14 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0__0__Impl_in_rule__ConnectionPointReferenceRule__Group_0__0180);
> rule__ConnectionPointReferenceRule__Group_0__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0__1_in_rule__ConnectionPointReferenceRule__Group_0__0183);
> rule__ConnectionPointReferenceRule__Group_0__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -271,10 +288,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0__0
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0__0"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0__0__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0__0__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:125:1: rule__ConnectionPointReferenceRule__Group_0__0__Impl : ( 'entry' ) ;
> public final void rule__ConnectionPointReferenceRule__Group_0__0__Impl() throws RecognitionException {
> 
>@@ -308,10 +325,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0__0__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0__0__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0__1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0__1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:144:1: rule__ConnectionPointReferenceRule__Group_0__1 : rule__ConnectionPointReferenceRule__Group_0__1__Impl rule__ConnectionPointReferenceRule__Group_0__2 ;
> public final void rule__ConnectionPointReferenceRule__Group_0__1() throws RecognitionException {
> 
>@@ -323,11 +340,13 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0__1__Impl_in_rule__ConnectionPointReferenceRule__Group_0__1242);
> rule__ConnectionPointReferenceRule__Group_0__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0__2_in_rule__ConnectionPointReferenceRule__Group_0__1245);
> rule__ConnectionPointReferenceRule__Group_0__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -344,10 +363,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0__1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0__1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0__1__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0__1__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:156:1: rule__ConnectionPointReferenceRule__Group_0__1__Impl : ( ( rule__ConnectionPointReferenceRule__EntryAssignment_0_1 ) ) ;
> public final void rule__ConnectionPointReferenceRule__Group_0__1__Impl() throws RecognitionException {
> 
>@@ -366,8 +385,9 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__EntryAssignment_0_1_in_rule__ConnectionPointReferenceRule__Group_0__1__Impl272);
> rule__ConnectionPointReferenceRule__EntryAssignment_0_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -390,10 +410,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0__1__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0__1__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0__2
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0__2"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:173:1: rule__ConnectionPointReferenceRule__Group_0__2 : rule__ConnectionPointReferenceRule__Group_0__2__Impl ;
> public final void rule__ConnectionPointReferenceRule__Group_0__2() throws RecognitionException {
> 
>@@ -405,8 +425,9 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0__2__Impl_in_rule__ConnectionPointReferenceRule__Group_0__2302);
> rule__ConnectionPointReferenceRule__Group_0__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -422,10 +443,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0__2
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0__2"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0__2__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0__2__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:184:1: rule__ConnectionPointReferenceRule__Group_0__2__Impl : ( ( rule__ConnectionPointReferenceRule__Group_0_2__0 )* ) ;
> public final void rule__ConnectionPointReferenceRule__Group_0__2__Impl() throws RecognitionException {
> 
>@@ -456,8 +477,9 @@
> 	 {
> 	 pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0_2__0_in_rule__ConnectionPointReferenceRule__Group_0__2__Impl329);
> 	 rule__ConnectionPointReferenceRule__Group_0_2__0();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 }
> 	 break;
>@@ -486,10 +508,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0__2__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0__2__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0_2__0
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0_2__0"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:207:1: rule__ConnectionPointReferenceRule__Group_0_2__0 : rule__ConnectionPointReferenceRule__Group_0_2__0__Impl rule__ConnectionPointReferenceRule__Group_0_2__1 ;
> public final void rule__ConnectionPointReferenceRule__Group_0_2__0() throws RecognitionException {
> 
>@@ -501,11 +523,13 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0_2__0__Impl_in_rule__ConnectionPointReferenceRule__Group_0_2__0366);
> rule__ConnectionPointReferenceRule__Group_0_2__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0_2__1_in_rule__ConnectionPointReferenceRule__Group_0_2__0369);
> rule__ConnectionPointReferenceRule__Group_0_2__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -522,10 +546,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0_2__0
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0_2__0"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0_2__0__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0_2__0__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:219:1: rule__ConnectionPointReferenceRule__Group_0_2__0__Impl : ( ',' ) ;
> public final void rule__ConnectionPointReferenceRule__Group_0_2__0__Impl() throws RecognitionException {
> 
>@@ -559,10 +583,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0_2__0__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0_2__0__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0_2__1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0_2__1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:238:1: rule__ConnectionPointReferenceRule__Group_0_2__1 : rule__ConnectionPointReferenceRule__Group_0_2__1__Impl ;
> public final void rule__ConnectionPointReferenceRule__Group_0_2__1() throws RecognitionException {
> 
>@@ -574,7 +598,8 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_0_2__1__Impl_in_rule__ConnectionPointReferenceRule__Group_0_2__1428);
> rule__ConnectionPointReferenceRule__Group_0_2__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -591,10 +616,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0_2__1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0_2__1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_0_2__1__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_0_2__1__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:249:1: rule__ConnectionPointReferenceRule__Group_0_2__1__Impl : ( ( rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1 ) ) ;
> public final void rule__ConnectionPointReferenceRule__Group_0_2__1__Impl() throws RecognitionException {
> 
>@@ -613,7 +638,8 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1_in_rule__ConnectionPointReferenceRule__Group_0_2__1__Impl455);
> rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -637,10 +663,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_0_2__1__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_0_2__1__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1__0
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1__0"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:270:1: rule__ConnectionPointReferenceRule__Group_1__0 : rule__ConnectionPointReferenceRule__Group_1__0__Impl rule__ConnectionPointReferenceRule__Group_1__1 ;
> public final void rule__ConnectionPointReferenceRule__Group_1__0() throws RecognitionException {
> 
>@@ -652,11 +678,13 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1__0__Impl_in_rule__ConnectionPointReferenceRule__Group_1__0489);
> rule__ConnectionPointReferenceRule__Group_1__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1__1_in_rule__ConnectionPointReferenceRule__Group_1__0492);
> rule__ConnectionPointReferenceRule__Group_1__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -673,10 +701,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1__0
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1__0"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1__0__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1__0__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:282:1: rule__ConnectionPointReferenceRule__Group_1__0__Impl : ( 'exit' ) ;
> public final void rule__ConnectionPointReferenceRule__Group_1__0__Impl() throws RecognitionException {
> 
>@@ -710,10 +738,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1__0__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1__0__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1__1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1__1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:301:1: rule__ConnectionPointReferenceRule__Group_1__1 : rule__ConnectionPointReferenceRule__Group_1__1__Impl rule__ConnectionPointReferenceRule__Group_1__2 ;
> public final void rule__ConnectionPointReferenceRule__Group_1__1() throws RecognitionException {
> 
>@@ -725,11 +753,13 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1__1__Impl_in_rule__ConnectionPointReferenceRule__Group_1__1551);
> rule__ConnectionPointReferenceRule__Group_1__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1__2_in_rule__ConnectionPointReferenceRule__Group_1__1554);
> rule__ConnectionPointReferenceRule__Group_1__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -746,10 +776,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1__1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1__1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1__1__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1__1__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:313:1: rule__ConnectionPointReferenceRule__Group_1__1__Impl : ( ( rule__ConnectionPointReferenceRule__ExitAssignment_1_1 ) ) ;
> public final void rule__ConnectionPointReferenceRule__Group_1__1__Impl() throws RecognitionException {
> 
>@@ -768,8 +798,9 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__ExitAssignment_1_1_in_rule__ConnectionPointReferenceRule__Group_1__1__Impl581);
> rule__ConnectionPointReferenceRule__ExitAssignment_1_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -792,10 +823,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1__1__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1__1__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1__2
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1__2"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:330:1: rule__ConnectionPointReferenceRule__Group_1__2 : rule__ConnectionPointReferenceRule__Group_1__2__Impl ;
> public final void rule__ConnectionPointReferenceRule__Group_1__2() throws RecognitionException {
> 
>@@ -807,8 +838,9 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1__2__Impl_in_rule__ConnectionPointReferenceRule__Group_1__2611);
> rule__ConnectionPointReferenceRule__Group_1__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -824,10 +856,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1__2
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1__2"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1__2__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1__2__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:341:1: rule__ConnectionPointReferenceRule__Group_1__2__Impl : ( ( rule__ConnectionPointReferenceRule__Group_1_2__0 )* ) ;
> public final void rule__ConnectionPointReferenceRule__Group_1__2__Impl() throws RecognitionException {
> 
>@@ -858,7 +890,8 @@
> 	 {
> 	 pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1_2__0_in_rule__ConnectionPointReferenceRule__Group_1__2__Impl638);
> 	 rule__ConnectionPointReferenceRule__Group_1_2__0();
>- 	 _fsp--;
>+
>+ 	 state._fsp--;
> 
> 
> 	 }
>@@ -888,10 +921,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1__2__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1__2__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1_2__0
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1_2__0"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:364:1: rule__ConnectionPointReferenceRule__Group_1_2__0 : rule__ConnectionPointReferenceRule__Group_1_2__0__Impl rule__ConnectionPointReferenceRule__Group_1_2__1 ;
> public final void rule__ConnectionPointReferenceRule__Group_1_2__0() throws RecognitionException {
> 
>@@ -903,12 +936,14 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1_2__0__Impl_in_rule__ConnectionPointReferenceRule__Group_1_2__0675);
> rule__ConnectionPointReferenceRule__Group_1_2__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1_2__1_in_rule__ConnectionPointReferenceRule__Group_1_2__0678);
> rule__ConnectionPointReferenceRule__Group_1_2__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -924,10 +959,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1_2__0
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1_2__0"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1_2__0__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1_2__0__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:376:1: rule__ConnectionPointReferenceRule__Group_1_2__0__Impl : ( ',' ) ;
> public final void rule__ConnectionPointReferenceRule__Group_1_2__0__Impl() throws RecognitionException {
> 
>@@ -961,10 +996,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1_2__0__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1_2__0__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1_2__1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1_2__1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:395:1: rule__ConnectionPointReferenceRule__Group_1_2__1 : rule__ConnectionPointReferenceRule__Group_1_2__1__Impl ;
> public final void rule__ConnectionPointReferenceRule__Group_1_2__1() throws RecognitionException {
> 
>@@ -976,8 +1011,9 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__Group_1_2__1__Impl_in_rule__ConnectionPointReferenceRule__Group_1_2__1737);
> rule__ConnectionPointReferenceRule__Group_1_2__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -993,10 +1029,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1_2__1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1_2__1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__Group_1_2__1__Impl
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__Group_1_2__1__Impl"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:406:1: rule__ConnectionPointReferenceRule__Group_1_2__1__Impl : ( ( rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1 ) ) ;
> public final void rule__ConnectionPointReferenceRule__Group_1_2__1__Impl() throws RecognitionException {
> 
>@@ -1015,8 +1051,9 @@
> {
> pushFollow(FOLLOW_rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1_in_rule__ConnectionPointReferenceRule__Group_1_2__1__Impl764);
> rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1039,10 +1076,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__Group_1_2__1__Impl
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__Group_1_2__1__Impl"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__EntryAssignment_0_1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__EntryAssignment_0_1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:428:1: rule__ConnectionPointReferenceRule__EntryAssignment_0_1 : ( ( RULE_ID ) ) ;
> public final void rule__ConnectionPointReferenceRule__EntryAssignment_0_1() throws RecognitionException {
> 
>@@ -1084,10 +1121,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__EntryAssignment_0_1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__EntryAssignment_0_1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:447:1: rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1 : ( ( RULE_ID ) ) ;
> public final void rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1() throws RecognitionException {
> 
>@@ -1129,10 +1166,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__EntryAssignment_0_2_1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__ExitAssignment_1_1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__ExitAssignment_1_1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:466:1: rule__ConnectionPointReferenceRule__ExitAssignment_1_1 : ( ( RULE_ID ) ) ;
> public final void rule__ConnectionPointReferenceRule__ExitAssignment_1_1() throws RecognitionException {
> 
>@@ -1174,10 +1211,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__ExitAssignment_1_1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__ExitAssignment_1_1"
> 
> 
>- // $ANTLR start rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1
>+ // $ANTLR start "rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1"
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:485:1: rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1 : ( ( RULE_ID ) ) ;
> public final void rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1() throws RecognitionException {
> 
>@@ -1219,8 +1256,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1
>+ // $ANTLR end "rule__ConnectionPointReferenceRule__ExitAssignment_1_2_1"
> 
>+ // Delegated rules
>+
> 
> 
> 
>@@ -1232,7 +1271,7 @@
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_0__0__Impl_in_rule__ConnectionPointReferenceRule__Group_0__0180 = new BitSet(new long[]{0x0000000000000010L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_0__1_in_rule__ConnectionPointReferenceRule__Group_0__0183 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_11_in_rule__ConnectionPointReferenceRule__Group_0__0__Impl211 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_0__1__Impl_in_rule__ConnectionPointReferenceRule__Group_0__1242 = new BitSet(new long[]{0x0000000000001002L});
>+ public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_0__1__Impl_in_rule__ConnectionPointReferenceRule__Group_0__1242 = new BitSet(new long[]{0x0000000000001000L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_0__2_in_rule__ConnectionPointReferenceRule__Group_0__1245 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__EntryAssignment_0_1_in_rule__ConnectionPointReferenceRule__Group_0__1__Impl272 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_0__2__Impl_in_rule__ConnectionPointReferenceRule__Group_0__2302 = new BitSet(new long[]{0x0000000000000002L});
>@@ -1245,7 +1284,7 @@
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_1__0__Impl_in_rule__ConnectionPointReferenceRule__Group_1__0489 = new BitSet(new long[]{0x0000000000000010L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_1__1_in_rule__ConnectionPointReferenceRule__Group_1__0492 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_13_in_rule__ConnectionPointReferenceRule__Group_1__0__Impl520 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_1__1__Impl_in_rule__ConnectionPointReferenceRule__Group_1__1551 = new BitSet(new long[]{0x0000000000001002L});
>+ public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_1__1__Impl_in_rule__ConnectionPointReferenceRule__Group_1__1551 = new BitSet(new long[]{0x0000000000001000L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_1__2_in_rule__ConnectionPointReferenceRule__Group_1__1554 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__ExitAssignment_1_1_in_rule__ConnectionPointReferenceRule__Group_1__1__Impl581 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__ConnectionPointReferenceRule__Group_1__2__Impl_in_rule__ConnectionPointReferenceRule__Group_1__2611 = new BitSet(new long[]{0x0000000000000002L});
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReferenceLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReferenceLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReferenceLexer.java	(working copy)
>@@ -14,82 +14,96 @@
> public class InternalUMLConnectionPointReferenceLexer extends Lexer {
> public static final int RULE_ID=4;
> public static final int RULE_STRING=6;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__13=13;
> public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
>- public static final int T11=11;
>- public static final int T12=12;
>- public static final int T13=13;
> public static final int RULE_WS=9;
>- public static final int Tokens=14;
> public static final int RULE_SL_COMMENT=8;
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=7;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUMLConnectionPointReferenceLexer() {;} 
> public InternalUMLConnectionPointReferenceLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUMLConnectionPointReferenceLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g"; }
> 
>- // $ANTLR start T11
>- public final void mT11() throws RecognitionException {
>+ // $ANTLR start "T__11"
>+ public final void mT__11() throws RecognitionException {
> try {
>- int _type = T11;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:10:5: ( 'entry' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:10:7: 'entry'
>+ int _type = T__11;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:11:7: ( 'entry' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:11:9: 'entry'
> {
> match("entry"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T11
>+ // $ANTLR end "T__11"
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:11:5: ( ',' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:11:7: ','
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:12:7: ( ',' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:12:9: ','
> {
> match(','); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:12:5: ( 'exit' )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:12:7: 'exit'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:13:7: ( 'exit' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:13:9: 'exit'
> {
> match("exit"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:505:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:505:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>@@ -116,10 +130,9 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:505:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop2:
>@@ -141,10 +154,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -158,17 +170,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:507:10: ( ( '0' .. '9' )+ )
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:507:12: ( '0' .. '9' )+
> {
>@@ -205,21 +219,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -231,16 +247,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("509:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop4:
> do {
> int alt4=3;
>@@ -249,41 +265,39 @@
> if ( (LA4_0=='\\') ) {
> alt4=1;
> }
>- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
>+ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
> alt4=2;
> }
> 
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -299,10 +313,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -311,41 +325,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:509:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -366,17 +378,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:511:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:511:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
>@@ -394,13 +408,13 @@
> if ( (LA7_1=='/') ) {
> alt7=2;
> }
>- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
>+ else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
> alt7=1;
> }
> 
>@@ -424,17 +438,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:513:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:513:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
>@@ -446,7 +462,7 @@
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
>+ if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
>@@ -455,15 +471,14 @@
> 	case 1 :
> 	 // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:513: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -513,17 +528,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:515:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:515:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>@@ -548,10 +565,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -569,17 +585,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:517:16: ( . )
> // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:517:18: .
> {
>@@ -587,206 +605,84 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:8: ( T11 | T12 | T13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:8: ( T__11 | T__12 | T__13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt12=10;
>- int LA12_0 = input.LA(1);
>-
>- if ( (LA12_0=='e') ) {
>- switch ( input.LA(2) ) {
>- case 'n':
>- {
>- int LA12_11 = input.LA(3);
>-
>- if ( (LA12_11=='t') ) {
>- int LA12_20 = input.LA(4);
>-
>- if ( (LA12_20=='r') ) {
>- int LA12_22 = input.LA(5);
>-
>- if ( (LA12_22=='y') ) {
>- int LA12_24 = input.LA(6);
>-
>- if ( ((LA12_24>='0' && LA12_24<='9')||(LA12_24>='A' && LA12_24<='Z')||LA12_24=='_'||(LA12_24>='a' && LA12_24<='z')) ) {
>- alt12=4;
>- }
>- else {
>- alt12=1;}
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=4;}
>- }
>- break;
>- case 'x':
>- {
>- int LA12_12 = input.LA(3);
>-
>- if ( (LA12_12=='i') ) {
>- int LA12_21 = input.LA(4);
>-
>- if ( (LA12_21=='t') ) {
>- int LA12_23 = input.LA(5);
>-
>- if ( ((LA12_23>='0' && LA12_23<='9')||(LA12_23>='A' && LA12_23<='Z')||LA12_23=='_'||(LA12_23>='a' && LA12_23<='z')) ) {
>- alt12=4;
>- }
>- else {
>- alt12=3;}
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=4;}
>- }
>- break;
>- default:
>- alt12=4;}
>-
>- }
>- else if ( (LA12_0==',') ) {
>- alt12=2;
>- }
>- else if ( (LA12_0=='^') ) {
>- int LA12_3 = input.LA(2);
>-
>- if ( ((LA12_3>='A' && LA12_3<='Z')||LA12_3=='_'||(LA12_3>='a' && LA12_3<='z')) ) {
>- alt12=4;
>- }
>- else {
>- alt12=10;}
>- }
>- else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='d')||(LA12_0>='f' && LA12_0<='z')) ) {
>- alt12=4;
>- }
>- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
>- alt12=5;
>- }
>- else if ( (LA12_0=='\"') ) {
>- int LA12_6 = input.LA(2);
>-
>- if ( ((LA12_6>='\u0000' && LA12_6<='\uFFFE')) ) {
>- alt12=6;
>- }
>- else {
>- alt12=10;}
>- }
>- else if ( (LA12_0=='\'') ) {
>- int LA12_7 = input.LA(2);
>-
>- if ( ((LA12_7>='\u0000' && LA12_7<='\uFFFE')) ) {
>- alt12=6;
>- }
>- else {
>- alt12=10;}
>- }
>- else if ( (LA12_0=='/') ) {
>- switch ( input.LA(2) ) {
>- case '/':
>- {
>- alt12=8;
>- }
>- break;
>- case '*':
>- {
>- alt12=7;
>- }
>- break;
>- default:
>- alt12=10;}
>-
>- }
>- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
>- alt12=9;
>- }
>- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
>- alt12=10;
>- }
>- else {
>- NoViableAltException nvae =
>- new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
>-
>- throw nvae;
>- }
>+ alt12 = dfa12.predict(input);
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:10: T11
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:10: T__11
> {
>- mT11(); 
>+ mT__11(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:14: T12
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:16: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:18: T13
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:22: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:22: RULE_ID
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:28: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:30: RULE_INT
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:36: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:39: RULE_STRING
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:45: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:51: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:57: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:67: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:73: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:83: RULE_WS
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:89: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:91: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.connectionpointreference.editor.xtext.ui/src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.g:1:97: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -798,6 +694,144 @@
> }
> 
> 
>+ protected DFA12 dfa12 = new DFA12(this);
>+ static final String DFA12_eotS =
>+ "\1\uffff\1\15\1\uffff\1\12\2\uffff\3\12\2\uffff\2\15\7\uffff\3"+
>+ "\15\1\31\1\32\2\uffff";
>+ static final String DFA12_eofS =
>+ "\33\uffff";
>+ static final String DFA12_minS =
>+ "\1\0\1\156\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\164\1\151\7"+
>+ "\uffff\1\162\1\164\1\171\2\60\2\uffff";
>+ static final String DFA12_maxS =
>+ "\1\uffff\1\170\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164"+
>+ "\1\151\7\uffff\1\162\1\164\1\171\2\172\2\uffff";
>+ static final String DFA12_acceptS =
>+ "\2\uffff\1\2\1\uffff\1\4\1\5\3\uffff\1\11\1\12\2\uffff\1\4\1\2"+
>+ "\1\5\1\6\1\7\1\10\1\11\5\uffff\1\3\1\1";
>+ static final String DFA12_specialS =
>+ "\1\2\5\uffff\1\0\1\1\23\uffff}>";
>+ static final String[] DFA12_transitionS = {
>+ "\11\12\2\11\2\12\1\11\22\12\1\11\1\12\1\6\4\12\1\7\4\12\1\2"+
>+ "\2\12\1\10\12\5\7\12\32\4\3\12\1\3\1\4\1\12\4\4\1\1\25\4\uff85"+
>+ "\12",
>+ "\1\13\11\uffff\1\14",
>+ "",
>+ "\32\15\4\uffff\1\15\1\uffff\32\15",
>+ "",
>+ "",
>+ "\0\20",
>+ "\0\20",
>+ "\1\21\4\uffff\1\22",
>+ "",
>+ "",
>+ "\1\24",
>+ "\1\25",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\26",
>+ "\1\27",
>+ "\1\30",
>+ "\12\15\7\uffff\32\15\4\uffff\1\15\1\uffff\32\15",
>+ "\12\15\7\uffff\32\15\4\uffff\1\15\1\uffff\32\15",
>+ "",
>+ ""
>+ };
>+
>+ static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
>+ static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
>+ static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
>+ static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
>+ static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
>+ static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
>+ static final short[][] DFA12_transition;
>+
>+ static {
>+ int numStates = DFA12_transitionS.length;
>+ DFA12_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
>+ }
>+ }
>+
>+ class DFA12 extends DFA {
>+
>+ public DFA12(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 12;
>+ this.eot = DFA12_eot;
>+ this.eof = DFA12_eof;
>+ this.min = DFA12_min;
>+ this.max = DFA12_max;
>+ this.accept = DFA12_accept;
>+ this.special = DFA12_special;
>+ this.transition = DFA12_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__11 | T__12 | T__13 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA12_6 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_6>='\u0000' && LA12_6<='\uFFFF')) ) {s = 16;}
>+
>+ else s = 10;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA12_7 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_7>='\u0000' && LA12_7<='\uFFFF')) ) {s = 16;}
>+
>+ else s = 10;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA12_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA12_0=='e') ) {s = 1;}
>+
>+ else if ( (LA12_0==',') ) {s = 2;}
>+
>+ else if ( (LA12_0=='^') ) {s = 3;}
>+
>+ else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='d')||(LA12_0>='f' && LA12_0<='z')) ) {s = 4;}
>+
>+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 5;}
>+
>+ else if ( (LA12_0=='\"') ) {s = 6;}
>+
>+ else if ( (LA12_0=='\'') ) {s = 7;}
>+
>+ else if ( (LA12_0=='/') ) {s = 8;}
>+
>+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 9;}
>+
>+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||(LA12_0>='-' && LA12_0<='.')||(LA12_0>=':' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 10;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 12, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
> 
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/connectionpointreference/editor/xtext/ui/contentassist/antlr/internal/InternalUMLConnectionPointReference.tokens	(working copy)
>@@ -1,5 +1,8 @@
> RULE_ID=4
> RULE_STRING=6
>+T__12=12
>+T__11=11
>+T__13=13
> RULE_ANY_OTHER=10
> RULE_INT=5
> RULE_WS=9
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>#P org.eclipse.papyrus.property.editor.xtext.ui
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/UmlPropertyExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/UmlPropertyExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/UmlPropertyExecutableExtensionFactory.java	(working copy)
>@@ -1,8 +1,6 @@
>-
> /*
> * generated by Xtext
> */
>- 
> package org.eclipse.papyrus.property.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -11,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- *@generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlPropertyExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/internal/UmlPropertyActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/internal/UmlPropertyActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/internal/UmlPropertyActivator.java	(working copy)
>@@ -1,24 +1,25 @@
>-
> /*
> * generated by Xtext
> */
> package org.eclipse.papyrus.property.editor.xtext.ui.internal;
> 
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
>+
> import org.apache.log4j.Logger;
> 
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
> 
> import java.util.Map;
> import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlPropertyActivator extends AbstractUIPlugin {
> 
>@@ -34,10 +35,7 @@
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-			
>-			injectors.put("org.eclipse.papyrus.property.editor.xtext.UmlProperty", Guice.createInjector(
>-				Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.property.editor.xtext.UmlProperty")).with(getUiModule("org.eclipse.papyrus.property.editor.xtext.UmlProperty"))).with(getSharedStateModule())
>-			));
>+			registerInjectorFor("org.eclipse.papyrus.property.editor.xtext.UmlProperty");
> 			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
>@@ -45,20 +43,31 @@
> 		}
> 	}
> 	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlPropertyActivator getInstance() {
> 		return INSTANCE;
> 	}
> 	
> 	protected Module getRuntimeModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.property.editor.xtext.UmlProperty".equals(grammar)) {
> 		 return new org.eclipse.papyrus.property.editor.xtext.UmlPropertyRuntimeModule();
> 		}
> 		
> 		throw new IllegalArgumentException(grammar);
> 	}
>+	
> 	protected Module getUiModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.property.editor.xtext.UmlProperty".equals(grammar)) {
> 		 return new org.eclipse.papyrus.property.editor.xtext.ui.UmlPropertyUiModule(this);
> 		}
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens	(working copy)
>@@ -1,11 +1,32 @@
> RULE_ID=4
>-RULE_STRING=6
> RULE_UNLIMITEDLITERAL=5
>+T__29=29
>+T__28=28
>+T__27=27
>+T__26=26
>+T__25=25
>+T__24=24
>+T__23=23
>+T__22=22
> RULE_ANY_OTHER=11
>-RULE_INT=7
>-RULE_WS=10
>+T__21=21
>+T__20=20
> RULE_SL_COMMENT=9
> RULE_ML_COMMENT=8
>+T__30=30
>+T__19=19
>+T__31=31
>+RULE_STRING=6
>+T__32=32
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__14=14
>+T__13=13
>+RULE_INT=7
>+RULE_WS=10
> '..'=25
> 'ordered'=19
> '}'=27
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java	(working copy)
>@@ -26,21 +26,50 @@
> "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'<Undefined>'", "'+'", "'-'", "'#'", "'~'", "'readOnly'", "'union'", "'ordered'", "'unique'", "':'", "'::'", "'['", "']'", "'..'", "'{'", "'}'", "','", "'redefines'", "'subsets'", "'='", "'/'"
> };
> public static final int RULE_ID=4;
>- public static final int RULE_STRING=6;
> public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__29=29;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
> public static final int RULE_ANY_OTHER=11;
>- public static final int RULE_INT=7;
>- public static final int RULE_WS=10;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
> public static final int RULE_SL_COMMENT=9;
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=8;
>+ public static final int T__30=30;
>+ public static final int T__19=19;
>+ public static final int T__31=31;
>+ public static final int RULE_STRING=6;
>+ public static final int T__32=32;
>+ 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__17=17;
>+ 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=7;
>+ public static final int RULE_WS=10;
>+
>+ // delegates
>+ // delegators
>+
> 
> public InternalUmlPropertyParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlPropertyParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlPropertyParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g"; }
> 
> 
>@@ -64,7 +93,7 @@
> 
> 
> 
>- // $ANTLR start entryRulePropertyRule
>+ // $ANTLR start "entryRulePropertyRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:61:1: entryRulePropertyRule : rulePropertyRule EOF ;
> public final void entryRulePropertyRule() throws RecognitionException {
> try {
>@@ -74,7 +103,8 @@
> before(grammarAccess.getPropertyRuleRule()); 
> pushFollow(FOLLOW_rulePropertyRule_in_entryRulePropertyRule61);
> rulePropertyRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getPropertyRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRulePropertyRule68); 
>@@ -90,10 +120,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRulePropertyRule
>+ // $ANTLR end "entryRulePropertyRule"
> 
> 
>- // $ANTLR start rulePropertyRule
>+ // $ANTLR start "rulePropertyRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:70:1: rulePropertyRule : ( ( rule__PropertyRule__Group__0 ) ) ;
> public final void rulePropertyRule() throws RecognitionException {
> 
>@@ -112,7 +142,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__0_in_rulePropertyRule94);
> rule__PropertyRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -136,10 +167,10 @@
> }
> return ;
> }
>- // $ANTLR end rulePropertyRule
>+ // $ANTLR end "rulePropertyRule"
> 
> 
>- // $ANTLR start entryRuleTypeRule
>+ // $ANTLR start "entryRuleTypeRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:89:1: entryRuleTypeRule : ruleTypeRule EOF ;
> public final void entryRuleTypeRule() throws RecognitionException {
> try {
>@@ -149,7 +180,8 @@
> before(grammarAccess.getTypeRuleRule()); 
> pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule121);
> ruleTypeRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTypeRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule128); 
>@@ -165,10 +197,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleTypeRule
>+ // $ANTLR end "entryRuleTypeRule"
> 
> 
>- // $ANTLR start ruleTypeRule
>+ // $ANTLR start "ruleTypeRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:98:1: ruleTypeRule : ( ( rule__TypeRule__Group__0 ) ) ;
> public final void ruleTypeRule() throws RecognitionException {
> 
>@@ -187,7 +219,8 @@
> {
> pushFollow(FOLLOW_rule__TypeRule__Group__0_in_ruleTypeRule154);
> rule__TypeRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -211,10 +244,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleTypeRule
>+ // $ANTLR end "ruleTypeRule"
> 
> 
>- // $ANTLR start entryRuleQualifiedName
>+ // $ANTLR start "entryRuleQualifiedName"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:117:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
> public final void entryRuleQualifiedName() throws RecognitionException {
> try {
>@@ -224,7 +257,8 @@
> before(grammarAccess.getQualifiedNameRule()); 
> pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName181);
> ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getQualifiedNameRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName188); 
>@@ -240,10 +274,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleQualifiedName
>+ // $ANTLR end "entryRuleQualifiedName"
> 
> 
>- // $ANTLR start ruleQualifiedName
>+ // $ANTLR start "ruleQualifiedName"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:126:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
> public final void ruleQualifiedName() throws RecognitionException {
> 
>@@ -262,7 +296,8 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName214);
> rule__QualifiedName__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -286,10 +321,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleQualifiedName
>+ // $ANTLR end "ruleQualifiedName"
> 
> 
>- // $ANTLR start entryRuleMultiplicityRule
>+ // $ANTLR start "entryRuleMultiplicityRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:145:1: entryRuleMultiplicityRule : ruleMultiplicityRule EOF ;
> public final void entryRuleMultiplicityRule() throws RecognitionException {
> try {
>@@ -299,7 +334,8 @@
> before(grammarAccess.getMultiplicityRuleRule()); 
> pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule241);
> ruleMultiplicityRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getMultiplicityRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule248); 
>@@ -315,10 +351,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleMultiplicityRule
>+ // $ANTLR end "entryRuleMultiplicityRule"
> 
> 
>- // $ANTLR start ruleMultiplicityRule
>+ // $ANTLR start "ruleMultiplicityRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:154:1: ruleMultiplicityRule : ( ( rule__MultiplicityRule__Group__0 ) ) ;
> public final void ruleMultiplicityRule() throws RecognitionException {
> 
>@@ -337,8 +373,9 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__0_in_ruleMultiplicityRule274);
> rule__MultiplicityRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -361,10 +398,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleMultiplicityRule
>+ // $ANTLR end "ruleMultiplicityRule"
> 
> 
>- // $ANTLR start entryRuleBoundSpecification
>+ // $ANTLR start "entryRuleBoundSpecification"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:173:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
> public final void entryRuleBoundSpecification() throws RecognitionException {
> try {
>@@ -374,7 +411,8 @@
> before(grammarAccess.getBoundSpecificationRule()); 
> pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification301);
> ruleBoundSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getBoundSpecificationRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification308); 
>@@ -390,10 +428,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleBoundSpecification
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
> 
>- // $ANTLR start ruleBoundSpecification
>+ // $ANTLR start "ruleBoundSpecification"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:182:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
> public final void ruleBoundSpecification() throws RecognitionException {
> 
>@@ -412,7 +450,8 @@
> {
> pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification334);
> rule__BoundSpecification__ValueAssignment();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -436,10 +475,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleBoundSpecification
>+ // $ANTLR end "ruleBoundSpecification"
> 
> 
>- // $ANTLR start entryRuleModifiersRule
>+ // $ANTLR start "entryRuleModifiersRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:201:1: entryRuleModifiersRule : ruleModifiersRule EOF ;
> public final void entryRuleModifiersRule() throws RecognitionException {
> try {
>@@ -449,7 +488,8 @@
> before(grammarAccess.getModifiersRuleRule()); 
> pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule361);
> ruleModifiersRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifiersRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule368); 
>@@ -465,10 +505,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleModifiersRule
>+ // $ANTLR end "entryRuleModifiersRule"
> 
> 
>- // $ANTLR start ruleModifiersRule
>+ // $ANTLR start "ruleModifiersRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:210:1: ruleModifiersRule : ( ( rule__ModifiersRule__Group__0 ) ) ;
> public final void ruleModifiersRule() throws RecognitionException {
> 
>@@ -487,7 +527,8 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group__0_in_ruleModifiersRule394);
> rule__ModifiersRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -511,10 +552,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleModifiersRule
>+ // $ANTLR end "ruleModifiersRule"
> 
> 
>- // $ANTLR start entryRuleModifierSpecification
>+ // $ANTLR start "entryRuleModifierSpecification"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:229:1: entryRuleModifierSpecification : ruleModifierSpecification EOF ;
> public final void entryRuleModifierSpecification() throws RecognitionException {
> try {
>@@ -524,7 +565,8 @@
> before(grammarAccess.getModifierSpecificationRule()); 
> pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification421);
> ruleModifierSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifierSpecificationRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification428); 
>@@ -540,10 +582,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleModifierSpecification
>+ // $ANTLR end "entryRuleModifierSpecification"
> 
> 
>- // $ANTLR start ruleModifierSpecification
>+ // $ANTLR start "ruleModifierSpecification"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:238:1: ruleModifierSpecification : ( ( rule__ModifierSpecification__Alternatives ) ) ;
> public final void ruleModifierSpecification() throws RecognitionException {
> 
>@@ -562,7 +604,8 @@
> {
> pushFollow(FOLLOW_rule__ModifierSpecification__Alternatives_in_ruleModifierSpecification454);
> rule__ModifierSpecification__Alternatives();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -586,10 +629,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleModifierSpecification
>+ // $ANTLR end "ruleModifierSpecification"
> 
> 
>- // $ANTLR start entryRuleRedefinesRule
>+ // $ANTLR start "entryRuleRedefinesRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:257:1: entryRuleRedefinesRule : ruleRedefinesRule EOF ;
> public final void entryRuleRedefinesRule() throws RecognitionException {
> try {
>@@ -599,7 +642,8 @@
> before(grammarAccess.getRedefinesRuleRule()); 
> pushFollow(FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule481);
> ruleRedefinesRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getRedefinesRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleRedefinesRule488); 
>@@ -615,10 +659,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleRedefinesRule
>+ // $ANTLR end "entryRuleRedefinesRule"
> 
> 
>- // $ANTLR start ruleRedefinesRule
>+ // $ANTLR start "ruleRedefinesRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:266:1: ruleRedefinesRule : ( ( rule__RedefinesRule__Group__0 ) ) ;
> public final void ruleRedefinesRule() throws RecognitionException {
> 
>@@ -637,8 +681,9 @@
> {
> pushFollow(FOLLOW_rule__RedefinesRule__Group__0_in_ruleRedefinesRule514);
> rule__RedefinesRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -661,10 +706,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleRedefinesRule
>+ // $ANTLR end "ruleRedefinesRule"
> 
> 
>- // $ANTLR start entryRuleSubsetsRule
>+ // $ANTLR start "entryRuleSubsetsRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:285:1: entryRuleSubsetsRule : ruleSubsetsRule EOF ;
> public final void entryRuleSubsetsRule() throws RecognitionException {
> try {
>@@ -674,7 +719,8 @@
> before(grammarAccess.getSubsetsRuleRule()); 
> pushFollow(FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule541);
> ruleSubsetsRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getSubsetsRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleSubsetsRule548); 
>@@ -690,10 +736,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleSubsetsRule
>+ // $ANTLR end "entryRuleSubsetsRule"
> 
> 
>- // $ANTLR start ruleSubsetsRule
>+ // $ANTLR start "ruleSubsetsRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:294:1: ruleSubsetsRule : ( ( rule__SubsetsRule__Group__0 ) ) ;
> public final void ruleSubsetsRule() throws RecognitionException {
> 
>@@ -712,7 +758,8 @@
> {
> pushFollow(FOLLOW_rule__SubsetsRule__Group__0_in_ruleSubsetsRule574);
> rule__SubsetsRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -736,10 +783,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleSubsetsRule
>+ // $ANTLR end "ruleSubsetsRule"
> 
> 
>- // $ANTLR start entryRuleDefaultValueRule
>+ // $ANTLR start "entryRuleDefaultValueRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:313:1: entryRuleDefaultValueRule : ruleDefaultValueRule EOF ;
> public final void entryRuleDefaultValueRule() throws RecognitionException {
> try {
>@@ -749,7 +796,8 @@
> before(grammarAccess.getDefaultValueRuleRule()); 
> pushFollow(FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule601);
> ruleDefaultValueRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getDefaultValueRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleDefaultValueRule608); 
>@@ -765,10 +813,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleDefaultValueRule
>+ // $ANTLR end "entryRuleDefaultValueRule"
> 
> 
>- // $ANTLR start ruleDefaultValueRule
>+ // $ANTLR start "ruleDefaultValueRule"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:322:1: ruleDefaultValueRule : ( ( rule__DefaultValueRule__Group__0 ) ) ;
> public final void ruleDefaultValueRule() throws RecognitionException {
> 
>@@ -787,8 +835,9 @@
> {
> pushFollow(FOLLOW_rule__DefaultValueRule__Group__0_in_ruleDefaultValueRule634);
> rule__DefaultValueRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -811,10 +860,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleDefaultValueRule
>+ // $ANTLR end "ruleDefaultValueRule"
> 
> 
>- // $ANTLR start ruleVisibilityKind
>+ // $ANTLR start "ruleVisibilityKind"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:342:1: ruleVisibilityKind : ( ( rule__VisibilityKind__Alternatives ) ) ;
> public final void ruleVisibilityKind() throws RecognitionException {
> 
>@@ -833,8 +882,9 @@
> {
> pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind671);
> rule__VisibilityKind__Alternatives();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -857,10 +907,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleVisibilityKind
>+ // $ANTLR end "ruleVisibilityKind"
> 
> 
>- // $ANTLR start ruleModifierKind
>+ // $ANTLR start "ruleModifierKind"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:361:1: ruleModifierKind : ( ( rule__ModifierKind__Alternatives ) ) ;
> public final void ruleModifierKind() throws RecognitionException {
> 
>@@ -879,8 +929,9 @@
> {
> pushFollow(FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind707);
> rule__ModifierKind__Alternatives();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -903,10 +954,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleModifierKind
>+ // $ANTLR end "ruleModifierKind"
> 
> 
>- // $ANTLR start rule__PropertyRule__Alternatives_4
>+ // $ANTLR start "rule__PropertyRule__Alternatives_4"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:379:1: rule__PropertyRule__Alternatives_4 : ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );
> public final void rule__PropertyRule__Alternatives_4() throws RecognitionException {
> 
>@@ -925,7 +976,7 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("379:1: rule__PropertyRule__Alternatives_4 : ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );", 1, 0, input);
>+ new NoViableAltException("", 1, 0, input);
> 
> throw nvae;
> }
>@@ -942,8 +993,9 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__TypeAssignment_4_0_in_rule__PropertyRule__Alternatives_4742);
> rule__PropertyRule__TypeAssignment_4_0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -983,10 +1035,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Alternatives_4
>+ // $ANTLR end "rule__PropertyRule__Alternatives_4"
> 
> 
>- // $ANTLR start rule__ModifierSpecification__Alternatives
>+ // $ANTLR start "rule__ModifierSpecification__Alternatives"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:403:1: rule__ModifierSpecification__Alternatives : ( ( ( rule__ModifierSpecification__ValueAssignment_0 ) ) | ( ( rule__ModifierSpecification__RedefinesAssignment_1 ) ) | ( ( rule__ModifierSpecification__SubsetsAssignment_2 ) ) );
> public final void rule__ModifierSpecification__Alternatives() throws RecognitionException {
> 
>@@ -1016,7 +1068,7 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("403:1: rule__ModifierSpecification__Alternatives : ( ( ( rule__ModifierSpecification__ValueAssignment_0 ) ) | ( ( rule__ModifierSpecification__RedefinesAssignment_1 ) ) | ( ( rule__ModifierSpecification__SubsetsAssignment_2 ) ) );", 2, 0, input);
>+ new NoViableAltException("", 2, 0, input);
> 
> throw nvae;
> }
>@@ -1034,7 +1086,8 @@
> {
> pushFollow(FOLLOW_rule__ModifierSpecification__ValueAssignment_0_in_rule__ModifierSpecification__Alternatives795);
> rule__ModifierSpecification__ValueAssignment_0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1058,7 +1111,8 @@
> {
> pushFollow(FOLLOW_rule__ModifierSpecification__RedefinesAssignment_1_in_rule__ModifierSpecification__Alternatives813);
> rule__ModifierSpecification__RedefinesAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1082,7 +1136,8 @@
> {
> pushFollow(FOLLOW_rule__ModifierSpecification__SubsetsAssignment_2_in_rule__ModifierSpecification__Alternatives831);
> rule__ModifierSpecification__SubsetsAssignment_2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1108,10 +1163,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifierSpecification__Alternatives
>+ // $ANTLR end "rule__ModifierSpecification__Alternatives"
> 
> 
>- // $ANTLR start rule__VisibilityKind__Alternatives
>+ // $ANTLR start "rule__VisibilityKind__Alternatives"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:431:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );
> public final void rule__VisibilityKind__Alternatives() throws RecognitionException {
> 
>@@ -1143,7 +1198,7 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("431:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );", 3, 0, input);
>+ new NoViableAltException("", 3, 0, input);
> 
> throw nvae;
> }
>@@ -1247,10 +1302,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__VisibilityKind__Alternatives
>+ // $ANTLR end "rule__VisibilityKind__Alternatives"
> 
> 
>- // $ANTLR start rule__ModifierKind__Alternatives
>+ // $ANTLR start "rule__ModifierKind__Alternatives"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:469:1: rule__ModifierKind__Alternatives : ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );
> public final void rule__ModifierKind__Alternatives() throws RecognitionException {
> 
>@@ -1282,7 +1337,7 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("469:1: rule__ModifierKind__Alternatives : ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );", 4, 0, input);
>+ new NoViableAltException("", 4, 0, input);
> 
> throw nvae;
> }
>@@ -1386,10 +1441,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifierKind__Alternatives
>+ // $ANTLR end "rule__ModifierKind__Alternatives"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__0
>+ // $ANTLR start "rule__PropertyRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:509:1: rule__PropertyRule__Group__0 : rule__PropertyRule__Group__0__Impl rule__PropertyRule__Group__1 ;
> public final void rule__PropertyRule__Group__0() throws RecognitionException {
> 
>@@ -1401,11 +1456,13 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__0__Impl_in_rule__PropertyRule__Group__01060);
> rule__PropertyRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__1_in_rule__PropertyRule__Group__01063);
> rule__PropertyRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1422,10 +1479,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__0
>+ // $ANTLR end "rule__PropertyRule__Group__0"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__0__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:521:1: rule__PropertyRule__Group__0__Impl : ( ( rule__PropertyRule__VisibilityAssignment_0 ) ) ;
> public final void rule__PropertyRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -1444,7 +1501,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__VisibilityAssignment_0_in_rule__PropertyRule__Group__0__Impl1090);
> rule__PropertyRule__VisibilityAssignment_0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1468,10 +1526,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__0__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__1
>+ // $ANTLR start "rule__PropertyRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:538:1: rule__PropertyRule__Group__1 : rule__PropertyRule__Group__1__Impl rule__PropertyRule__Group__2 ;
> public final void rule__PropertyRule__Group__1() throws RecognitionException {
> 
>@@ -1483,12 +1541,14 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__1__Impl_in_rule__PropertyRule__Group__11120);
> rule__PropertyRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__2_in_rule__PropertyRule__Group__11123);
> rule__PropertyRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1504,10 +1564,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__1
>+ // $ANTLR end "rule__PropertyRule__Group__1"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__1__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:550:1: rule__PropertyRule__Group__1__Impl : ( ( rule__PropertyRule__IsDerivedAssignment_1 )? ) ;
> public final void rule__PropertyRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1534,7 +1594,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__IsDerivedAssignment_1_in_rule__PropertyRule__Group__1__Impl1150);
> rule__PropertyRule__IsDerivedAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1561,10 +1622,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__1__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__2
>+ // $ANTLR start "rule__PropertyRule__Group__2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:567:1: rule__PropertyRule__Group__2 : rule__PropertyRule__Group__2__Impl rule__PropertyRule__Group__3 ;
> public final void rule__PropertyRule__Group__2() throws RecognitionException {
> 
>@@ -1576,12 +1637,14 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__2__Impl_in_rule__PropertyRule__Group__21181);
> rule__PropertyRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__3_in_rule__PropertyRule__Group__21184);
> rule__PropertyRule__Group__3();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1597,10 +1660,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__2
>+ // $ANTLR end "rule__PropertyRule__Group__2"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__2__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__2__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:579:1: rule__PropertyRule__Group__2__Impl : ( ( rule__PropertyRule__NameAssignment_2 ) ) ;
> public final void rule__PropertyRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -1619,8 +1682,9 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__NameAssignment_2_in_rule__PropertyRule__Group__2__Impl1211);
> rule__PropertyRule__NameAssignment_2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1643,10 +1707,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__2__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__3
>+ // $ANTLR start "rule__PropertyRule__Group__3"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:596:1: rule__PropertyRule__Group__3 : rule__PropertyRule__Group__3__Impl rule__PropertyRule__Group__4 ;
> public final void rule__PropertyRule__Group__3() throws RecognitionException {
> 
>@@ -1658,11 +1722,13 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__3__Impl_in_rule__PropertyRule__Group__31241);
> rule__PropertyRule__Group__3__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__4_in_rule__PropertyRule__Group__31244);
> rule__PropertyRule__Group__4();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1679,10 +1745,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__3
>+ // $ANTLR end "rule__PropertyRule__Group__3"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__3__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__3__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:608:1: rule__PropertyRule__Group__3__Impl : ( ':' ) ;
> public final void rule__PropertyRule__Group__3__Impl() throws RecognitionException {
> 
>@@ -1716,10 +1782,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__3__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__3__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__4
>+ // $ANTLR start "rule__PropertyRule__Group__4"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:627:1: rule__PropertyRule__Group__4 : rule__PropertyRule__Group__4__Impl rule__PropertyRule__Group__5 ;
> public final void rule__PropertyRule__Group__4() throws RecognitionException {
> 
>@@ -1731,11 +1797,13 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__4__Impl_in_rule__PropertyRule__Group__41303);
> rule__PropertyRule__Group__4__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__5_in_rule__PropertyRule__Group__41306);
> rule__PropertyRule__Group__5();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1752,10 +1820,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__4
>+ // $ANTLR end "rule__PropertyRule__Group__4"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__4__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__4__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:639:1: rule__PropertyRule__Group__4__Impl : ( ( rule__PropertyRule__Alternatives_4 ) ) ;
> public final void rule__PropertyRule__Group__4__Impl() throws RecognitionException {
> 
>@@ -1774,7 +1842,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Alternatives_4_in_rule__PropertyRule__Group__4__Impl1333);
> rule__PropertyRule__Alternatives_4();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1798,10 +1867,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__4__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__4__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__5
>+ // $ANTLR start "rule__PropertyRule__Group__5"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:656:1: rule__PropertyRule__Group__5 : rule__PropertyRule__Group__5__Impl rule__PropertyRule__Group__6 ;
> public final void rule__PropertyRule__Group__5() throws RecognitionException {
> 
>@@ -1813,11 +1882,13 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__5__Impl_in_rule__PropertyRule__Group__51363);
> rule__PropertyRule__Group__5__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__6_in_rule__PropertyRule__Group__51366);
> rule__PropertyRule__Group__6();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1834,10 +1905,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__5
>+ // $ANTLR end "rule__PropertyRule__Group__5"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__5__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__5__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:668:1: rule__PropertyRule__Group__5__Impl : ( ( rule__PropertyRule__MultiplicityAssignment_5 )? ) ;
> public final void rule__PropertyRule__Group__5__Impl() throws RecognitionException {
> 
>@@ -1864,7 +1935,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__MultiplicityAssignment_5_in_rule__PropertyRule__Group__5__Impl1393);
> rule__PropertyRule__MultiplicityAssignment_5();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1891,10 +1963,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__5__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__5__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__6
>+ // $ANTLR start "rule__PropertyRule__Group__6"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:685:1: rule__PropertyRule__Group__6 : rule__PropertyRule__Group__6__Impl rule__PropertyRule__Group__7 ;
> public final void rule__PropertyRule__Group__6() throws RecognitionException {
> 
>@@ -1906,12 +1978,14 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__6__Impl_in_rule__PropertyRule__Group__61424);
> rule__PropertyRule__Group__6__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__PropertyRule__Group__7_in_rule__PropertyRule__Group__61427);
> rule__PropertyRule__Group__7();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1927,10 +2001,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__6
>+ // $ANTLR end "rule__PropertyRule__Group__6"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__6__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__6__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:697:1: rule__PropertyRule__Group__6__Impl : ( ( rule__PropertyRule__ModifiersAssignment_6 )? ) ;
> public final void rule__PropertyRule__Group__6__Impl() throws RecognitionException {
> 
>@@ -1957,8 +2031,9 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__ModifiersAssignment_6_in_rule__PropertyRule__Group__6__Impl1454);
> rule__PropertyRule__ModifiersAssignment_6();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -1984,10 +2059,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__6__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__6__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__7
>+ // $ANTLR start "rule__PropertyRule__Group__7"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:714:1: rule__PropertyRule__Group__7 : rule__PropertyRule__Group__7__Impl ;
> public final void rule__PropertyRule__Group__7() throws RecognitionException {
> 
>@@ -1999,7 +2074,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__Group__7__Impl_in_rule__PropertyRule__Group__71485);
> rule__PropertyRule__Group__7__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2016,10 +2092,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__7
>+ // $ANTLR end "rule__PropertyRule__Group__7"
> 
> 
>- // $ANTLR start rule__PropertyRule__Group__7__Impl
>+ // $ANTLR start "rule__PropertyRule__Group__7__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:725:1: rule__PropertyRule__Group__7__Impl : ( ( rule__PropertyRule__DefaultAssignment_7 )? ) ;
> public final void rule__PropertyRule__Group__7__Impl() throws RecognitionException {
> 
>@@ -2046,7 +2122,8 @@
> {
> pushFollow(FOLLOW_rule__PropertyRule__DefaultAssignment_7_in_rule__PropertyRule__Group__7__Impl1512);
> rule__PropertyRule__DefaultAssignment_7();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2073,10 +2150,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__Group__7__Impl
>+ // $ANTLR end "rule__PropertyRule__Group__7__Impl"
> 
> 
>- // $ANTLR start rule__TypeRule__Group__0
>+ // $ANTLR start "rule__TypeRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:758:1: rule__TypeRule__Group__0 : rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1 ;
> public final void rule__TypeRule__Group__0() throws RecognitionException {
> 
>@@ -2088,12 +2165,14 @@
> {
> pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__01559);
> rule__TypeRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__01562);
> rule__TypeRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2109,10 +2188,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TypeRule__Group__0
>+ // $ANTLR end "rule__TypeRule__Group__0"
> 
> 
>- // $ANTLR start rule__TypeRule__Group__0__Impl
>+ // $ANTLR start "rule__TypeRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:770:1: rule__TypeRule__Group__0__Impl : ( ( rule__TypeRule__PathAssignment_0 )? ) ;
> public final void rule__TypeRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2143,8 +2222,9 @@
> {
> pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl1589);
> rule__TypeRule__PathAssignment_0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -2170,10 +2250,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TypeRule__Group__0__Impl
>+ // $ANTLR end "rule__TypeRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__TypeRule__Group__1
>+ // $ANTLR start "rule__TypeRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:787:1: rule__TypeRule__Group__1 : rule__TypeRule__Group__1__Impl ;
> public final void rule__TypeRule__Group__1() throws RecognitionException {
> 
>@@ -2185,7 +2265,8 @@
> {
> pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__11620);
> rule__TypeRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2202,10 +2283,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TypeRule__Group__1
>+ // $ANTLR end "rule__TypeRule__Group__1"
> 
> 
>- // $ANTLR start rule__TypeRule__Group__1__Impl
>+ // $ANTLR start "rule__TypeRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:798:1: rule__TypeRule__Group__1__Impl : ( ( rule__TypeRule__TypeAssignment_1 ) ) ;
> public final void rule__TypeRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2224,7 +2305,8 @@
> {
> pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl1647);
> rule__TypeRule__TypeAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2248,10 +2330,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TypeRule__Group__1__Impl
>+ // $ANTLR end "rule__TypeRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__0
>+ // $ANTLR start "rule__QualifiedName__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:819:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
> public final void rule__QualifiedName__Group__0() throws RecognitionException {
> 
>@@ -2263,11 +2345,13 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__01681);
> rule__QualifiedName__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__01684);
> rule__QualifiedName__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2284,10 +2368,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__0
>+ // $ANTLR end "rule__QualifiedName__Group__0"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__0__Impl
>+ // $ANTLR start "rule__QualifiedName__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:831:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
> public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
> 
>@@ -2306,7 +2390,8 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1711);
> rule__QualifiedName__PathAssignment_0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2330,10 +2415,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__0__Impl
>+ // $ANTLR end "rule__QualifiedName__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__1
>+ // $ANTLR start "rule__QualifiedName__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:848:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
> public final void rule__QualifiedName__Group__1() throws RecognitionException {
> 
>@@ -2345,11 +2430,13 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11741);
> rule__QualifiedName__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11744);
> rule__QualifiedName__Group__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2366,10 +2453,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__1
>+ // $ANTLR end "rule__QualifiedName__Group__1"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__1__Impl
>+ // $ANTLR start "rule__QualifiedName__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:860:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
> public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
> 
>@@ -2403,10 +2490,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__1__Impl
>+ // $ANTLR end "rule__QualifiedName__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__2
>+ // $ANTLR start "rule__QualifiedName__Group__2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:879:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
> public final void rule__QualifiedName__Group__2() throws RecognitionException {
> 
>@@ -2418,7 +2505,8 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21803);
> rule__QualifiedName__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2435,10 +2523,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__2
>+ // $ANTLR end "rule__QualifiedName__Group__2"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__2__Impl
>+ // $ANTLR start "rule__QualifiedName__Group__2__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:890:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
> public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
> 
>@@ -2469,7 +2557,8 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1830);
> rule__QualifiedName__RemainingAssignment_2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2496,10 +2585,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__2__Impl
>+ // $ANTLR end "rule__QualifiedName__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__0
>+ // $ANTLR start "rule__MultiplicityRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:913:1: rule__MultiplicityRule__Group__0 : rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1 ;
> public final void rule__MultiplicityRule__Group__0() throws RecognitionException {
> 
>@@ -2511,11 +2600,13 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__01867);
> rule__MultiplicityRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__01870);
> rule__MultiplicityRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2532,10 +2623,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__0
>+ // $ANTLR end "rule__MultiplicityRule__Group__0"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__0__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:925:1: rule__MultiplicityRule__Group__0__Impl : ( '[' ) ;
> public final void rule__MultiplicityRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2569,10 +2660,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__0__Impl
>+ // $ANTLR end "rule__MultiplicityRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__1
>+ // $ANTLR start "rule__MultiplicityRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:944:1: rule__MultiplicityRule__Group__1 : rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2 ;
> public final void rule__MultiplicityRule__Group__1() throws RecognitionException {
> 
>@@ -2584,11 +2675,13 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__11929);
> rule__MultiplicityRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__11932);
> rule__MultiplicityRule__Group__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2605,10 +2698,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__1
>+ // $ANTLR end "rule__MultiplicityRule__Group__1"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__1__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:956:1: rule__MultiplicityRule__Group__1__Impl : ( ( rule__MultiplicityRule__BoundsAssignment_1 ) ) ;
> public final void rule__MultiplicityRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2627,7 +2720,8 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl1959);
> rule__MultiplicityRule__BoundsAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2651,10 +2745,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__1__Impl
>+ // $ANTLR end "rule__MultiplicityRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__2
>+ // $ANTLR start "rule__MultiplicityRule__Group__2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:973:1: rule__MultiplicityRule__Group__2 : rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3 ;
> public final void rule__MultiplicityRule__Group__2() throws RecognitionException {
> 
>@@ -2666,11 +2760,13 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__21989);
> rule__MultiplicityRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__21992);
> rule__MultiplicityRule__Group__3();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2687,10 +2783,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__2
>+ // $ANTLR end "rule__MultiplicityRule__Group__2"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__2__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group__2__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:985:1: rule__MultiplicityRule__Group__2__Impl : ( ( rule__MultiplicityRule__Group_2__0 )? ) ;
> public final void rule__MultiplicityRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -2717,8 +2813,9 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2019);
> rule__MultiplicityRule__Group_2__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -2744,10 +2841,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__2__Impl
>+ // $ANTLR end "rule__MultiplicityRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__3
>+ // $ANTLR start "rule__MultiplicityRule__Group__3"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1002:1: rule__MultiplicityRule__Group__3 : rule__MultiplicityRule__Group__3__Impl ;
> public final void rule__MultiplicityRule__Group__3() throws RecognitionException {
> 
>@@ -2759,8 +2856,9 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32050);
> rule__MultiplicityRule__Group__3__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2776,10 +2874,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__3
>+ // $ANTLR end "rule__MultiplicityRule__Group__3"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group__3__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group__3__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1013:1: rule__MultiplicityRule__Group__3__Impl : ( ']' ) ;
> public final void rule__MultiplicityRule__Group__3__Impl() throws RecognitionException {
> 
>@@ -2813,10 +2911,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group__3__Impl
>+ // $ANTLR end "rule__MultiplicityRule__Group__3__Impl"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group_2__0
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1040:1: rule__MultiplicityRule__Group_2__0 : rule__MultiplicityRule__Group_2__0__Impl rule__MultiplicityRule__Group_2__1 ;
> public final void rule__MultiplicityRule__Group_2__0() throws RecognitionException {
> 
>@@ -2828,11 +2926,13 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02117);
> rule__MultiplicityRule__Group_2__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02120);
> rule__MultiplicityRule__Group_2__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2849,10 +2949,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group_2__0
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__0"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group_2__0__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1052:1: rule__MultiplicityRule__Group_2__0__Impl : ( '..' ) ;
> public final void rule__MultiplicityRule__Group_2__0__Impl() throws RecognitionException {
> 
>@@ -2886,10 +2986,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group_2__0__Impl
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__0__Impl"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group_2__1
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1071:1: rule__MultiplicityRule__Group_2__1 : rule__MultiplicityRule__Group_2__1__Impl ;
> public final void rule__MultiplicityRule__Group_2__1() throws RecognitionException {
> 
>@@ -2901,7 +3001,8 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12179);
> rule__MultiplicityRule__Group_2__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2918,10 +3019,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group_2__1
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__1"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__Group_2__1__Impl
>+ // $ANTLR start "rule__MultiplicityRule__Group_2__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1082:1: rule__MultiplicityRule__Group_2__1__Impl : ( ( rule__MultiplicityRule__BoundsAssignment_2_1 ) ) ;
> public final void rule__MultiplicityRule__Group_2__1__Impl() throws RecognitionException {
> 
>@@ -2940,7 +3041,8 @@
> {
> pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2206);
> rule__MultiplicityRule__BoundsAssignment_2_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2964,10 +3066,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__Group_2__1__Impl
>+ // $ANTLR end "rule__MultiplicityRule__Group_2__1__Impl"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__0
>+ // $ANTLR start "rule__ModifiersRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1103:1: rule__ModifiersRule__Group__0 : rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1 ;
> public final void rule__ModifiersRule__Group__0() throws RecognitionException {
> 
>@@ -2979,11 +3081,13 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__02240);
> rule__ModifiersRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__02243);
> rule__ModifiersRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3000,10 +3104,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__0
>+ // $ANTLR end "rule__ModifiersRule__Group__0"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__0__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1115:1: rule__ModifiersRule__Group__0__Impl : ( '{' ) ;
> public final void rule__ModifiersRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -3037,10 +3141,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__0__Impl
>+ // $ANTLR end "rule__ModifiersRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__1
>+ // $ANTLR start "rule__ModifiersRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1134:1: rule__ModifiersRule__Group__1 : rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2 ;
> public final void rule__ModifiersRule__Group__1() throws RecognitionException {
> 
>@@ -3052,12 +3156,14 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__12302);
> rule__ModifiersRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__12305);
> rule__ModifiersRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3073,10 +3179,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__1
>+ // $ANTLR end "rule__ModifiersRule__Group__1"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__1__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1146:1: rule__ModifiersRule__Group__1__Impl : ( ( rule__ModifiersRule__ValuesAssignment_1 ) ) ;
> public final void rule__ModifiersRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -3095,7 +3201,8 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl2332);
> rule__ModifiersRule__ValuesAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3119,10 +3226,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__1__Impl
>+ // $ANTLR end "rule__ModifiersRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__2
>+ // $ANTLR start "rule__ModifiersRule__Group__2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1163:1: rule__ModifiersRule__Group__2 : rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3 ;
> public final void rule__ModifiersRule__Group__2() throws RecognitionException {
> 
>@@ -3134,12 +3241,14 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__22362);
> rule__ModifiersRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__22365);
> rule__ModifiersRule__Group__3();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3155,10 +3264,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__2
>+ // $ANTLR end "rule__ModifiersRule__Group__2"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__2__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group__2__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1175:1: rule__ModifiersRule__Group__2__Impl : ( ( rule__ModifiersRule__Group_2__0 )* ) ;
> public final void rule__ModifiersRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -3189,8 +3298,9 @@
> 	 {
> 	 pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl2392);
> 	 rule__ModifiersRule__Group_2__0();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 }
> 	 break;
>@@ -3219,10 +3329,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__2__Impl
>+ // $ANTLR end "rule__ModifiersRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__3
>+ // $ANTLR start "rule__ModifiersRule__Group__3"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1192:1: rule__ModifiersRule__Group__3 : rule__ModifiersRule__Group__3__Impl ;
> public final void rule__ModifiersRule__Group__3() throws RecognitionException {
> 
>@@ -3234,8 +3344,9 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__32423);
> rule__ModifiersRule__Group__3__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3251,10 +3362,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__3
>+ // $ANTLR end "rule__ModifiersRule__Group__3"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group__3__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group__3__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1203:1: rule__ModifiersRule__Group__3__Impl : ( '}' ) ;
> public final void rule__ModifiersRule__Group__3__Impl() throws RecognitionException {
> 
>@@ -3288,10 +3399,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group__3__Impl
>+ // $ANTLR end "rule__ModifiersRule__Group__3__Impl"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group_2__0
>+ // $ANTLR start "rule__ModifiersRule__Group_2__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1230:1: rule__ModifiersRule__Group_2__0 : rule__ModifiersRule__Group_2__0__Impl rule__ModifiersRule__Group_2__1 ;
> public final void rule__ModifiersRule__Group_2__0() throws RecognitionException {
> 
>@@ -3303,12 +3414,14 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__02490);
> rule__ModifiersRule__Group_2__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__02493);
> rule__ModifiersRule__Group_2__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3324,10 +3437,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group_2__0
>+ // $ANTLR end "rule__ModifiersRule__Group_2__0"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group_2__0__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group_2__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1242:1: rule__ModifiersRule__Group_2__0__Impl : ( ',' ) ;
> public final void rule__ModifiersRule__Group_2__0__Impl() throws RecognitionException {
> 
>@@ -3361,10 +3474,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group_2__0__Impl
>+ // $ANTLR end "rule__ModifiersRule__Group_2__0__Impl"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group_2__1
>+ // $ANTLR start "rule__ModifiersRule__Group_2__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1261:1: rule__ModifiersRule__Group_2__1 : rule__ModifiersRule__Group_2__1__Impl ;
> public final void rule__ModifiersRule__Group_2__1() throws RecognitionException {
> 
>@@ -3376,7 +3489,8 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__12552);
> rule__ModifiersRule__Group_2__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3393,10 +3507,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group_2__1
>+ // $ANTLR end "rule__ModifiersRule__Group_2__1"
> 
> 
>- // $ANTLR start rule__ModifiersRule__Group_2__1__Impl
>+ // $ANTLR start "rule__ModifiersRule__Group_2__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1272:1: rule__ModifiersRule__Group_2__1__Impl : ( ( rule__ModifiersRule__ValuesAssignment_2_1 ) ) ;
> public final void rule__ModifiersRule__Group_2__1__Impl() throws RecognitionException {
> 
>@@ -3415,7 +3529,8 @@
> {
> pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl2579);
> rule__ModifiersRule__ValuesAssignment_2_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3439,10 +3554,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__Group_2__1__Impl
>+ // $ANTLR end "rule__ModifiersRule__Group_2__1__Impl"
> 
> 
>- // $ANTLR start rule__RedefinesRule__Group__0
>+ // $ANTLR start "rule__RedefinesRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1293:1: rule__RedefinesRule__Group__0 : rule__RedefinesRule__Group__0__Impl rule__RedefinesRule__Group__1 ;
> public final void rule__RedefinesRule__Group__0() throws RecognitionException {
> 
>@@ -3454,11 +3569,13 @@
> {
> pushFollow(FOLLOW_rule__RedefinesRule__Group__0__Impl_in_rule__RedefinesRule__Group__02613);
> rule__RedefinesRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__RedefinesRule__Group__1_in_rule__RedefinesRule__Group__02616);
> rule__RedefinesRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3475,10 +3592,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RedefinesRule__Group__0
>+ // $ANTLR end "rule__RedefinesRule__Group__0"
> 
> 
>- // $ANTLR start rule__RedefinesRule__Group__0__Impl
>+ // $ANTLR start "rule__RedefinesRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1305:1: rule__RedefinesRule__Group__0__Impl : ( 'redefines' ) ;
> public final void rule__RedefinesRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -3512,10 +3629,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RedefinesRule__Group__0__Impl
>+ // $ANTLR end "rule__RedefinesRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__RedefinesRule__Group__1
>+ // $ANTLR start "rule__RedefinesRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1324:1: rule__RedefinesRule__Group__1 : rule__RedefinesRule__Group__1__Impl ;
> public final void rule__RedefinesRule__Group__1() throws RecognitionException {
> 
>@@ -3527,7 +3644,8 @@
> {
> pushFollow(FOLLOW_rule__RedefinesRule__Group__1__Impl_in_rule__RedefinesRule__Group__12675);
> rule__RedefinesRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3544,10 +3662,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RedefinesRule__Group__1
>+ // $ANTLR end "rule__RedefinesRule__Group__1"
> 
> 
>- // $ANTLR start rule__RedefinesRule__Group__1__Impl
>+ // $ANTLR start "rule__RedefinesRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1335:1: rule__RedefinesRule__Group__1__Impl : ( ( rule__RedefinesRule__PropertyAssignment_1 ) ) ;
> public final void rule__RedefinesRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -3566,7 +3684,8 @@
> {
> pushFollow(FOLLOW_rule__RedefinesRule__PropertyAssignment_1_in_rule__RedefinesRule__Group__1__Impl2702);
> rule__RedefinesRule__PropertyAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3590,10 +3709,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RedefinesRule__Group__1__Impl
>+ // $ANTLR end "rule__RedefinesRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__SubsetsRule__Group__0
>+ // $ANTLR start "rule__SubsetsRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1356:1: rule__SubsetsRule__Group__0 : rule__SubsetsRule__Group__0__Impl rule__SubsetsRule__Group__1 ;
> public final void rule__SubsetsRule__Group__0() throws RecognitionException {
> 
>@@ -3605,12 +3724,14 @@
> {
> pushFollow(FOLLOW_rule__SubsetsRule__Group__0__Impl_in_rule__SubsetsRule__Group__02736);
> rule__SubsetsRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__SubsetsRule__Group__1_in_rule__SubsetsRule__Group__02739);
> rule__SubsetsRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3626,10 +3747,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubsetsRule__Group__0
>+ // $ANTLR end "rule__SubsetsRule__Group__0"
> 
> 
>- // $ANTLR start rule__SubsetsRule__Group__0__Impl
>+ // $ANTLR start "rule__SubsetsRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1368:1: rule__SubsetsRule__Group__0__Impl : ( 'subsets' ) ;
> public final void rule__SubsetsRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -3663,10 +3784,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubsetsRule__Group__0__Impl
>+ // $ANTLR end "rule__SubsetsRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__SubsetsRule__Group__1
>+ // $ANTLR start "rule__SubsetsRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1387:1: rule__SubsetsRule__Group__1 : rule__SubsetsRule__Group__1__Impl ;
> public final void rule__SubsetsRule__Group__1() throws RecognitionException {
> 
>@@ -3678,7 +3799,8 @@
> {
> pushFollow(FOLLOW_rule__SubsetsRule__Group__1__Impl_in_rule__SubsetsRule__Group__12798);
> rule__SubsetsRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3695,10 +3817,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubsetsRule__Group__1
>+ // $ANTLR end "rule__SubsetsRule__Group__1"
> 
> 
>- // $ANTLR start rule__SubsetsRule__Group__1__Impl
>+ // $ANTLR start "rule__SubsetsRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1398:1: rule__SubsetsRule__Group__1__Impl : ( ( rule__SubsetsRule__PropertyAssignment_1 ) ) ;
> public final void rule__SubsetsRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -3717,7 +3839,8 @@
> {
> pushFollow(FOLLOW_rule__SubsetsRule__PropertyAssignment_1_in_rule__SubsetsRule__Group__1__Impl2825);
> rule__SubsetsRule__PropertyAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3741,10 +3864,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubsetsRule__Group__1__Impl
>+ // $ANTLR end "rule__SubsetsRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__DefaultValueRule__Group__0
>+ // $ANTLR start "rule__DefaultValueRule__Group__0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1419:1: rule__DefaultValueRule__Group__0 : rule__DefaultValueRule__Group__0__Impl rule__DefaultValueRule__Group__1 ;
> public final void rule__DefaultValueRule__Group__0() throws RecognitionException {
> 
>@@ -3756,12 +3879,14 @@
> {
> pushFollow(FOLLOW_rule__DefaultValueRule__Group__0__Impl_in_rule__DefaultValueRule__Group__02859);
> rule__DefaultValueRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__DefaultValueRule__Group__1_in_rule__DefaultValueRule__Group__02862);
> rule__DefaultValueRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3777,10 +3902,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DefaultValueRule__Group__0
>+ // $ANTLR end "rule__DefaultValueRule__Group__0"
> 
> 
>- // $ANTLR start rule__DefaultValueRule__Group__0__Impl
>+ // $ANTLR start "rule__DefaultValueRule__Group__0__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1431:1: rule__DefaultValueRule__Group__0__Impl : ( '=' ) ;
> public final void rule__DefaultValueRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -3814,10 +3939,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DefaultValueRule__Group__0__Impl
>+ // $ANTLR end "rule__DefaultValueRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__DefaultValueRule__Group__1
>+ // $ANTLR start "rule__DefaultValueRule__Group__1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1450:1: rule__DefaultValueRule__Group__1 : rule__DefaultValueRule__Group__1__Impl ;
> public final void rule__DefaultValueRule__Group__1() throws RecognitionException {
> 
>@@ -3829,8 +3954,9 @@
> {
> pushFollow(FOLLOW_rule__DefaultValueRule__Group__1__Impl_in_rule__DefaultValueRule__Group__12921);
> rule__DefaultValueRule__Group__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -3846,10 +3972,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DefaultValueRule__Group__1
>+ // $ANTLR end "rule__DefaultValueRule__Group__1"
> 
> 
>- // $ANTLR start rule__DefaultValueRule__Group__1__Impl
>+ // $ANTLR start "rule__DefaultValueRule__Group__1__Impl"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1461:1: rule__DefaultValueRule__Group__1__Impl : ( ( rule__DefaultValueRule__DefaultAssignment_1 ) ) ;
> public final void rule__DefaultValueRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -3868,7 +3994,8 @@
> {
> pushFollow(FOLLOW_rule__DefaultValueRule__DefaultAssignment_1_in_rule__DefaultValueRule__Group__1__Impl2948);
> rule__DefaultValueRule__DefaultAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -3892,10 +4019,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DefaultValueRule__Group__1__Impl
>+ // $ANTLR end "rule__DefaultValueRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__PropertyRule__VisibilityAssignment_0
>+ // $ANTLR start "rule__PropertyRule__VisibilityAssignment_0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1483:1: rule__PropertyRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ;
> public final void rule__PropertyRule__VisibilityAssignment_0() throws RecognitionException {
> 
>@@ -3911,7 +4038,8 @@
> before(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> pushFollow(FOLLOW_ruleVisibilityKind_in_rule__PropertyRule__VisibilityAssignment_02987);
> ruleVisibilityKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 
>@@ -3932,10 +4060,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__VisibilityAssignment_0
>+ // $ANTLR end "rule__PropertyRule__VisibilityAssignment_0"
> 
> 
>- // $ANTLR start rule__PropertyRule__IsDerivedAssignment_1
>+ // $ANTLR start "rule__PropertyRule__IsDerivedAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1498:1: rule__PropertyRule__IsDerivedAssignment_1 : ( ( '/' ) ) ;
> public final void rule__PropertyRule__IsDerivedAssignment_1() throws RecognitionException {
> 
>@@ -3977,10 +4105,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__IsDerivedAssignment_1
>+ // $ANTLR end "rule__PropertyRule__IsDerivedAssignment_1"
> 
> 
>- // $ANTLR start rule__PropertyRule__NameAssignment_2
>+ // $ANTLR start "rule__PropertyRule__NameAssignment_2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1521:1: rule__PropertyRule__NameAssignment_2 : ( RULE_ID ) ;
> public final void rule__PropertyRule__NameAssignment_2() throws RecognitionException {
> 
>@@ -4014,10 +4142,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__NameAssignment_2
>+ // $ANTLR end "rule__PropertyRule__NameAssignment_2"
> 
> 
>- // $ANTLR start rule__PropertyRule__TypeAssignment_4_0
>+ // $ANTLR start "rule__PropertyRule__TypeAssignment_4_0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1536:1: rule__PropertyRule__TypeAssignment_4_0 : ( ruleTypeRule ) ;
> public final void rule__PropertyRule__TypeAssignment_4_0() throws RecognitionException {
> 
>@@ -4033,7 +4161,8 @@
> before(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
> pushFollow(FOLLOW_ruleTypeRule_in_rule__PropertyRule__TypeAssignment_4_03093);
> ruleTypeRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
> 
>@@ -4054,10 +4183,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__TypeAssignment_4_0
>+ // $ANTLR end "rule__PropertyRule__TypeAssignment_4_0"
> 
> 
>- // $ANTLR start rule__PropertyRule__MultiplicityAssignment_5
>+ // $ANTLR start "rule__PropertyRule__MultiplicityAssignment_5"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1551:1: rule__PropertyRule__MultiplicityAssignment_5 : ( ruleMultiplicityRule ) ;
> public final void rule__PropertyRule__MultiplicityAssignment_5() throws RecognitionException {
> 
>@@ -4073,7 +4202,8 @@
> before(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
> pushFollow(FOLLOW_ruleMultiplicityRule_in_rule__PropertyRule__MultiplicityAssignment_53124);
> ruleMultiplicityRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
> 
>@@ -4094,10 +4224,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__MultiplicityAssignment_5
>+ // $ANTLR end "rule__PropertyRule__MultiplicityAssignment_5"
> 
> 
>- // $ANTLR start rule__PropertyRule__ModifiersAssignment_6
>+ // $ANTLR start "rule__PropertyRule__ModifiersAssignment_6"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1566:1: rule__PropertyRule__ModifiersAssignment_6 : ( ruleModifiersRule ) ;
> public final void rule__PropertyRule__ModifiersAssignment_6() throws RecognitionException {
> 
>@@ -4113,7 +4243,8 @@
> before(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
> pushFollow(FOLLOW_ruleModifiersRule_in_rule__PropertyRule__ModifiersAssignment_63155);
> ruleModifiersRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
> 
>@@ -4134,10 +4265,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__ModifiersAssignment_6
>+ // $ANTLR end "rule__PropertyRule__ModifiersAssignment_6"
> 
> 
>- // $ANTLR start rule__PropertyRule__DefaultAssignment_7
>+ // $ANTLR start "rule__PropertyRule__DefaultAssignment_7"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1581:1: rule__PropertyRule__DefaultAssignment_7 : ( ruleDefaultValueRule ) ;
> public final void rule__PropertyRule__DefaultAssignment_7() throws RecognitionException {
> 
>@@ -4153,7 +4284,8 @@
> before(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); 
> pushFollow(FOLLOW_ruleDefaultValueRule_in_rule__PropertyRule__DefaultAssignment_73186);
> ruleDefaultValueRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); 
> 
>@@ -4174,10 +4306,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__PropertyRule__DefaultAssignment_7
>+ // $ANTLR end "rule__PropertyRule__DefaultAssignment_7"
> 
> 
>- // $ANTLR start rule__TypeRule__PathAssignment_0
>+ // $ANTLR start "rule__TypeRule__PathAssignment_0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1596:1: rule__TypeRule__PathAssignment_0 : ( ruleQualifiedName ) ;
> public final void rule__TypeRule__PathAssignment_0() throws RecognitionException {
> 
>@@ -4193,7 +4325,8 @@
> before(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03217);
> ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 
>@@ -4214,10 +4347,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TypeRule__PathAssignment_0
>+ // $ANTLR end "rule__TypeRule__PathAssignment_0"
> 
> 
>- // $ANTLR start rule__TypeRule__TypeAssignment_1
>+ // $ANTLR start "rule__TypeRule__TypeAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1611:1: rule__TypeRule__TypeAssignment_1 : ( ( RULE_ID ) ) ;
> public final void rule__TypeRule__TypeAssignment_1() throws RecognitionException {
> 
>@@ -4259,10 +4392,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__TypeRule__TypeAssignment_1
>+ // $ANTLR end "rule__TypeRule__TypeAssignment_1"
> 
> 
>- // $ANTLR start rule__QualifiedName__PathAssignment_0
>+ // $ANTLR start "rule__QualifiedName__PathAssignment_0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1630:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
> public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
> 
>@@ -4304,10 +4437,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__PathAssignment_0
>+ // $ANTLR end "rule__QualifiedName__PathAssignment_0"
> 
> 
>- // $ANTLR start rule__QualifiedName__RemainingAssignment_2
>+ // $ANTLR start "rule__QualifiedName__RemainingAssignment_2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1649:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
> public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
> 
>@@ -4323,7 +4456,8 @@
> before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23326);
> ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 
>@@ -4344,10 +4478,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__RemainingAssignment_2
>+ // $ANTLR end "rule__QualifiedName__RemainingAssignment_2"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__BoundsAssignment_1
>+ // $ANTLR start "rule__MultiplicityRule__BoundsAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1664:1: rule__MultiplicityRule__BoundsAssignment_1 : ( ruleBoundSpecification ) ;
> public final void rule__MultiplicityRule__BoundsAssignment_1() throws RecognitionException {
> 
>@@ -4363,7 +4497,8 @@
> before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13357);
> ruleBoundSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
> 
>@@ -4384,10 +4519,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__BoundsAssignment_1
>+ // $ANTLR end "rule__MultiplicityRule__BoundsAssignment_1"
> 
> 
>- // $ANTLR start rule__MultiplicityRule__BoundsAssignment_2_1
>+ // $ANTLR start "rule__MultiplicityRule__BoundsAssignment_2_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1679:1: rule__MultiplicityRule__BoundsAssignment_2_1 : ( ruleBoundSpecification ) ;
> public final void rule__MultiplicityRule__BoundsAssignment_2_1() throws RecognitionException {
> 
>@@ -4403,7 +4538,8 @@
> before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
> pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13388);
> ruleBoundSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
> 
>@@ -4424,10 +4560,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__MultiplicityRule__BoundsAssignment_2_1
>+ // $ANTLR end "rule__MultiplicityRule__BoundsAssignment_2_1"
> 
> 
>- // $ANTLR start rule__BoundSpecification__ValueAssignment
>+ // $ANTLR start "rule__BoundSpecification__ValueAssignment"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1694:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
> public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
> 
>@@ -4461,10 +4597,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__BoundSpecification__ValueAssignment
>+ // $ANTLR end "rule__BoundSpecification__ValueAssignment"
> 
> 
>- // $ANTLR start rule__ModifiersRule__ValuesAssignment_1
>+ // $ANTLR start "rule__ModifiersRule__ValuesAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1709:1: rule__ModifiersRule__ValuesAssignment_1 : ( ruleModifierSpecification ) ;
> public final void rule__ModifiersRule__ValuesAssignment_1() throws RecognitionException {
> 
>@@ -4480,7 +4616,8 @@
> before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13450);
> ruleModifierSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
> 
>@@ -4501,10 +4638,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__ValuesAssignment_1
>+ // $ANTLR end "rule__ModifiersRule__ValuesAssignment_1"
> 
> 
>- // $ANTLR start rule__ModifiersRule__ValuesAssignment_2_1
>+ // $ANTLR start "rule__ModifiersRule__ValuesAssignment_2_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1724:1: rule__ModifiersRule__ValuesAssignment_2_1 : ( ruleModifierSpecification ) ;
> public final void rule__ModifiersRule__ValuesAssignment_2_1() throws RecognitionException {
> 
>@@ -4520,7 +4657,8 @@
> before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
> pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13481);
> ruleModifierSpecification();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
> 
>@@ -4541,10 +4679,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifiersRule__ValuesAssignment_2_1
>+ // $ANTLR end "rule__ModifiersRule__ValuesAssignment_2_1"
> 
> 
>- // $ANTLR start rule__ModifierSpecification__ValueAssignment_0
>+ // $ANTLR start "rule__ModifierSpecification__ValueAssignment_0"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1739:1: rule__ModifierSpecification__ValueAssignment_0 : ( ruleModifierKind ) ;
> public final void rule__ModifierSpecification__ValueAssignment_0() throws RecognitionException {
> 
>@@ -4560,7 +4698,8 @@
> before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); 
> pushFollow(FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment_03512);
> ruleModifierKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); 
> 
>@@ -4581,10 +4720,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifierSpecification__ValueAssignment_0
>+ // $ANTLR end "rule__ModifierSpecification__ValueAssignment_0"
> 
> 
>- // $ANTLR start rule__ModifierSpecification__RedefinesAssignment_1
>+ // $ANTLR start "rule__ModifierSpecification__RedefinesAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1754:1: rule__ModifierSpecification__RedefinesAssignment_1 : ( ruleRedefinesRule ) ;
> public final void rule__ModifierSpecification__RedefinesAssignment_1() throws RecognitionException {
> 
>@@ -4600,7 +4739,8 @@
> before(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleRedefinesRule_in_rule__ModifierSpecification__RedefinesAssignment_13543);
> ruleRedefinesRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); 
> 
>@@ -4621,10 +4761,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifierSpecification__RedefinesAssignment_1
>+ // $ANTLR end "rule__ModifierSpecification__RedefinesAssignment_1"
> 
> 
>- // $ANTLR start rule__ModifierSpecification__SubsetsAssignment_2
>+ // $ANTLR start "rule__ModifierSpecification__SubsetsAssignment_2"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1769:1: rule__ModifierSpecification__SubsetsAssignment_2 : ( ruleSubsetsRule ) ;
> public final void rule__ModifierSpecification__SubsetsAssignment_2() throws RecognitionException {
> 
>@@ -4640,7 +4780,8 @@
> before(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); 
> pushFollow(FOLLOW_ruleSubsetsRule_in_rule__ModifierSpecification__SubsetsAssignment_23574);
> ruleSubsetsRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); 
> 
>@@ -4661,10 +4802,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ModifierSpecification__SubsetsAssignment_2
>+ // $ANTLR end "rule__ModifierSpecification__SubsetsAssignment_2"
> 
> 
>- // $ANTLR start rule__RedefinesRule__PropertyAssignment_1
>+ // $ANTLR start "rule__RedefinesRule__PropertyAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1784:1: rule__RedefinesRule__PropertyAssignment_1 : ( ( RULE_ID ) ) ;
> public final void rule__RedefinesRule__PropertyAssignment_1() throws RecognitionException {
> 
>@@ -4706,10 +4847,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__RedefinesRule__PropertyAssignment_1
>+ // $ANTLR end "rule__RedefinesRule__PropertyAssignment_1"
> 
> 
>- // $ANTLR start rule__SubsetsRule__PropertyAssignment_1
>+ // $ANTLR start "rule__SubsetsRule__PropertyAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1803:1: rule__SubsetsRule__PropertyAssignment_1 : ( ( RULE_ID ) ) ;
> public final void rule__SubsetsRule__PropertyAssignment_1() throws RecognitionException {
> 
>@@ -4751,10 +4892,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubsetsRule__PropertyAssignment_1
>+ // $ANTLR end "rule__SubsetsRule__PropertyAssignment_1"
> 
> 
>- // $ANTLR start rule__DefaultValueRule__DefaultAssignment_1
>+ // $ANTLR start "rule__DefaultValueRule__DefaultAssignment_1"
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1822:1: rule__DefaultValueRule__DefaultAssignment_1 : ( RULE_STRING ) ;
> public final void rule__DefaultValueRule__DefaultAssignment_1() throws RecognitionException {
> 
>@@ -4788,8 +4929,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DefaultValueRule__DefaultAssignment_1
>+ // $ANTLR end "rule__DefaultValueRule__DefaultAssignment_1"
> 
>+ // Delegated rules
>+
> 
> 
> 
>@@ -4841,7 +4984,7 @@
> public static final BitSet FOLLOW_rule__PropertyRule__Group__0__Impl_in_rule__PropertyRule__Group__01060 = new BitSet(new long[]{0x0000000100000010L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__1_in_rule__PropertyRule__Group__01063 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__VisibilityAssignment_0_in_rule__PropertyRule__Group__0__Impl1090 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__PropertyRule__Group__1__Impl_in_rule__PropertyRule__Group__11120 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__PropertyRule__Group__1__Impl_in_rule__PropertyRule__Group__11120 = new BitSet(new long[]{0x0000000100000010L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__2_in_rule__PropertyRule__Group__11123 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__IsDerivedAssignment_1_in_rule__PropertyRule__Group__1__Impl1150 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__2__Impl_in_rule__PropertyRule__Group__21181 = new BitSet(new long[]{0x0000000000200000L});
>@@ -4850,13 +4993,13 @@
> public static final BitSet FOLLOW_rule__PropertyRule__Group__3__Impl_in_rule__PropertyRule__Group__31241 = new BitSet(new long[]{0x0000000000001010L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__4_in_rule__PropertyRule__Group__31244 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_21_in_rule__PropertyRule__Group__3__Impl1272 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__PropertyRule__Group__4__Impl_in_rule__PropertyRule__Group__41303 = new BitSet(new long[]{0x0000000084800002L});
>+ public static final BitSet FOLLOW_rule__PropertyRule__Group__4__Impl_in_rule__PropertyRule__Group__41303 = new BitSet(new long[]{0x0000000084800000L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__5_in_rule__PropertyRule__Group__41306 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__Alternatives_4_in_rule__PropertyRule__Group__4__Impl1333 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__PropertyRule__Group__5__Impl_in_rule__PropertyRule__Group__51363 = new BitSet(new long[]{0x0000000084000002L});
>+ public static final BitSet FOLLOW_rule__PropertyRule__Group__5__Impl_in_rule__PropertyRule__Group__51363 = new BitSet(new long[]{0x0000000084800000L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__6_in_rule__PropertyRule__Group__51366 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__MultiplicityAssignment_5_in_rule__PropertyRule__Group__5__Impl1393 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__PropertyRule__Group__6__Impl_in_rule__PropertyRule__Group__61424 = new BitSet(new long[]{0x0000000080000002L});
>+ public static final BitSet FOLLOW_rule__PropertyRule__Group__6__Impl_in_rule__PropertyRule__Group__61424 = new BitSet(new long[]{0x0000000084800000L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__7_in_rule__PropertyRule__Group__61427 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__ModifiersAssignment_6_in_rule__PropertyRule__Group__6__Impl1454 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__PropertyRule__Group__7__Impl_in_rule__PropertyRule__Group__71485 = new BitSet(new long[]{0x0000000000000002L});
>@@ -4869,7 +5012,7 @@
> public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__01681 = new BitSet(new long[]{0x0000000000400000L});
> public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__01684 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1711 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11741 = new BitSet(new long[]{0x0000000000000012L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11741 = new BitSet(new long[]{0x0000000000000010L});
> public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11744 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_22_in_rule__QualifiedName__Group__1__Impl1772 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21803 = new BitSet(new long[]{0x0000000000000002L});
>@@ -4880,7 +5023,7 @@
> public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__11929 = new BitSet(new long[]{0x0000000003000000L});
> public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__11932 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl1959 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__21989 = new BitSet(new long[]{0x0000000001000000L});
>+ public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__21989 = new BitSet(new long[]{0x0000000003000000L});
> public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__21992 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2019 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32050 = new BitSet(new long[]{0x0000000000000002L});
>@@ -4896,7 +5039,7 @@
> public static final BitSet FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__12302 = new BitSet(new long[]{0x0000000018000000L});
> public static final BitSet FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__12305 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl2332 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__22362 = new BitSet(new long[]{0x0000000008000000L});
>+ public static final BitSet FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__22362 = new BitSet(new long[]{0x0000000018000000L});
> public static final BitSet FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__22365 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl2392 = new BitSet(new long[]{0x0000000010000002L});
> public static final BitSet FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__32423 = new BitSet(new long[]{0x0000000000000002L});
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g	(working copy)
>@@ -1841,7 +1841,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java	(working copy)
>@@ -13,433 +13,483 @@
> @SuppressWarnings("all")
> public class InternalUmlPropertyLexer extends Lexer {
> public static final int RULE_ID=4;
>+ public static final int T__29=29;
> public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
> public static final int RULE_ANY_OTHER=11;
>- public static final int T29=29;
>- public static final int T28=28;
>- public static final int T27=27;
>- public static final int T26=26;
>- public static final int T25=25;
>- public static final int Tokens=33;
>- public static final int T24=24;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
> public static final int EOF=-1;
> public static final int RULE_SL_COMMENT=9;
>- public static final int T23=23;
>- public static final int T22=22;
>- public static final int T21=21;
>- public static final int T20=20;
> public static final int RULE_ML_COMMENT=8;
>+ public static final int T__19=19;
>+ public static final int T__30=30;
>+ public static final int T__31=31;
>+ public static final int T__32=32;
> 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__17=17;
>+ 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=7;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
> public static final int RULE_WS=10;
>- public static final int T15=15;
>- public static final int T16=16;
>- public static final int T17=17;
>- public static final int T18=18;
>- public static final int T30=30;
>- public static final int T19=19;
>- public static final int T32=32;
>- public static final int T31=31;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlPropertyLexer() {;} 
> public InternalUmlPropertyLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlPropertyLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g"; }
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:10:5: ( '<Undefined>' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:10:7: '<Undefined>'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:11:7: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:11:9: '<Undefined>'
> {
> match("<Undefined>"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:11:5: ( '+' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:11:7: '+'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:12:7: ( '+' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:12:9: '+'
> {
> match('+'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:12:5: ( '-' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:12:7: '-'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:13:7: ( '-' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:13:9: '-'
> {
> match('-'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:13:5: ( '#' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:13:7: '#'
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:14:7: ( '#' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:14:9: '#'
> {
> match('#'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:14:5: ( '~' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:14:7: '~'
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:15:7: ( '~' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:15:9: '~'
> {
> match('~'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start T17
>- public final void mT17() throws RecognitionException {
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
> try {
>- int _type = T17;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:15:5: ( 'readOnly' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:15:7: 'readOnly'
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:16:7: ( 'readOnly' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:16:9: 'readOnly'
> {
> match("readOnly"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T17
>+ // $ANTLR end "T__17"
> 
>- // $ANTLR start T18
>- public final void mT18() throws RecognitionException {
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
> try {
>- int _type = T18;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:16:5: ( 'union' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:16:7: 'union'
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:17:7: ( 'union' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:17:9: 'union'
> {
> match("union"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T18
>+ // $ANTLR end "T__18"
> 
>- // $ANTLR start T19
>- public final void mT19() throws RecognitionException {
>+ // $ANTLR start "T__19"
>+ public final void mT__19() throws RecognitionException {
> try {
>- int _type = T19;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:17:5: ( 'ordered' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:17:7: 'ordered'
>+ int _type = T__19;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:18:7: ( 'ordered' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:18:9: 'ordered'
> {
> match("ordered"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T19
>+ // $ANTLR end "T__19"
> 
>- // $ANTLR start T20
>- public final void mT20() throws RecognitionException {
>+ // $ANTLR start "T__20"
>+ public final void mT__20() throws RecognitionException {
> try {
>- int _type = T20;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:18:5: ( 'unique' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:18:7: 'unique'
>+ int _type = T__20;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:19:7: ( 'unique' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:19:9: 'unique'
> {
> match("unique"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T20
>+ // $ANTLR end "T__20"
> 
>- // $ANTLR start T21
>- public final void mT21() throws RecognitionException {
>+ // $ANTLR start "T__21"
>+ public final void mT__21() throws RecognitionException {
> try {
>- int _type = T21;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:19:5: ( ':' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:19:7: ':'
>+ int _type = T__21;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:20:7: ( ':' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:20:9: ':'
> {
> match(':'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T21
>+ // $ANTLR end "T__21"
> 
>- // $ANTLR start T22
>- public final void mT22() throws RecognitionException {
>+ // $ANTLR start "T__22"
>+ public final void mT__22() throws RecognitionException {
> try {
>- int _type = T22;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:20:5: ( '::' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:20:7: '::'
>+ int _type = T__22;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:21:7: ( '::' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:21:9: '::'
> {
> match("::"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T22
>+ // $ANTLR end "T__22"
> 
>- // $ANTLR start T23
>- public final void mT23() throws RecognitionException {
>+ // $ANTLR start "T__23"
>+ public final void mT__23() throws RecognitionException {
> try {
>- int _type = T23;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:21:5: ( '[' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:21:7: '['
>+ int _type = T__23;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:22:7: ( '[' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:22:9: '['
> {
> match('['); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T23
>+ // $ANTLR end "T__23"
> 
>- // $ANTLR start T24
>- public final void mT24() throws RecognitionException {
>+ // $ANTLR start "T__24"
>+ public final void mT__24() throws RecognitionException {
> try {
>- int _type = T24;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:22:5: ( ']' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:22:7: ']'
>+ int _type = T__24;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:23:7: ( ']' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:23:9: ']'
> {
> match(']'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T24
>+ // $ANTLR end "T__24"
> 
>- // $ANTLR start T25
>- public final void mT25() throws RecognitionException {
>+ // $ANTLR start "T__25"
>+ public final void mT__25() throws RecognitionException {
> try {
>- int _type = T25;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:23:5: ( '..' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:23:7: '..'
>+ int _type = T__25;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:24:7: ( '..' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:24:9: '..'
> {
> match(".."); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T25
>+ // $ANTLR end "T__25"
> 
>- // $ANTLR start T26
>- public final void mT26() throws RecognitionException {
>+ // $ANTLR start "T__26"
>+ public final void mT__26() throws RecognitionException {
> try {
>- int _type = T26;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:24:5: ( '{' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:24:7: '{'
>+ int _type = T__26;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:25:7: ( '{' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:25:9: '{'
> {
> match('{'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T26
>+ // $ANTLR end "T__26"
> 
>- // $ANTLR start T27
>- public final void mT27() throws RecognitionException {
>+ // $ANTLR start "T__27"
>+ public final void mT__27() throws RecognitionException {
> try {
>- int _type = T27;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:25:5: ( '}' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:25:7: '}'
>+ int _type = T__27;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:26:7: ( '}' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:26:9: '}'
> {
> match('}'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T27
>+ // $ANTLR end "T__27"
> 
>- // $ANTLR start T28
>- public final void mT28() throws RecognitionException {
>+ // $ANTLR start "T__28"
>+ public final void mT__28() throws RecognitionException {
> try {
>- int _type = T28;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:26:5: ( ',' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:26:7: ','
>+ int _type = T__28;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:27:7: ( ',' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:27:9: ','
> {
> match(','); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T28
>+ // $ANTLR end "T__28"
> 
>- // $ANTLR start T29
>- public final void mT29() throws RecognitionException {
>+ // $ANTLR start "T__29"
>+ public final void mT__29() throws RecognitionException {
> try {
>- int _type = T29;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:27:5: ( 'redefines' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:27:7: 'redefines'
>+ int _type = T__29;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:28:7: ( 'redefines' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:28:9: 'redefines'
> {
> match("redefines"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T29
>+ // $ANTLR end "T__29"
> 
>- // $ANTLR start T30
>- public final void mT30() throws RecognitionException {
>+ // $ANTLR start "T__30"
>+ public final void mT__30() throws RecognitionException {
> try {
>- int _type = T30;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:28:5: ( 'subsets' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:28:7: 'subsets'
>+ int _type = T__30;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:29:7: ( 'subsets' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:29:9: 'subsets'
> {
> match("subsets"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T30
>+ // $ANTLR end "T__30"
> 
>- // $ANTLR start T31
>- public final void mT31() throws RecognitionException {
>+ // $ANTLR start "T__31"
>+ public final void mT__31() throws RecognitionException {
> try {
>- int _type = T31;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:29:5: ( '=' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:29:7: '='
>+ int _type = T__31;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:30:7: ( '=' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:30:9: '='
> {
> match('='); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T31
>+ // $ANTLR end "T__31"
> 
>- // $ANTLR start T32
>- public final void mT32() throws RecognitionException {
>+ // $ANTLR start "T__32"
>+ public final void mT__32() throws RecognitionException {
> try {
>- int _type = T32;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:30:5: ( '/' )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:30:7: '/'
>+ int _type = T__32;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:31:7: ( '/' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:31:9: '/'
> {
> match('/'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T32
>+ // $ANTLR end "T__32"
> 
>- // $ANTLR start RULE_UNLIMITEDLITERAL
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
> public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
> try {
> int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1838:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1838:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
> {
>@@ -455,7 +505,7 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("1838:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ new NoViableAltException("", 2, 0, input);
> 
> throw nvae;
> }
>@@ -505,17 +555,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_UNLIMITEDLITERAL
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1840:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1840:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>@@ -542,10 +594,9 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1840:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop4:
>@@ -567,10 +618,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -584,17 +634,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1842:10: ( ( '0' .. '9' )+ )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1842:12: ( '0' .. '9' )+
> {
>@@ -631,21 +683,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>@@ -657,16 +711,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("1844:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ new NoViableAltException("", 8, 0, input);
> 
> throw nvae;
> }
> switch (alt8) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop6:
> do {
> int alt6=3;
>@@ -675,41 +729,39 @@
> if ( (LA6_0=='\\') ) {
> alt6=1;
> }
>- else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFE')) ) {
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
> alt6=2;
> }
> 
> 
> switch (alt6) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -725,10 +777,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop7:
> do {
> int alt7=3;
>@@ -737,41 +789,39 @@
> if ( (LA7_0=='\\') ) {
> alt7=1;
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
> alt7=2;
> }
> 
> 
> switch (alt7) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -792,17 +842,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1846:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1846:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
>@@ -820,13 +872,13 @@
> if ( (LA9_1=='/') ) {
> alt9=2;
> }
>- else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFE')) ) {
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
> alt9=1;
> }
> 
> 
> }
>- else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFE')) ) {
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
> alt9=1;
> }
> 
>@@ -850,17 +902,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
>@@ -872,7 +926,7 @@
> int alt10=2;
> int LA10_0 = input.LA(1);
> 
>- if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFE')) ) {
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
> alt10=1;
> }
> 
>@@ -881,15 +935,14 @@
> 	case 1 :
> 	 // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -939,17 +992,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1850:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1850:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>@@ -974,10 +1029,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -995,17 +1049,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1852:16: ( . )
> // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1852:18: .
> {
>@@ -1013,216 +1069,217 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:8: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt14=29;
> alt14 = dfa14.predict(input);
> switch (alt14) {
> case 1 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:10: T12
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:10: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:14: T13
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:16: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:18: T14
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:22: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:22: T15
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:28: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:26: T16
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:34: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:30: T17
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:40: T__17
> {
>- mT17(); 
>+ mT__17(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:34: T18
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:46: T__18
> {
>- mT18(); 
>+ mT__18(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:38: T19
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:52: T__19
> {
>- mT19(); 
>+ mT__19(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:42: T20
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:58: T__20
> {
>- mT20(); 
>+ mT__20(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:46: T21
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:64: T__21
> {
>- mT21(); 
>+ mT__21(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:50: T22
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:70: T__22
> {
>- mT22(); 
>+ mT__22(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:54: T23
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:76: T__23
> {
>- mT23(); 
>+ mT__23(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:58: T24
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:82: T__24
> {
>- mT24(); 
>+ mT__24(); 
> 
> }
> break;
> case 14 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:62: T25
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:88: T__25
> {
>- mT25(); 
>+ mT__25(); 
> 
> }
> break;
> case 15 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:66: T26
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:94: T__26
> {
>- mT26(); 
>+ mT__26(); 
> 
> }
> break;
> case 16 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:70: T27
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:100: T__27
> {
>- mT27(); 
>+ mT__27(); 
> 
> }
> break;
> case 17 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:74: T28
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:106: T__28
> {
>- mT28(); 
>+ mT__28(); 
> 
> }
> break;
> case 18 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:78: T29
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:112: T__29
> {
>- mT29(); 
>+ mT__29(); 
> 
> }
> break;
> case 19 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:82: T30
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:118: T__30
> {
>- mT30(); 
>+ mT__30(); 
> 
> }
> break;
> case 20 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:86: T31
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:124: T__31
> {
>- mT31(); 
>+ mT__31(); 
> 
> }
> break;
> case 21 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:90: T32
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:130: T__32
> {
>- mT32(); 
>+ mT__32(); 
> 
> }
> break;
> case 22 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:94: RULE_UNLIMITEDLITERAL
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:136: RULE_UNLIMITEDLITERAL
> {
> mRULE_UNLIMITEDLITERAL(); 
> 
> }
> break;
> case 23 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:116: RULE_ID
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:158: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 24 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:124: RULE_INT
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:166: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 25 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:133: RULE_STRING
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:175: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 26 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:145: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:187: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 27 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:161: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:203: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 28 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:177: RULE_WS
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:219: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 29 :
>- // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:185: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:227: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -1239,36 +1296,36 @@
> "\1\uffff\1\32\4\uffff\3\41\1\45\2\uffff\1\32\3\uffff\1\41\1\uffff"+
> "\1\60\1\61\1\uffff\1\32\1\uffff\2\32\7\uffff\1\41\1\uffff\2\41\10"+
> "\uffff\1\41\5\uffff\1\61\2\uffff\15\41\1\110\5\41\1\uffff\1\116"+
>- "\4\41\1\uffff\1\123\1\124\1\41\1\126\2\uffff\1\127\2\uffff";
>+ "\4\41\1\uffff\1\123\1\124\1\125\1\41\3\uffff\1\127\1\uffff";
> static final String DFA14_eofS =
> "\130\uffff";
> static final String DFA14_minS =
>- "\1\0\1\125\4\uffff\1\145\1\156\1\162\1\72\2\uffff\1\56\3\uffff\1"+
>- "\165\1\uffff\1\52\1\60\1\uffff\1\101\1\uffff\2\0\7\uffff\1\141\1"+
>- "\uffff\1\151\1\144\10\uffff\1\142\5\uffff\1\60\2\uffff\1\145\1\144"+
>- "\1\157\1\145\1\163\1\146\1\117\1\156\1\165\1\162\1\145\1\151\1\156"+
>- "\1\60\2\145\1\164\1\156\1\154\1\uffff\1\60\1\144\1\163\1\145\1\171"+
>- "\1\uffff\2\60\1\163\1\60\2\uffff\1\60\2\uffff";
>+ "\1\0\1\125\4\uffff\1\145\1\156\1\162\1\72\2\uffff\1\56\3\uffff"+
>+ "\1\165\1\uffff\1\52\1\60\1\uffff\1\101\1\uffff\2\0\7\uffff\1\141"+
>+ "\1\uffff\1\151\1\144\10\uffff\1\142\5\uffff\1\60\2\uffff\1\144\1"+
>+ "\145\1\157\1\145\1\163\1\117\1\146\1\156\1\165\1\162\1\145\1\156"+
>+ "\1\151\1\60\2\145\1\164\1\154\1\156\1\uffff\1\60\1\144\1\163\1\171"+
>+ "\1\145\1\uffff\3\60\1\163\3\uffff\1\60\1\uffff";
> static final String DFA14_maxS =
>- "\1\ufffe\1\125\4\uffff\1\145\1\156\1\162\1\72\2\uffff\1\56\3\uffff"+
>- "\1\165\1\uffff\1\57\1\71\1\uffff\1\172\1\uffff\2\ufffe\7\uffff\1"+
>- "\144\1\uffff\1\151\1\144\10\uffff\1\142\5\uffff\1\71\2\uffff\1\145"+
>- "\1\144\1\161\1\145\1\163\1\146\1\117\1\156\1\165\1\162\1\145\1\151"+
>- "\1\156\1\172\2\145\1\164\1\156\1\154\1\uffff\1\172\1\144\1\163\1"+
>- "\145\1\171\1\uffff\2\172\1\163\1\172\2\uffff\1\172\2\uffff";
>+ "\1\uffff\1\125\4\uffff\1\145\1\156\1\162\1\72\2\uffff\1\56\3\uffff"+
>+ "\1\165\1\uffff\1\57\1\71\1\uffff\1\172\1\uffff\2\uffff\7\uffff\1"+
>+ "\144\1\uffff\1\151\1\144\10\uffff\1\142\5\uffff\1\71\2\uffff\1\144"+
>+ "\1\145\1\161\1\145\1\163\1\117\1\146\1\156\1\165\1\162\1\145\1\156"+
>+ "\1\151\1\172\2\145\1\164\1\154\1\156\1\uffff\1\172\1\144\1\163\1"+
>+ "\171\1\145\1\uffff\3\172\1\163\3\uffff\1\172\1\uffff";
> static final String DFA14_acceptS =
>- "\2\uffff\1\2\1\3\1\4\1\5\4\uffff\1\14\1\15\1\uffff\1\17\1\20\1\21"+
>- "\1\uffff\1\24\2\uffff\1\26\1\uffff\1\27\2\uffff\1\34\1\35\1\1\1"+
>- "\2\1\3\1\4\1\5\1\uffff\1\27\2\uffff\1\13\1\12\1\14\1\15\1\16\1\17"+
>- "\1\20\1\21\1\uffff\1\24\1\32\1\33\1\25\1\26\1\uffff\1\31\1\34\23"+
>- "\uffff\1\7\5\uffff\1\11\4\uffff\1\10\1\23\1\uffff\1\6\1\22";
>+ "\2\uffff\1\2\1\3\1\4\1\5\4\uffff\1\14\1\15\1\uffff\1\17\1\20\1"+
>+ "\21\1\uffff\1\24\2\uffff\1\26\1\uffff\1\27\2\uffff\1\34\1\35\1\1"+
>+ "\1\2\1\3\1\4\1\5\1\uffff\1\27\2\uffff\1\13\1\12\1\14\1\15\1\16\1"+
>+ "\17\1\20\1\21\1\uffff\1\24\1\32\1\33\1\25\1\26\1\uffff\1\31\1\34"+
>+ "\23\uffff\1\7\5\uffff\1\11\4\uffff\1\10\1\23\1\6\1\uffff\1\22";
> static final String DFA14_specialS =
>- "\130\uffff}>";
>+ "\1\2\26\uffff\1\0\1\1\77\uffff}>";
> static final String[] DFA14_transitionS = {
>- "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\1\4\3\32\1\30\2\32"+
>- "\1\24\1\2\1\17\1\3\1\14\1\22\12\23\1\11\1\32\1\1\1\21\3\32\32"+
>- "\26\1\12\1\32\1\13\1\25\1\26\1\32\16\26\1\10\2\26\1\6\1\20\1"+
>- "\26\1\7\5\26\1\15\1\32\1\16\1\5\uff80\32",
>+ "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\1\4\3\32\1\30\2"+
>+ "\32\1\24\1\2\1\17\1\3\1\14\1\22\12\23\1\11\1\32\1\1\1\21\3\32"+
>+ "\32\26\1\12\1\32\1\13\1\25\1\26\1\32\16\26\1\10\2\26\1\6\1\20"+
>+ "\1\26\1\7\5\26\1\15\1\32\1\16\1\5\uff81\32",
> "\1\33",
> "",
> "",
>@@ -1291,8 +1348,8 @@
> "",
> "\32\41\4\uffff\1\41\1\uffff\32\41",
> "",
>- "\uffff\63",
>- "\uffff\63",
>+ "\0\63",
>+ "\0\63",
> "",
> "",
> "",
>@@ -1300,7 +1357,7 @@
> "",
> "",
> "",
>- "\1\66\2\uffff\1\65",
>+ "\1\65\2\uffff\1\66",
> "",
> "\1\67",
> "\1\70",
>@@ -1349,12 +1406,12 @@
> "",
> "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
> "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>- "\1\125",
> "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
>+ "\1\126",
> "",
> "",
>- "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
> "",
>+ "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
> ""
> };
> 
>@@ -1388,7 +1445,95 @@
> this.transition = DFA14_transition;
> }
> public String getDescription() {
>- return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | 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 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_23 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA14_23>='\u0000' && LA14_23<='\uFFFF')) ) {s = 51;}
>+
>+ else s = 26;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_24 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA14_24>='\u0000' && LA14_24<='\uFFFF')) ) {s = 51;}
>+
>+ else s = 26;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA14_0=='<') ) {s = 1;}
>+
>+ else if ( (LA14_0=='+') ) {s = 2;}
>+
>+ else if ( (LA14_0=='-') ) {s = 3;}
>+
>+ else if ( (LA14_0=='#') ) {s = 4;}
>+
>+ else if ( (LA14_0=='~') ) {s = 5;}
>+
>+ else if ( (LA14_0=='r') ) {s = 6;}
>+
>+ else if ( (LA14_0=='u') ) {s = 7;}
>+
>+ else if ( (LA14_0=='o') ) {s = 8;}
>+
>+ else if ( (LA14_0==':') ) {s = 9;}
>+
>+ else if ( (LA14_0=='[') ) {s = 10;}
>+
>+ else if ( (LA14_0==']') ) {s = 11;}
>+
>+ else if ( (LA14_0=='.') ) {s = 12;}
>+
>+ else if ( (LA14_0=='{') ) {s = 13;}
>+
>+ else if ( (LA14_0=='}') ) {s = 14;}
>+
>+ else if ( (LA14_0==',') ) {s = 15;}
>+
>+ else if ( (LA14_0=='s') ) {s = 16;}
>+
>+ else if ( (LA14_0=='=') ) {s = 17;}
>+
>+ else if ( (LA14_0=='/') ) {s = 18;}
>+
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 19;}
>+
>+ else if ( (LA14_0=='*') ) {s = 20;}
>+
>+ else if ( (LA14_0=='^') ) {s = 21;}
>+
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='n')||(LA14_0>='p' && LA14_0<='q')||LA14_0=='t'||(LA14_0>='v' && LA14_0<='z')) ) {s = 22;}
>+
>+ else if ( (LA14_0=='\"') ) {s = 23;}
>+
>+ else if ( (LA14_0=='\'') ) {s = 24;}
>+
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 25;}
>+
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='$' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||LA14_0==';'||(LA14_0>='>' && LA14_0<='@')||LA14_0=='\\'||LA14_0=='`'||LA14_0=='|'||(LA14_0>='\u007F' && LA14_0<='\uFFFF')) ) {s = 26;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
> }
> }
> 
>Index: src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java	(working copy)
>@@ -24,21 +24,11 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.FastDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.property.editor.xtext.parser.antlr.internal.InternalUmlPropertyLexer.class);
> 	}
>@@ -48,6 +38,11 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
> 	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
> 		return org.eclipse.papyrus.property.editor.xtext.ui.labeling.UmlPropertyLabelProvider.class;
>@@ -58,14 +53,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.property.editor.xtext.ui.labeling.UmlPropertyDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.property.editor.xtext.ui.outline.UmlPropertyTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.property.editor.xtext.ui.outline.UmlPropertyOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.property.editor.xtext.ui.outline.UmlPropertyOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.property.editor.xtext.ui.outline.UmlPropertyOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.contentAssist.JavaBasedContentAssistFragment
>@@ -95,7 +90,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.builderState.ShadowingResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>Index: src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.property.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlPropertyOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>Index: src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,32 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.property.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UmlPropertyOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = { 
>-		// provide list of classes to adapt to, e.g.:
>-		// Entity.class
>-		// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>-
>Index: src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/property/editor/xtext/ui/outline/UmlPropertyTransformer.java	(working copy)
>@@ -1,24 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.property.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UmlPropertyTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-	
>-}
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>#P org.eclipse.papyrus.state.editor.xtext.ui
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/AbstractUmlStateUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/AbstractUmlStateUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/AbstractUmlStateUiModule.java	(working copy)
>@@ -24,21 +24,11 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.XtextDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal.InternalUmlStateLexer.class);
> 	}
>@@ -48,6 +38,11 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
> 	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
> 		return org.eclipse.papyrus.state.editor.xtext.ui.labeling.UmlStateLabelProvider.class;
>@@ -58,14 +53,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.state.editor.xtext.ui.labeling.UmlStateDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.state.editor.xtext.ui.outline.UmlStateTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.state.editor.xtext.ui.outline.UmlStateOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.state.editor.xtext.ui.outline.UmlStateOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.state.editor.xtext.ui.outline.UmlStateOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/internal/UmlStateActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/internal/UmlStateActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/internal/UmlStateActivator.java	(working copy)
>@@ -1,24 +1,25 @@
>-
> /*
> * generated by Xtext
> */
> package org.eclipse.papyrus.state.editor.xtext.ui.internal;
> 
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
>+
> import org.apache.log4j.Logger;
> 
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
> 
> import java.util.Map;
> import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlStateActivator extends AbstractUIPlugin {
> 
>@@ -34,10 +35,7 @@
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-			
>-			injectors.put("org.eclipse.papyrus.state.editor.xtext.UmlState", Guice.createInjector(
>-				Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.state.editor.xtext.UmlState")).with(getUiModule("org.eclipse.papyrus.state.editor.xtext.UmlState"))).with(getSharedStateModule())
>-			));
>+			registerInjectorFor("org.eclipse.papyrus.state.editor.xtext.UmlState");
> 			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
>@@ -45,20 +43,31 @@
> 		}
> 	}
> 	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlStateActivator getInstance() {
> 		return INSTANCE;
> 	}
> 	
> 	protected Module getRuntimeModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.state.editor.xtext.UmlState".equals(grammar)) {
> 		 return new org.eclipse.papyrus.state.editor.xtext.UmlStateRuntimeModule();
> 		}
> 		
> 		throw new IllegalArgumentException(grammar);
> 	}
>+	
> 	protected Module getUiModule(String grammar) {
>-		
> 		if ("org.eclipse.papyrus.state.editor.xtext.UmlState".equals(grammar)) {
> 		 return new org.eclipse.papyrus.state.editor.xtext.ui.UmlStateUiModule(this);
> 		}
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlStateLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlStateLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlStateLexer.java	(working copy)
>@@ -13,183 +13,207 @@
> @SuppressWarnings("all")
> public class InternalUmlStateLexer extends Lexer {
> public static final int RULE_ID=4;
>- public static final int RULE_ANY_OTHER=10;
>- public static final int EOF=-1;
>- public static final int RULE_SL_COMMENT=8;
>- public static final int Tokens=19;
>- public static final int RULE_ML_COMMENT=7;
> 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
>+ public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
>- public static final int T11=11;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
> public static final int RULE_WS=9;
>- public static final int T15=15;
>- public static final int T16=16;
>- public static final int T17=17;
>- public static final int T18=18;
>+ public static final int RULE_SL_COMMENT=8;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=7;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlStateLexer() {;} 
> public InternalUmlStateLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlStateLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g"; }
> 
>- // $ANTLR start T11
>- public final void mT11() throws RecognitionException {
>+ // $ANTLR start "T__11"
>+ public final void mT__11() throws RecognitionException {
> try {
>- int _type = T11;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:10:5: ( 'Activity' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:10:7: 'Activity'
>+ int _type = T__11;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:11:7: ( 'Activity' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:11:9: 'Activity'
> {
> match("Activity"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T11
>+ // $ANTLR end "T__11"
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:11:5: ( 'StateMachine' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:11:7: 'StateMachine'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:12:7: ( 'StateMachine' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:12:9: 'StateMachine'
> {
> match("StateMachine"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:12:5: ( 'OpaqueBehavior' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:12:7: 'OpaqueBehavior'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:13:7: ( 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:13:9: 'OpaqueBehavior'
> {
> match("OpaqueBehavior"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:13:5: ( ':' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:13:7: ':'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:14:7: ( ':' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:14:9: ':'
> {
> match(':'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:14:5: ( '::' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:14:7: '::'
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:15:7: ( '::' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:15:9: '::'
> {
> match("::"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:15:5: ( 'entry' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:15:7: 'entry'
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:16:7: ( 'entry' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:16:9: 'entry'
> {
> match("entry"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start T17
>- public final void mT17() throws RecognitionException {
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
> try {
>- int _type = T17;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:16:5: ( 'do' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:16:7: 'do'
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:17:7: ( 'do' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:17:9: 'do'
> {
> match("do"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T17
>+ // $ANTLR end "T__17"
> 
>- // $ANTLR start T18
>- public final void mT18() throws RecognitionException {
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
> try {
>- int _type = T18;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:17:5: ( 'exit' )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:17:7: 'exit'
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:18:7: ( 'exit' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:18:9: 'exit'
> {
> match("exit"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T18
>+ // $ANTLR end "T__18"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1236:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1236:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>@@ -216,10 +240,9 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1236:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop2:
>@@ -241,10 +264,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -258,17 +280,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1238:10: ( ( '0' .. '9' )+ )
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1238:12: ( '0' .. '9' )+
> {
>@@ -305,21 +329,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -331,16 +357,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("1240:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop4:
> do {
> int alt4=3;
>@@ -349,41 +375,39 @@
> if ( (LA4_0=='\\') ) {
> alt4=1;
> }
>- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
>+ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
> alt4=2;
> }
> 
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -399,10 +423,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -411,41 +435,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1240:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -466,17 +488,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1242:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1242:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
>@@ -494,13 +518,13 @@
> if ( (LA7_1=='/') ) {
> alt7=2;
> }
>- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
>+ else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
> alt7=1;
> }
> 
>@@ -524,17 +548,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1244:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1244:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
>@@ -546,7 +572,7 @@
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
>+ if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
>@@ -555,15 +581,14 @@
> 	case 1 :
> 	 // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1244: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -613,17 +638,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1246:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1246:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>@@ -648,10 +675,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -669,17 +695,19 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1248:16: ( . )
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1248:18: .
> {
>@@ -687,475 +715,119 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt12=15;
>- int LA12_0 = input.LA(1);
>-
>- if ( (LA12_0=='A') ) {
>- int LA12_1 = input.LA(2);
>-
>- if ( (LA12_1=='c') ) {
>- int LA12_15 = input.LA(3);
>-
>- if ( (LA12_15=='t') ) {
>- int LA12_29 = input.LA(4);
>-
>- if ( (LA12_29=='i') ) {
>- int LA12_35 = input.LA(5);
>-
>- if ( (LA12_35=='v') ) {
>- int LA12_40 = input.LA(6);
>-
>- if ( (LA12_40=='i') ) {
>- int LA12_45 = input.LA(7);
>-
>- if ( (LA12_45=='t') ) {
>- int LA12_49 = input.LA(8);
>-
>- if ( (LA12_49=='y') ) {
>- int LA12_52 = input.LA(9);
>-
>- if ( ((LA12_52>='0' && LA12_52<='9')||(LA12_52>='A' && LA12_52<='Z')||LA12_52=='_'||(LA12_52>='a' && LA12_52<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=1;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='S') ) {
>- int LA12_2 = input.LA(2);
>-
>- if ( (LA12_2=='t') ) {
>- int LA12_17 = input.LA(3);
>-
>- if ( (LA12_17=='a') ) {
>- int LA12_30 = input.LA(4);
>-
>- if ( (LA12_30=='t') ) {
>- int LA12_36 = input.LA(5);
>-
>- if ( (LA12_36=='e') ) {
>- int LA12_41 = input.LA(6);
>-
>- if ( (LA12_41=='M') ) {
>- int LA12_46 = input.LA(7);
>-
>- if ( (LA12_46=='a') ) {
>- int LA12_50 = input.LA(8);
>-
>- if ( (LA12_50=='c') ) {
>- int LA12_53 = input.LA(9);
>-
>- if ( (LA12_53=='h') ) {
>- int LA12_56 = input.LA(10);
>-
>- if ( (LA12_56=='i') ) {
>- int LA12_58 = input.LA(11);
>-
>- if ( (LA12_58=='n') ) {
>- int LA12_60 = input.LA(12);
>-
>- if ( (LA12_60=='e') ) {
>- int LA12_62 = input.LA(13);
>-
>- if ( ((LA12_62>='0' && LA12_62<='9')||(LA12_62>='A' && LA12_62<='Z')||LA12_62=='_'||(LA12_62>='a' && LA12_62<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=2;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='O') ) {
>- int LA12_3 = input.LA(2);
>-
>- if ( (LA12_3=='p') ) {
>- int LA12_18 = input.LA(3);
>-
>- if ( (LA12_18=='a') ) {
>- int LA12_31 = input.LA(4);
>-
>- if ( (LA12_31=='q') ) {
>- int LA12_37 = input.LA(5);
>-
>- if ( (LA12_37=='u') ) {
>- int LA12_42 = input.LA(6);
>-
>- if ( (LA12_42=='e') ) {
>- int LA12_47 = input.LA(7);
>-
>- if ( (LA12_47=='B') ) {
>- int LA12_51 = input.LA(8);
>-
>- if ( (LA12_51=='e') ) {
>- int LA12_54 = input.LA(9);
>-
>- if ( (LA12_54=='h') ) {
>- int LA12_57 = input.LA(10);
>-
>- if ( (LA12_57=='a') ) {
>- int LA12_59 = input.LA(11);
>-
>- if ( (LA12_59=='v') ) {
>- int LA12_61 = input.LA(12);
>-
>- if ( (LA12_61=='i') ) {
>- int LA12_63 = input.LA(13);
>-
>- if ( (LA12_63=='o') ) {
>- int LA12_65 = input.LA(14);
>-
>- if ( (LA12_65=='r') ) {
>- int LA12_66 = input.LA(15);
>-
>- if ( ((LA12_66>='0' && LA12_66<='9')||(LA12_66>='A' && LA12_66<='Z')||LA12_66=='_'||(LA12_66>='a' && LA12_66<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=3;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0==':') ) {
>- int LA12_4 = input.LA(2);
>-
>- if ( (LA12_4==':') ) {
>- alt12=5;
>- }
>- else {
>- alt12=4;}
>- }
>- else if ( (LA12_0=='e') ) {
>- switch ( input.LA(2) ) {
>- case 'x':
>- {
>- int LA12_21 = input.LA(3);
>-
>- if ( (LA12_21=='i') ) {
>- int LA12_32 = input.LA(4);
>-
>- if ( (LA12_32=='t') ) {
>- int LA12_38 = input.LA(5);
>-
>- if ( ((LA12_38>='0' && LA12_38<='9')||(LA12_38>='A' && LA12_38<='Z')||LA12_38=='_'||(LA12_38>='a' && LA12_38<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=8;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- break;
>- case 'n':
>- {
>- int LA12_22 = input.LA(3);
>-
>- if ( (LA12_22=='t') ) {
>- int LA12_33 = input.LA(4);
>-
>- if ( (LA12_33=='r') ) {
>- int LA12_39 = input.LA(5);
>-
>- if ( (LA12_39=='y') ) {
>- int LA12_44 = input.LA(6);
>-
>- if ( ((LA12_44>='0' && LA12_44<='9')||(LA12_44>='A' && LA12_44<='Z')||LA12_44=='_'||(LA12_44>='a' && LA12_44<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=6;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- break;
>- default:
>- alt12=9;}
>-
>- }
>- else if ( (LA12_0=='d') ) {
>- int LA12_6 = input.LA(2);
>-
>- if ( (LA12_6=='o') ) {
>- int LA12_23 = input.LA(3);
>-
>- if ( ((LA12_23>='0' && LA12_23<='9')||(LA12_23>='A' && LA12_23<='Z')||LA12_23=='_'||(LA12_23>='a' && LA12_23<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=7;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='^') ) {
>- int LA12_7 = input.LA(2);
>-
>- if ( ((LA12_7>='A' && LA12_7<='Z')||LA12_7=='_'||(LA12_7>='a' && LA12_7<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=15;}
>- }
>- else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='c')||(LA12_0>='f' && LA12_0<='z')) ) {
>- alt12=9;
>- }
>- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
>- alt12=10;
>- }
>- else if ( (LA12_0=='\"') ) {
>- int LA12_10 = input.LA(2);
>-
>- if ( ((LA12_10>='\u0000' && LA12_10<='\uFFFE')) ) {
>- alt12=11;
>- }
>- else {
>- alt12=15;}
>- }
>- else if ( (LA12_0=='\'') ) {
>- int LA12_11 = input.LA(2);
>-
>- if ( ((LA12_11>='\u0000' && LA12_11<='\uFFFE')) ) {
>- alt12=11;
>- }
>- else {
>- alt12=15;}
>- }
>- else if ( (LA12_0=='/') ) {
>- switch ( input.LA(2) ) {
>- case '*':
>- {
>- alt12=12;
>- }
>- break;
>- case '/':
>- {
>- alt12=13;
>- }
>- break;
>- default:
>- alt12=15;}
>-
>- }
>- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
>- alt12=14;
>- }
>- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='.')||(LA12_0>=';' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
>- alt12=15;
>- }
>- else {
>- NoViableAltException nvae =
>- new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
>-
>- throw nvae;
>- }
>+ alt12 = dfa12.predict(input);
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:10: T11
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:10: T__11
> {
>- mT11(); 
>+ mT__11(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:14: T12
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:16: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:18: T13
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:22: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:22: T14
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:28: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:26: T15
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:34: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:30: T16
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:40: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:34: T17
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:46: T__17
> {
>- mT17(); 
>+ mT__17(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:38: T18
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:52: T__18
> {
>- mT18(); 
>+ mT__18(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:42: RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:58: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:50: RULE_INT
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:66: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:59: RULE_STRING
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:75: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:71: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:87: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:87: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:103: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 14 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:103: RULE_WS
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:119: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 15 :
>- // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:111: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1:127: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -1167,6 +839,204 @@
> }
> 
> 
>+ protected DFA12 dfa12 = new DFA12(this);
>+ static final String DFA12_eotS =
>+ "\1\uffff\3\20\1\24\2\20\1\16\2\uffff\3\16\2\uffff\1\20\1\uffff"+
>+ "\2\20\2\uffff\2\20\1\42\5\uffff\5\20\1\uffff\4\20\1\54\3\20\1\60"+
>+ "\1\uffff\3\20\1\uffff\3\20\1\67\2\20\1\uffff\6\20\1\100\1\20\1\uffff"+
>+ "\1\20\1\103\1\uffff";
>+ static final String DFA12_eofS =
>+ "\104\uffff";
>+ static final String DFA12_minS =
>+ "\1\0\1\143\1\164\1\160\1\72\1\156\1\157\1\101\2\uffff\2\0\1\52"+
>+ "\2\uffff\1\164\1\uffff\2\141\2\uffff\1\164\1\151\1\60\5\uffff\1"+
>+ "\151\1\164\1\161\1\162\1\164\1\uffff\1\166\1\145\1\165\1\171\1\60"+
>+ "\1\151\1\115\1\145\1\60\1\uffff\1\164\1\141\1\102\1\uffff\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 DFA12_maxS =
>+ "\1\uffff\1\143\1\164\1\160\1\72\1\170\1\157\1\172\2\uffff\2\uffff"+
>+ "\1\57\2\uffff\1\164\1\uffff\2\141\2\uffff\1\164\1\151\1\172\5\uffff"+
>+ "\1\151\1\164\1\161\1\162\1\164\1\uffff\1\166\1\145\1\165\1\171\1"+
>+ "\172\1\151\1\115\1\145\1\172\1\uffff\1\164\1\141\1\102\1\uffff\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 DFA12_acceptS =
>+ "\10\uffff\1\11\1\12\3\uffff\1\16\1\17\1\uffff\1\11\2\uffff\1\5"+
>+ "\1\4\3\uffff\1\12\1\13\1\14\1\15\1\16\5\uffff\1\7\11\uffff\1\10"+
>+ "\3\uffff\1\6\6\uffff\1\1\10\uffff\1\2\2\uffff\1\3";
>+ static final String DFA12_specialS =
>+ "\1\0\11\uffff\1\1\1\2\70\uffff}>";
>+ static final String[] DFA12_transitionS = {
>+ "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\12\4\16\1\13\7\16\1"+
>+ "\14\12\11\1\4\6\16\1\1\15\10\1\3\3\10\1\2\7\10\3\16\1\7\1\10"+
>+ "\1\16\3\10\1\6\1\5\25\10\uff85\16",
>+ "\1\17",
>+ "\1\21",
>+ "\1\22",
>+ "\1\23",
>+ "\1\25\11\uffff\1\26",
>+ "\1\27",
>+ "\32\20\4\uffff\1\20\1\uffff\32\20",
>+ "",
>+ "",
>+ "\0\31",
>+ "\0\31",
>+ "\1\32\4\uffff\1\33",
>+ "",
>+ "",
>+ "\1\35",
>+ "",
>+ "\1\36",
>+ "\1\37",
>+ "",
>+ "",
>+ "\1\40",
>+ "\1\41",
>+ "\12\20\7\uffff\32\20\4\uffff\1\20\1\uffff\32\20",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\43",
>+ "\1\44",
>+ "\1\45",
>+ "\1\46",
>+ "\1\47",
>+ "",
>+ "\1\50",
>+ "\1\51",
>+ "\1\52",
>+ "\1\53",
>+ "\12\20\7\uffff\32\20\4\uffff\1\20\1\uffff\32\20",
>+ "\1\55",
>+ "\1\56",
>+ "\1\57",
>+ "\12\20\7\uffff\32\20\4\uffff\1\20\1\uffff\32\20",
>+ "",
>+ "\1\61",
>+ "\1\62",
>+ "\1\63",
>+ "",
>+ "\1\64",
>+ "\1\65",
>+ "\1\66",
>+ "\12\20\7\uffff\32\20\4\uffff\1\20\1\uffff\32\20",
>+ "\1\70",
>+ "\1\71",
>+ "",
>+ "\1\72",
>+ "\1\73",
>+ "\1\74",
>+ "\1\75",
>+ "\1\76",
>+ "\1\77",
>+ "\12\20\7\uffff\32\20\4\uffff\1\20\1\uffff\32\20",
>+ "\1\101",
>+ "",
>+ "\1\102",
>+ "\12\20\7\uffff\32\20\4\uffff\1\20\1\uffff\32\20",
>+ ""
>+ };
>+
>+ static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
>+ static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
>+ static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
>+ static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
>+ static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
>+ static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
>+ static final short[][] DFA12_transition;
>+
>+ static {
>+ int numStates = DFA12_transitionS.length;
>+ DFA12_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
>+ }
>+ }
>+
>+ class DFA12 extends DFA {
>+
>+ public DFA12(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 12;
>+ this.eot = DFA12_eot;
>+ this.eof = DFA12_eof;
>+ this.min = DFA12_min;
>+ this.max = DFA12_max;
>+ this.accept = DFA12_accept;
>+ this.special = DFA12_special;
>+ this.transition = DFA12_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA12_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA12_0=='A') ) {s = 1;}
>+
>+ else if ( (LA12_0=='S') ) {s = 2;}
>+
>+ else if ( (LA12_0=='O') ) {s = 3;}
>+
>+ else if ( (LA12_0==':') ) {s = 4;}
>+
>+ else if ( (LA12_0=='e') ) {s = 5;}
>+
>+ else if ( (LA12_0=='d') ) {s = 6;}
>+
>+ else if ( (LA12_0=='^') ) {s = 7;}
>+
>+ else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='c')||(LA12_0>='f' && LA12_0<='z')) ) {s = 8;}
>+
>+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 9;}
>+
>+ else if ( (LA12_0=='\"') ) {s = 10;}
>+
>+ else if ( (LA12_0=='\'') ) {s = 11;}
>+
>+ else if ( (LA12_0=='/') ) {s = 12;}
>+
>+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 13;}
>+
>+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='.')||(LA12_0>=';' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 14;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA12_10 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_10>='\u0000' && LA12_10<='\uFFFF')) ) {s = 25;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA12_11 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_11>='\u0000' && LA12_11<='\uFFFF')) ) {s = 25;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 12, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
> 
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.tokens	(working copy)
>@@ -1,5 +1,13 @@
> RULE_ID=4
> RULE_STRING=6
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__11=11
>+T__14=14
>+T__13=13
> RULE_ANY_OTHER=10
> RULE_INT=5
> RULE_WS=9
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlStateParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlStateParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlStateParser.java	(working copy)
>@@ -27,6 +27,14 @@
> };
> public static final int RULE_ID=4;
> 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
> public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
> public static final int RULE_WS=9;
>@@ -34,12 +42,20 @@
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=7;
> 
>+ // delegates
>+ // delegators
>+
>+
> public InternalUmlStateParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlStateParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlStateParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g"; }
> 
> 
>@@ -63,7 +79,7 @@
> 
> 
> 
>- // $ANTLR start entryRuleStateRule
>+ // $ANTLR start "entryRuleStateRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:61:1: entryRuleStateRule : ruleStateRule EOF ;
> public final void entryRuleStateRule() throws RecognitionException {
> try {
>@@ -73,7 +89,8 @@
> before(grammarAccess.getStateRuleRule()); 
> pushFollow(FOLLOW_ruleStateRule_in_entryRuleStateRule61);
> ruleStateRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getStateRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleStateRule68); 
>@@ -89,10 +106,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleStateRule
>+ // $ANTLR end "entryRuleStateRule"
> 
> 
>- // $ANTLR start ruleStateRule
>+ // $ANTLR start "ruleStateRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:70:1: ruleStateRule : ( ( rule__StateRule__Group__0 ) ) ;
> public final void ruleStateRule() throws RecognitionException {
> 
>@@ -111,7 +128,8 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group__0_in_ruleStateRule94);
> rule__StateRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -135,10 +153,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleStateRule
>+ // $ANTLR end "ruleStateRule"
> 
> 
>- // $ANTLR start entryRuleSubmachineRule
>+ // $ANTLR start "entryRuleSubmachineRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:89:1: entryRuleSubmachineRule : ruleSubmachineRule EOF ;
> public final void entryRuleSubmachineRule() throws RecognitionException {
> try {
>@@ -148,7 +166,8 @@
> before(grammarAccess.getSubmachineRuleRule()); 
> pushFollow(FOLLOW_ruleSubmachineRule_in_entryRuleSubmachineRule121);
> ruleSubmachineRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getSubmachineRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleSubmachineRule128); 
>@@ -164,10 +183,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleSubmachineRule
>+ // $ANTLR end "entryRuleSubmachineRule"
> 
> 
>- // $ANTLR start ruleSubmachineRule
>+ // $ANTLR start "ruleSubmachineRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:98:1: ruleSubmachineRule : ( ( rule__SubmachineRule__Group__0 ) ) ;
> public final void ruleSubmachineRule() throws RecognitionException {
> 
>@@ -186,8 +205,9 @@
> {
> pushFollow(FOLLOW_rule__SubmachineRule__Group__0_in_ruleSubmachineRule154);
> rule__SubmachineRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -210,10 +230,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleSubmachineRule
>+ // $ANTLR end "ruleSubmachineRule"
> 
> 
>- // $ANTLR start entryRuleQualifiedName
>+ // $ANTLR start "entryRuleQualifiedName"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:117:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
> public final void entryRuleQualifiedName() throws RecognitionException {
> try {
>@@ -223,7 +243,8 @@
> before(grammarAccess.getQualifiedNameRule()); 
> pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName181);
> ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getQualifiedNameRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName188); 
>@@ -239,10 +260,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleQualifiedName
>+ // $ANTLR end "entryRuleQualifiedName"
> 
> 
>- // $ANTLR start ruleQualifiedName
>+ // $ANTLR start "ruleQualifiedName"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:126:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
> public final void ruleQualifiedName() throws RecognitionException {
> 
>@@ -261,8 +282,9 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName214);
> rule__QualifiedName__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -285,10 +307,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleQualifiedName
>+ // $ANTLR end "ruleQualifiedName"
> 
> 
>- // $ANTLR start entryRuleEntryRule
>+ // $ANTLR start "entryRuleEntryRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:145:1: entryRuleEntryRule : ruleEntryRule EOF ;
> public final void entryRuleEntryRule() throws RecognitionException {
> try {
>@@ -298,7 +320,8 @@
> before(grammarAccess.getEntryRuleRule()); 
> pushFollow(FOLLOW_ruleEntryRule_in_entryRuleEntryRule241);
> ruleEntryRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEntryRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleEntryRule248); 
>@@ -314,10 +337,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleEntryRule
>+ // $ANTLR end "entryRuleEntryRule"
> 
> 
>- // $ANTLR start ruleEntryRule
>+ // $ANTLR start "ruleEntryRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:154:1: ruleEntryRule : ( ( rule__EntryRule__Group__0 ) ) ;
> public final void ruleEntryRule() throws RecognitionException {
> 
>@@ -336,7 +359,8 @@
> {
> pushFollow(FOLLOW_rule__EntryRule__Group__0_in_ruleEntryRule274);
> rule__EntryRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -360,10 +384,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleEntryRule
>+ // $ANTLR end "ruleEntryRule"
> 
> 
>- // $ANTLR start entryRuleDoRule
>+ // $ANTLR start "entryRuleDoRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:173:1: entryRuleDoRule : ruleDoRule EOF ;
> public final void entryRuleDoRule() throws RecognitionException {
> try {
>@@ -373,7 +397,8 @@
> before(grammarAccess.getDoRuleRule()); 
> pushFollow(FOLLOW_ruleDoRule_in_entryRuleDoRule301);
> ruleDoRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getDoRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleDoRule308); 
>@@ -389,10 +414,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleDoRule
>+ // $ANTLR end "entryRuleDoRule"
> 
> 
>- // $ANTLR start ruleDoRule
>+ // $ANTLR start "ruleDoRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:182:1: ruleDoRule : ( ( rule__DoRule__Group__0 ) ) ;
> public final void ruleDoRule() throws RecognitionException {
> 
>@@ -411,8 +436,9 @@
> {
> pushFollow(FOLLOW_rule__DoRule__Group__0_in_ruleDoRule334);
> rule__DoRule__Group__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -435,10 +461,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleDoRule
>+ // $ANTLR end "ruleDoRule"
> 
> 
>- // $ANTLR start entryRuleExitRule
>+ // $ANTLR start "entryRuleExitRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:201:1: entryRuleExitRule : ruleExitRule EOF ;
> public final void entryRuleExitRule() throws RecognitionException {
> try {
>@@ -448,7 +474,8 @@
> before(grammarAccess.getExitRuleRule()); 
> pushFollow(FOLLOW_ruleExitRule_in_entryRuleExitRule361);
> ruleExitRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getExitRuleRule()); 
> match(input,EOF,FOLLOW_EOF_in_entryRuleExitRule368); 
>@@ -464,10 +491,10 @@
> }
> return ;
> }
>- // $ANTLR end entryRuleExitRule
>+ // $ANTLR end "entryRuleExitRule"
> 
> 
>- // $ANTLR start ruleExitRule
>+ // $ANTLR start "ruleExitRule"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:210:1: ruleExitRule : ( ( rule__ExitRule__Group__0 ) ) ;
> public final void ruleExitRule() throws RecognitionException {
> 
>@@ -486,7 +513,8 @@
> {
> pushFollow(FOLLOW_rule__ExitRule__Group__0_in_ruleExitRule394);
> rule__ExitRule__Group__0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -510,10 +538,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleExitRule
>+ // $ANTLR end "ruleExitRule"
> 
> 
>- // $ANTLR start ruleBehaviorKind
>+ // $ANTLR start "ruleBehaviorKind"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:230:1: ruleBehaviorKind : ( ( rule__BehaviorKind__Alternatives ) ) ;
> public final void ruleBehaviorKind() throws RecognitionException {
> 
>@@ -532,7 +560,8 @@
> {
> pushFollow(FOLLOW_rule__BehaviorKind__Alternatives_in_ruleBehaviorKind431);
> rule__BehaviorKind__Alternatives();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -556,10 +585,10 @@
> }
> return ;
> }
>- // $ANTLR end ruleBehaviorKind
>+ // $ANTLR end "ruleBehaviorKind"
> 
> 
>- // $ANTLR start rule__BehaviorKind__Alternatives
>+ // $ANTLR start "rule__BehaviorKind__Alternatives"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:248:1: rule__BehaviorKind__Alternatives : ( ( ( 'Activity' ) ) | ( ( 'StateMachine' ) ) | ( ( 'OpaqueBehavior' ) ) );
> public final void rule__BehaviorKind__Alternatives() throws RecognitionException {
> 
>@@ -586,7 +615,7 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("248:1: rule__BehaviorKind__Alternatives : ( ( ( 'Activity' ) ) | ( ( 'StateMachine' ) ) | ( ( 'OpaqueBehavior' ) ) );", 1, 0, input);
>+ new NoViableAltException("", 1, 0, input);
> 
> throw nvae;
> }
>@@ -669,10 +698,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__BehaviorKind__Alternatives
>+ // $ANTLR end "rule__BehaviorKind__Alternatives"
> 
> 
>- // $ANTLR start rule__StateRule__Group__0
>+ // $ANTLR start "rule__StateRule__Group__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:281:1: rule__StateRule__Group__0 : rule__StateRule__Group__0__Impl rule__StateRule__Group__1 ;
> public final void rule__StateRule__Group__0() throws RecognitionException {
> 
>@@ -684,12 +713,14 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group__0__Impl_in_rule__StateRule__Group__0542);
> rule__StateRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__StateRule__Group__1_in_rule__StateRule__Group__0545);
> rule__StateRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -705,10 +736,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group__0
>+ // $ANTLR end "rule__StateRule__Group__0"
> 
> 
>- // $ANTLR start rule__StateRule__Group__0__Impl
>+ // $ANTLR start "rule__StateRule__Group__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:293:1: rule__StateRule__Group__0__Impl : ( ( rule__StateRule__NameAssignment_0 ) ) ;
> public final void rule__StateRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -727,8 +758,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__NameAssignment_0_in_rule__StateRule__Group__0__Impl572);
> rule__StateRule__NameAssignment_0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -751,10 +783,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group__0__Impl
>+ // $ANTLR end "rule__StateRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__StateRule__Group__1
>+ // $ANTLR start "rule__StateRule__Group__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:310:1: rule__StateRule__Group__1 : rule__StateRule__Group__1__Impl rule__StateRule__Group__2 ;
> public final void rule__StateRule__Group__1() throws RecognitionException {
> 
>@@ -766,11 +798,13 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group__1__Impl_in_rule__StateRule__Group__1602);
> rule__StateRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__StateRule__Group__2_in_rule__StateRule__Group__1605);
> rule__StateRule__Group__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -787,10 +821,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group__1
>+ // $ANTLR end "rule__StateRule__Group__1"
> 
> 
>- // $ANTLR start rule__StateRule__Group__1__Impl
>+ // $ANTLR start "rule__StateRule__Group__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:322:1: rule__StateRule__Group__1__Impl : ( ( rule__StateRule__Group_1__0 )? ) ;
> public final void rule__StateRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -817,8 +851,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group_1__0_in_rule__StateRule__Group__1__Impl632);
> rule__StateRule__Group_1__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -844,10 +879,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group__1__Impl
>+ // $ANTLR end "rule__StateRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__StateRule__Group__2
>+ // $ANTLR start "rule__StateRule__Group__2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:339:1: rule__StateRule__Group__2 : rule__StateRule__Group__2__Impl ;
> public final void rule__StateRule__Group__2() throws RecognitionException {
> 
>@@ -859,8 +894,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group__2__Impl_in_rule__StateRule__Group__2663);
> rule__StateRule__Group__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -876,10 +912,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group__2
>+ // $ANTLR end "rule__StateRule__Group__2"
> 
> 
>- // $ANTLR start rule__StateRule__Group__2__Impl
>+ // $ANTLR start "rule__StateRule__Group__2__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:350:1: rule__StateRule__Group__2__Impl : ( ( rule__StateRule__UnorderedGroup_2 ) ) ;
> public final void rule__StateRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -898,8 +934,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2_in_rule__StateRule__Group__2__Impl690);
> rule__StateRule__UnorderedGroup_2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -922,10 +959,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group__2__Impl
>+ // $ANTLR end "rule__StateRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__StateRule__Group_1__0
>+ // $ANTLR start "rule__StateRule__Group_1__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:373:1: rule__StateRule__Group_1__0 : rule__StateRule__Group_1__0__Impl rule__StateRule__Group_1__1 ;
> public final void rule__StateRule__Group_1__0() throws RecognitionException {
> 
>@@ -937,11 +974,13 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group_1__0__Impl_in_rule__StateRule__Group_1__0726);
> rule__StateRule__Group_1__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__StateRule__Group_1__1_in_rule__StateRule__Group_1__0729);
> rule__StateRule__Group_1__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -958,10 +997,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group_1__0
>+ // $ANTLR end "rule__StateRule__Group_1__0"
> 
> 
>- // $ANTLR start rule__StateRule__Group_1__0__Impl
>+ // $ANTLR start "rule__StateRule__Group_1__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:385:1: rule__StateRule__Group_1__0__Impl : ( ':' ) ;
> public final void rule__StateRule__Group_1__0__Impl() throws RecognitionException {
> 
>@@ -995,10 +1034,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group_1__0__Impl
>+ // $ANTLR end "rule__StateRule__Group_1__0__Impl"
> 
> 
>- // $ANTLR start rule__StateRule__Group_1__1
>+ // $ANTLR start "rule__StateRule__Group_1__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:404:1: rule__StateRule__Group_1__1 : rule__StateRule__Group_1__1__Impl ;
> public final void rule__StateRule__Group_1__1() throws RecognitionException {
> 
>@@ -1010,8 +1049,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__Group_1__1__Impl_in_rule__StateRule__Group_1__1788);
> rule__StateRule__Group_1__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1027,10 +1067,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group_1__1
>+ // $ANTLR end "rule__StateRule__Group_1__1"
> 
> 
>- // $ANTLR start rule__StateRule__Group_1__1__Impl
>+ // $ANTLR start "rule__StateRule__Group_1__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:415:1: rule__StateRule__Group_1__1__Impl : ( ( rule__StateRule__SubmachineAssignment_1_1 ) ) ;
> public final void rule__StateRule__Group_1__1__Impl() throws RecognitionException {
> 
>@@ -1049,8 +1089,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__SubmachineAssignment_1_1_in_rule__StateRule__Group_1__1__Impl815);
> rule__StateRule__SubmachineAssignment_1_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1073,10 +1114,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__Group_1__1__Impl
>+ // $ANTLR end "rule__StateRule__Group_1__1__Impl"
> 
> 
>- // $ANTLR start rule__SubmachineRule__Group__0
>+ // $ANTLR start "rule__SubmachineRule__Group__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:436:1: rule__SubmachineRule__Group__0 : rule__SubmachineRule__Group__0__Impl rule__SubmachineRule__Group__1 ;
> public final void rule__SubmachineRule__Group__0() throws RecognitionException {
> 
>@@ -1088,11 +1129,13 @@
> {
> pushFollow(FOLLOW_rule__SubmachineRule__Group__0__Impl_in_rule__SubmachineRule__Group__0849);
> rule__SubmachineRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__SubmachineRule__Group__1_in_rule__SubmachineRule__Group__0852);
> rule__SubmachineRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1109,10 +1152,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubmachineRule__Group__0
>+ // $ANTLR end "rule__SubmachineRule__Group__0"
> 
> 
>- // $ANTLR start rule__SubmachineRule__Group__0__Impl
>+ // $ANTLR start "rule__SubmachineRule__Group__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:448:1: rule__SubmachineRule__Group__0__Impl : ( ( rule__SubmachineRule__PathAssignment_0 )? ) ;
> public final void rule__SubmachineRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -1143,7 +1186,8 @@
> {
> pushFollow(FOLLOW_rule__SubmachineRule__PathAssignment_0_in_rule__SubmachineRule__Group__0__Impl879);
> rule__SubmachineRule__PathAssignment_0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1170,10 +1214,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubmachineRule__Group__0__Impl
>+ // $ANTLR end "rule__SubmachineRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__SubmachineRule__Group__1
>+ // $ANTLR start "rule__SubmachineRule__Group__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:465:1: rule__SubmachineRule__Group__1 : rule__SubmachineRule__Group__1__Impl ;
> public final void rule__SubmachineRule__Group__1() throws RecognitionException {
> 
>@@ -1185,8 +1229,9 @@
> {
> pushFollow(FOLLOW_rule__SubmachineRule__Group__1__Impl_in_rule__SubmachineRule__Group__1910);
> rule__SubmachineRule__Group__1__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1202,10 +1247,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubmachineRule__Group__1
>+ // $ANTLR end "rule__SubmachineRule__Group__1"
> 
> 
>- // $ANTLR start rule__SubmachineRule__Group__1__Impl
>+ // $ANTLR start "rule__SubmachineRule__Group__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:476:1: rule__SubmachineRule__Group__1__Impl : ( ( rule__SubmachineRule__SubmachineAssignment_1 ) ) ;
> public final void rule__SubmachineRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1224,8 +1269,9 @@
> {
> pushFollow(FOLLOW_rule__SubmachineRule__SubmachineAssignment_1_in_rule__SubmachineRule__Group__1__Impl937);
> rule__SubmachineRule__SubmachineAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1248,10 +1294,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubmachineRule__Group__1__Impl
>+ // $ANTLR end "rule__SubmachineRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__0
>+ // $ANTLR start "rule__QualifiedName__Group__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:497:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
> public final void rule__QualifiedName__Group__0() throws RecognitionException {
> 
>@@ -1263,11 +1309,13 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0971);
> rule__QualifiedName__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0974);
> rule__QualifiedName__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1284,10 +1332,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__0
>+ // $ANTLR end "rule__QualifiedName__Group__0"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__0__Impl
>+ // $ANTLR start "rule__QualifiedName__Group__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:509:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
> public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
> 
>@@ -1306,7 +1354,8 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1001);
> rule__QualifiedName__PathAssignment_0();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1330,10 +1379,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__0__Impl
>+ // $ANTLR end "rule__QualifiedName__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__1
>+ // $ANTLR start "rule__QualifiedName__Group__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:526:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
> public final void rule__QualifiedName__Group__1() throws RecognitionException {
> 
>@@ -1345,12 +1394,14 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11031);
> rule__QualifiedName__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11034);
> rule__QualifiedName__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1366,10 +1417,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__1
>+ // $ANTLR end "rule__QualifiedName__Group__1"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__1__Impl
>+ // $ANTLR start "rule__QualifiedName__Group__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:538:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
> public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
> 
>@@ -1403,10 +1454,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__1__Impl
>+ // $ANTLR end "rule__QualifiedName__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__2
>+ // $ANTLR start "rule__QualifiedName__Group__2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:557:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
> public final void rule__QualifiedName__Group__2() throws RecognitionException {
> 
>@@ -1418,8 +1469,9 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21093);
> rule__QualifiedName__Group__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1435,10 +1487,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__2
>+ // $ANTLR end "rule__QualifiedName__Group__2"
> 
> 
>- // $ANTLR start rule__QualifiedName__Group__2__Impl
>+ // $ANTLR start "rule__QualifiedName__Group__2__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:568:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
> public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
> 
>@@ -1469,7 +1521,8 @@
> {
> pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1120);
> rule__QualifiedName__RemainingAssignment_2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1496,10 +1549,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__Group__2__Impl
>+ // $ANTLR end "rule__QualifiedName__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__EntryRule__Group__0
>+ // $ANTLR start "rule__EntryRule__Group__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:591:1: rule__EntryRule__Group__0 : rule__EntryRule__Group__0__Impl rule__EntryRule__Group__1 ;
> public final void rule__EntryRule__Group__0() throws RecognitionException {
> 
>@@ -1511,12 +1564,14 @@
> {
> pushFollow(FOLLOW_rule__EntryRule__Group__0__Impl_in_rule__EntryRule__Group__01157);
> rule__EntryRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__EntryRule__Group__1_in_rule__EntryRule__Group__01160);
> rule__EntryRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1532,10 +1587,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__Group__0
>+ // $ANTLR end "rule__EntryRule__Group__0"
> 
> 
>- // $ANTLR start rule__EntryRule__Group__0__Impl
>+ // $ANTLR start "rule__EntryRule__Group__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:603:1: rule__EntryRule__Group__0__Impl : ( 'entry' ) ;
> public final void rule__EntryRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -1569,10 +1624,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__Group__0__Impl
>+ // $ANTLR end "rule__EntryRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__EntryRule__Group__1
>+ // $ANTLR start "rule__EntryRule__Group__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:622:1: rule__EntryRule__Group__1 : rule__EntryRule__Group__1__Impl rule__EntryRule__Group__2 ;
> public final void rule__EntryRule__Group__1() throws RecognitionException {
> 
>@@ -1584,12 +1639,14 @@
> {
> pushFollow(FOLLOW_rule__EntryRule__Group__1__Impl_in_rule__EntryRule__Group__11219);
> rule__EntryRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__EntryRule__Group__2_in_rule__EntryRule__Group__11222);
> rule__EntryRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1605,10 +1662,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__Group__1
>+ // $ANTLR end "rule__EntryRule__Group__1"
> 
> 
>- // $ANTLR start rule__EntryRule__Group__1__Impl
>+ // $ANTLR start "rule__EntryRule__Group__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:634:1: rule__EntryRule__Group__1__Impl : ( ( rule__EntryRule__KindAssignment_1 ) ) ;
> public final void rule__EntryRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1627,7 +1684,8 @@
> {
> pushFollow(FOLLOW_rule__EntryRule__KindAssignment_1_in_rule__EntryRule__Group__1__Impl1249);
> rule__EntryRule__KindAssignment_1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1651,10 +1709,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__Group__1__Impl
>+ // $ANTLR end "rule__EntryRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__EntryRule__Group__2
>+ // $ANTLR start "rule__EntryRule__Group__2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:651:1: rule__EntryRule__Group__2 : rule__EntryRule__Group__2__Impl ;
> public final void rule__EntryRule__Group__2() throws RecognitionException {
> 
>@@ -1666,7 +1724,8 @@
> {
> pushFollow(FOLLOW_rule__EntryRule__Group__2__Impl_in_rule__EntryRule__Group__21279);
> rule__EntryRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1683,10 +1742,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__Group__2
>+ // $ANTLR end "rule__EntryRule__Group__2"
> 
> 
>- // $ANTLR start rule__EntryRule__Group__2__Impl
>+ // $ANTLR start "rule__EntryRule__Group__2__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:662:1: rule__EntryRule__Group__2__Impl : ( ( rule__EntryRule__BehaviorNameAssignment_2 ) ) ;
> public final void rule__EntryRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -1705,8 +1764,9 @@
> {
> pushFollow(FOLLOW_rule__EntryRule__BehaviorNameAssignment_2_in_rule__EntryRule__Group__2__Impl1306);
> rule__EntryRule__BehaviorNameAssignment_2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1729,10 +1789,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__Group__2__Impl
>+ // $ANTLR end "rule__EntryRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__DoRule__Group__0
>+ // $ANTLR start "rule__DoRule__Group__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:685:1: rule__DoRule__Group__0 : rule__DoRule__Group__0__Impl rule__DoRule__Group__1 ;
> public final void rule__DoRule__Group__0() throws RecognitionException {
> 
>@@ -1744,12 +1804,14 @@
> {
> pushFollow(FOLLOW_rule__DoRule__Group__0__Impl_in_rule__DoRule__Group__01342);
> rule__DoRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__DoRule__Group__1_in_rule__DoRule__Group__01345);
> rule__DoRule__Group__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1765,10 +1827,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__Group__0
>+ // $ANTLR end "rule__DoRule__Group__0"
> 
> 
>- // $ANTLR start rule__DoRule__Group__0__Impl
>+ // $ANTLR start "rule__DoRule__Group__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:697:1: rule__DoRule__Group__0__Impl : ( 'do' ) ;
> public final void rule__DoRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -1802,10 +1864,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__Group__0__Impl
>+ // $ANTLR end "rule__DoRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__DoRule__Group__1
>+ // $ANTLR start "rule__DoRule__Group__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:716:1: rule__DoRule__Group__1 : rule__DoRule__Group__1__Impl rule__DoRule__Group__2 ;
> public final void rule__DoRule__Group__1() throws RecognitionException {
> 
>@@ -1817,11 +1879,13 @@
> {
> pushFollow(FOLLOW_rule__DoRule__Group__1__Impl_in_rule__DoRule__Group__11404);
> rule__DoRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__DoRule__Group__2_in_rule__DoRule__Group__11407);
> rule__DoRule__Group__2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1838,10 +1902,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__Group__1
>+ // $ANTLR end "rule__DoRule__Group__1"
> 
> 
>- // $ANTLR start rule__DoRule__Group__1__Impl
>+ // $ANTLR start "rule__DoRule__Group__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:728:1: rule__DoRule__Group__1__Impl : ( ( rule__DoRule__KindAssignment_1 ) ) ;
> public final void rule__DoRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -1860,8 +1924,9 @@
> {
> pushFollow(FOLLOW_rule__DoRule__KindAssignment_1_in_rule__DoRule__Group__1__Impl1434);
> rule__DoRule__KindAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1884,10 +1949,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__Group__1__Impl
>+ // $ANTLR end "rule__DoRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__DoRule__Group__2
>+ // $ANTLR start "rule__DoRule__Group__2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:745:1: rule__DoRule__Group__2 : rule__DoRule__Group__2__Impl ;
> public final void rule__DoRule__Group__2() throws RecognitionException {
> 
>@@ -1899,8 +1964,9 @@
> {
> pushFollow(FOLLOW_rule__DoRule__Group__2__Impl_in_rule__DoRule__Group__21464);
> rule__DoRule__Group__2__Impl();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1916,10 +1982,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__Group__2
>+ // $ANTLR end "rule__DoRule__Group__2"
> 
> 
>- // $ANTLR start rule__DoRule__Group__2__Impl
>+ // $ANTLR start "rule__DoRule__Group__2__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:756:1: rule__DoRule__Group__2__Impl : ( ( rule__DoRule__BehaviorNameAssignment_2 ) ) ;
> public final void rule__DoRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -1938,8 +2004,9 @@
> {
> pushFollow(FOLLOW_rule__DoRule__BehaviorNameAssignment_2_in_rule__DoRule__Group__2__Impl1491);
> rule__DoRule__BehaviorNameAssignment_2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -1962,10 +2029,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__Group__2__Impl
>+ // $ANTLR end "rule__DoRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__ExitRule__Group__0
>+ // $ANTLR start "rule__ExitRule__Group__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:779:1: rule__ExitRule__Group__0 : rule__ExitRule__Group__0__Impl rule__ExitRule__Group__1 ;
> public final void rule__ExitRule__Group__0() throws RecognitionException {
> 
>@@ -1977,11 +2044,13 @@
> {
> pushFollow(FOLLOW_rule__ExitRule__Group__0__Impl_in_rule__ExitRule__Group__01527);
> rule__ExitRule__Group__0__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ExitRule__Group__1_in_rule__ExitRule__Group__01530);
> rule__ExitRule__Group__1();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -1998,10 +2067,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__Group__0
>+ // $ANTLR end "rule__ExitRule__Group__0"
> 
> 
>- // $ANTLR start rule__ExitRule__Group__0__Impl
>+ // $ANTLR start "rule__ExitRule__Group__0__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:791:1: rule__ExitRule__Group__0__Impl : ( 'exit' ) ;
> public final void rule__ExitRule__Group__0__Impl() throws RecognitionException {
> 
>@@ -2035,10 +2104,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__Group__0__Impl
>+ // $ANTLR end "rule__ExitRule__Group__0__Impl"
> 
> 
>- // $ANTLR start rule__ExitRule__Group__1
>+ // $ANTLR start "rule__ExitRule__Group__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:810:1: rule__ExitRule__Group__1 : rule__ExitRule__Group__1__Impl rule__ExitRule__Group__2 ;
> public final void rule__ExitRule__Group__1() throws RecognitionException {
> 
>@@ -2050,12 +2119,14 @@
> {
> pushFollow(FOLLOW_rule__ExitRule__Group__1__Impl_in_rule__ExitRule__Group__11589);
> rule__ExitRule__Group__1__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> pushFollow(FOLLOW_rule__ExitRule__Group__2_in_rule__ExitRule__Group__11592);
> rule__ExitRule__Group__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2071,10 +2142,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__Group__1
>+ // $ANTLR end "rule__ExitRule__Group__1"
> 
> 
>- // $ANTLR start rule__ExitRule__Group__1__Impl
>+ // $ANTLR start "rule__ExitRule__Group__1__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:822:1: rule__ExitRule__Group__1__Impl : ( ( rule__ExitRule__KindAssignment_1 ) ) ;
> public final void rule__ExitRule__Group__1__Impl() throws RecognitionException {
> 
>@@ -2093,8 +2164,9 @@
> {
> pushFollow(FOLLOW_rule__ExitRule__KindAssignment_1_in_rule__ExitRule__Group__1__Impl1619);
> rule__ExitRule__KindAssignment_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2117,10 +2189,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__Group__1__Impl
>+ // $ANTLR end "rule__ExitRule__Group__1__Impl"
> 
> 
>- // $ANTLR start rule__ExitRule__Group__2
>+ // $ANTLR start "rule__ExitRule__Group__2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:839:1: rule__ExitRule__Group__2 : rule__ExitRule__Group__2__Impl ;
> public final void rule__ExitRule__Group__2() throws RecognitionException {
> 
>@@ -2132,7 +2204,8 @@
> {
> pushFollow(FOLLOW_rule__ExitRule__Group__2__Impl_in_rule__ExitRule__Group__21649);
> rule__ExitRule__Group__2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2149,10 +2222,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__Group__2
>+ // $ANTLR end "rule__ExitRule__Group__2"
> 
> 
>- // $ANTLR start rule__ExitRule__Group__2__Impl
>+ // $ANTLR start "rule__ExitRule__Group__2__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:850:1: rule__ExitRule__Group__2__Impl : ( ( rule__ExitRule__BehaviorNameAssignment_2 ) ) ;
> public final void rule__ExitRule__Group__2__Impl() throws RecognitionException {
> 
>@@ -2171,7 +2244,8 @@
> {
> pushFollow(FOLLOW_rule__ExitRule__BehaviorNameAssignment_2_in_rule__ExitRule__Group__2__Impl1676);
> rule__ExitRule__BehaviorNameAssignment_2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2195,10 +2269,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__Group__2__Impl
>+ // $ANTLR end "rule__ExitRule__Group__2__Impl"
> 
> 
>- // $ANTLR start rule__StateRule__UnorderedGroup_2
>+ // $ANTLR start "rule__StateRule__UnorderedGroup_2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:874:1: rule__StateRule__UnorderedGroup_2 : ( rule__StateRule__UnorderedGroup_2__0 )? ;
> public final void rule__StateRule__UnorderedGroup_2() throws RecognitionException {
> 
>@@ -2228,8 +2302,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2__0_in_rule__StateRule__UnorderedGroup_21713);
> rule__StateRule__UnorderedGroup_2__0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -2252,10 +2327,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__UnorderedGroup_2
>+ // $ANTLR end "rule__StateRule__UnorderedGroup_2"
> 
> 
>- // $ANTLR start rule__StateRule__UnorderedGroup_2__Impl
>+ // $ANTLR start "rule__StateRule__UnorderedGroup_2__Impl"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:890:1: rule__StateRule__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__StateRule__EntryAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__StateRule__DoAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__StateRule__ExitAssignment_2_2 ) ) ) ) ) ;
> public final void rule__StateRule__UnorderedGroup_2__Impl() throws RecognitionException {
> 
>@@ -2281,7 +2356,7 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("896:3: ( ({...}? => ( ( ( rule__StateRule__EntryAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__StateRule__DoAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__StateRule__ExitAssignment_2_2 ) ) ) ) )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
>@@ -2313,8 +2388,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__EntryAssignment_2_0_in_rule__StateRule__UnorderedGroup_2__Impl1800);
> rule__StateRule__EntryAssignment_2_0();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2358,8 +2434,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__DoAssignment_2_1_in_rule__StateRule__UnorderedGroup_2__Impl1891);
> rule__StateRule__DoAssignment_2_1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> 
>@@ -2403,7 +2480,8 @@
> {
> pushFollow(FOLLOW_rule__StateRule__ExitAssignment_2_2_in_rule__StateRule__UnorderedGroup_2__Impl1982);
> rule__StateRule__ExitAssignment_2_2();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2441,10 +2519,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__UnorderedGroup_2__Impl
>+ // $ANTLR end "rule__StateRule__UnorderedGroup_2__Impl"
> 
> 
>- // $ANTLR start rule__StateRule__UnorderedGroup_2__0
>+ // $ANTLR start "rule__StateRule__UnorderedGroup_2__0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:958:1: rule__StateRule__UnorderedGroup_2__0 : rule__StateRule__UnorderedGroup_2__Impl ( rule__StateRule__UnorderedGroup_2__1 )? ;
> public final void rule__StateRule__UnorderedGroup_2__0() throws RecognitionException {
> 
>@@ -2456,7 +2534,8 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2__Impl_in_rule__StateRule__UnorderedGroup_2__02041);
> rule__StateRule__UnorderedGroup_2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:964:2: ( rule__StateRule__UnorderedGroup_2__1 )?
> int alt7=2;
>@@ -2477,8 +2556,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2__1_in_rule__StateRule__UnorderedGroup_2__02044);
> rule__StateRule__UnorderedGroup_2__1();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -2500,10 +2580,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__UnorderedGroup_2__0
>+ // $ANTLR end "rule__StateRule__UnorderedGroup_2__0"
> 
> 
>- // $ANTLR start rule__StateRule__UnorderedGroup_2__1
>+ // $ANTLR start "rule__StateRule__UnorderedGroup_2__1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:971:1: rule__StateRule__UnorderedGroup_2__1 : rule__StateRule__UnorderedGroup_2__Impl ( rule__StateRule__UnorderedGroup_2__2 )? ;
> public final void rule__StateRule__UnorderedGroup_2__1() throws RecognitionException {
> 
>@@ -2515,7 +2595,8 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2__Impl_in_rule__StateRule__UnorderedGroup_2__12069);
> rule__StateRule__UnorderedGroup_2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:977:2: ( rule__StateRule__UnorderedGroup_2__2 )?
> int alt8=2;
>@@ -2536,8 +2617,9 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2__2_in_rule__StateRule__UnorderedGroup_2__12072);
> rule__StateRule__UnorderedGroup_2__2();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> }
> break;
>@@ -2559,10 +2641,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__UnorderedGroup_2__1
>+ // $ANTLR end "rule__StateRule__UnorderedGroup_2__1"
> 
> 
>- // $ANTLR start rule__StateRule__UnorderedGroup_2__2
>+ // $ANTLR start "rule__StateRule__UnorderedGroup_2__2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:984:1: rule__StateRule__UnorderedGroup_2__2 : rule__StateRule__UnorderedGroup_2__Impl ;
> public final void rule__StateRule__UnorderedGroup_2__2() throws RecognitionException {
> 
>@@ -2574,7 +2656,8 @@
> {
> pushFollow(FOLLOW_rule__StateRule__UnorderedGroup_2__Impl_in_rule__StateRule__UnorderedGroup_2__22097);
> rule__StateRule__UnorderedGroup_2__Impl();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> }
>@@ -2591,10 +2674,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__UnorderedGroup_2__2
>+ // $ANTLR end "rule__StateRule__UnorderedGroup_2__2"
> 
> 
>- // $ANTLR start rule__StateRule__NameAssignment_0
>+ // $ANTLR start "rule__StateRule__NameAssignment_0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1002:1: rule__StateRule__NameAssignment_0 : ( RULE_ID ) ;
> public final void rule__StateRule__NameAssignment_0() throws RecognitionException {
> 
>@@ -2628,10 +2711,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__NameAssignment_0
>+ // $ANTLR end "rule__StateRule__NameAssignment_0"
> 
> 
>- // $ANTLR start rule__StateRule__SubmachineAssignment_1_1
>+ // $ANTLR start "rule__StateRule__SubmachineAssignment_1_1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1017:1: rule__StateRule__SubmachineAssignment_1_1 : ( ruleSubmachineRule ) ;
> public final void rule__StateRule__SubmachineAssignment_1_1() throws RecognitionException {
> 
>@@ -2647,7 +2730,8 @@
> before(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0()); 
> pushFollow(FOLLOW_ruleSubmachineRule_in_rule__StateRule__SubmachineAssignment_1_12162);
> ruleSubmachineRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0()); 
> 
>@@ -2668,10 +2752,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__SubmachineAssignment_1_1
>+ // $ANTLR end "rule__StateRule__SubmachineAssignment_1_1"
> 
> 
>- // $ANTLR start rule__StateRule__EntryAssignment_2_0
>+ // $ANTLR start "rule__StateRule__EntryAssignment_2_0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1032:1: rule__StateRule__EntryAssignment_2_0 : ( ruleEntryRule ) ;
> public final void rule__StateRule__EntryAssignment_2_0() throws RecognitionException {
> 
>@@ -2687,7 +2771,8 @@
> before(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0()); 
> pushFollow(FOLLOW_ruleEntryRule_in_rule__StateRule__EntryAssignment_2_02193);
> ruleEntryRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0()); 
> 
>@@ -2708,10 +2793,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__EntryAssignment_2_0
>+ // $ANTLR end "rule__StateRule__EntryAssignment_2_0"
> 
> 
>- // $ANTLR start rule__StateRule__DoAssignment_2_1
>+ // $ANTLR start "rule__StateRule__DoAssignment_2_1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1047:1: rule__StateRule__DoAssignment_2_1 : ( ruleDoRule ) ;
> public final void rule__StateRule__DoAssignment_2_1() throws RecognitionException {
> 
>@@ -2727,7 +2812,8 @@
> before(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0()); 
> pushFollow(FOLLOW_ruleDoRule_in_rule__StateRule__DoAssignment_2_12224);
> ruleDoRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0()); 
> 
>@@ -2748,10 +2834,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__DoAssignment_2_1
>+ // $ANTLR end "rule__StateRule__DoAssignment_2_1"
> 
> 
>- // $ANTLR start rule__StateRule__ExitAssignment_2_2
>+ // $ANTLR start "rule__StateRule__ExitAssignment_2_2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1062:1: rule__StateRule__ExitAssignment_2_2 : ( ruleExitRule ) ;
> public final void rule__StateRule__ExitAssignment_2_2() throws RecognitionException {
> 
>@@ -2767,7 +2853,8 @@
> before(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0()); 
> pushFollow(FOLLOW_ruleExitRule_in_rule__StateRule__ExitAssignment_2_22255);
> ruleExitRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0()); 
> 
>@@ -2788,10 +2875,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__StateRule__ExitAssignment_2_2
>+ // $ANTLR end "rule__StateRule__ExitAssignment_2_2"
> 
> 
>- // $ANTLR start rule__SubmachineRule__PathAssignment_0
>+ // $ANTLR start "rule__SubmachineRule__PathAssignment_0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1077:1: rule__SubmachineRule__PathAssignment_0 : ( ruleQualifiedName ) ;
> public final void rule__SubmachineRule__PathAssignment_0() throws RecognitionException {
> 
>@@ -2807,7 +2894,8 @@
> before(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> pushFollow(FOLLOW_ruleQualifiedName_in_rule__SubmachineRule__PathAssignment_02286);
> ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 
>@@ -2828,10 +2916,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubmachineRule__PathAssignment_0
>+ // $ANTLR end "rule__SubmachineRule__PathAssignment_0"
> 
> 
>- // $ANTLR start rule__SubmachineRule__SubmachineAssignment_1
>+ // $ANTLR start "rule__SubmachineRule__SubmachineAssignment_1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1092:1: rule__SubmachineRule__SubmachineAssignment_1 : ( ( RULE_ID ) ) ;
> public final void rule__SubmachineRule__SubmachineAssignment_1() throws RecognitionException {
> 
>@@ -2873,10 +2961,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__SubmachineRule__SubmachineAssignment_1
>+ // $ANTLR end "rule__SubmachineRule__SubmachineAssignment_1"
> 
> 
>- // $ANTLR start rule__QualifiedName__PathAssignment_0
>+ // $ANTLR start "rule__QualifiedName__PathAssignment_0"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1111:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
> public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
> 
>@@ -2918,10 +3006,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__PathAssignment_0
>+ // $ANTLR end "rule__QualifiedName__PathAssignment_0"
> 
> 
>- // $ANTLR start rule__QualifiedName__RemainingAssignment_2
>+ // $ANTLR start "rule__QualifiedName__RemainingAssignment_2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1130:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
> public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
> 
>@@ -2937,7 +3025,8 @@
> before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_22395);
> ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 
>@@ -2958,10 +3047,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__QualifiedName__RemainingAssignment_2
>+ // $ANTLR end "rule__QualifiedName__RemainingAssignment_2"
> 
> 
>- // $ANTLR start rule__EntryRule__KindAssignment_1
>+ // $ANTLR start "rule__EntryRule__KindAssignment_1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1145:1: rule__EntryRule__KindAssignment_1 : ( ruleBehaviorKind ) ;
> public final void rule__EntryRule__KindAssignment_1() throws RecognitionException {
> 
>@@ -2977,7 +3066,8 @@
> before(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleBehaviorKind_in_rule__EntryRule__KindAssignment_12426);
> ruleBehaviorKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 
>@@ -2998,10 +3088,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__KindAssignment_1
>+ // $ANTLR end "rule__EntryRule__KindAssignment_1"
> 
> 
>- // $ANTLR start rule__EntryRule__BehaviorNameAssignment_2
>+ // $ANTLR start "rule__EntryRule__BehaviorNameAssignment_2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1160:1: rule__EntryRule__BehaviorNameAssignment_2 : ( RULE_ID ) ;
> public final void rule__EntryRule__BehaviorNameAssignment_2() throws RecognitionException {
> 
>@@ -3035,10 +3125,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__EntryRule__BehaviorNameAssignment_2
>+ // $ANTLR end "rule__EntryRule__BehaviorNameAssignment_2"
> 
> 
>- // $ANTLR start rule__DoRule__KindAssignment_1
>+ // $ANTLR start "rule__DoRule__KindAssignment_1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1175:1: rule__DoRule__KindAssignment_1 : ( ruleBehaviorKind ) ;
> public final void rule__DoRule__KindAssignment_1() throws RecognitionException {
> 
>@@ -3054,7 +3144,8 @@
> before(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleBehaviorKind_in_rule__DoRule__KindAssignment_12488);
> ruleBehaviorKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 
>@@ -3075,10 +3166,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__KindAssignment_1
>+ // $ANTLR end "rule__DoRule__KindAssignment_1"
> 
> 
>- // $ANTLR start rule__DoRule__BehaviorNameAssignment_2
>+ // $ANTLR start "rule__DoRule__BehaviorNameAssignment_2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1190:1: rule__DoRule__BehaviorNameAssignment_2 : ( RULE_ID ) ;
> public final void rule__DoRule__BehaviorNameAssignment_2() throws RecognitionException {
> 
>@@ -3112,10 +3203,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__DoRule__BehaviorNameAssignment_2
>+ // $ANTLR end "rule__DoRule__BehaviorNameAssignment_2"
> 
> 
>- // $ANTLR start rule__ExitRule__KindAssignment_1
>+ // $ANTLR start "rule__ExitRule__KindAssignment_1"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1205:1: rule__ExitRule__KindAssignment_1 : ( ruleBehaviorKind ) ;
> public final void rule__ExitRule__KindAssignment_1() throws RecognitionException {
> 
>@@ -3131,7 +3222,8 @@
> before(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> pushFollow(FOLLOW_ruleBehaviorKind_in_rule__ExitRule__KindAssignment_12550);
> ruleBehaviorKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> after(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 
>@@ -3152,10 +3244,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__KindAssignment_1
>+ // $ANTLR end "rule__ExitRule__KindAssignment_1"
> 
> 
>- // $ANTLR start rule__ExitRule__BehaviorNameAssignment_2
>+ // $ANTLR start "rule__ExitRule__BehaviorNameAssignment_2"
> // ../org.eclipse.papyrus.state.editor.xtext.ui/src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g:1220:1: rule__ExitRule__BehaviorNameAssignment_2 : ( RULE_ID ) ;
> public final void rule__ExitRule__BehaviorNameAssignment_2() throws RecognitionException {
> 
>@@ -3189,8 +3281,10 @@
> }
> return ;
> }
>- // $ANTLR end rule__ExitRule__BehaviorNameAssignment_2
>+ // $ANTLR end "rule__ExitRule__BehaviorNameAssignment_2"
> 
>+ // Delegated rules
>+
> 
> 
> 
>@@ -3216,10 +3310,10 @@
> public static final BitSet FOLLOW_11_in_rule__BehaviorKind__Alternatives467 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_12_in_rule__BehaviorKind__Alternatives488 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_13_in_rule__BehaviorKind__Alternatives509 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__StateRule__Group__0__Impl_in_rule__StateRule__Group__0542 = new BitSet(new long[]{0x0000000000074002L});
>+ public static final BitSet FOLLOW_rule__StateRule__Group__0__Impl_in_rule__StateRule__Group__0542 = new BitSet(new long[]{0x0000000000074000L});
> public static final BitSet FOLLOW_rule__StateRule__Group__1_in_rule__StateRule__Group__0545 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__StateRule__NameAssignment_0_in_rule__StateRule__Group__0__Impl572 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__StateRule__Group__1__Impl_in_rule__StateRule__Group__1602 = new BitSet(new long[]{0x0000000000070002L});
>+ public static final BitSet FOLLOW_rule__StateRule__Group__1__Impl_in_rule__StateRule__Group__1602 = new BitSet(new long[]{0x0000000000074000L});
> public static final BitSet FOLLOW_rule__StateRule__Group__2_in_rule__StateRule__Group__1605 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__StateRule__Group_1__0_in_rule__StateRule__Group__1__Impl632 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__StateRule__Group__2__Impl_in_rule__StateRule__Group__2663 = new BitSet(new long[]{0x0000000000000002L});
>@@ -3237,7 +3331,7 @@
> public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0971 = new BitSet(new long[]{0x0000000000008000L});
> public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0974 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1001 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11031 = new BitSet(new long[]{0x0000000000000012L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11031 = new BitSet(new long[]{0x0000000000000010L});
> public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11034 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_15_in_rule__QualifiedName__Group__1__Impl1062 = new BitSet(new long[]{0x0000000000000002L});
> public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21093 = new BitSet(new long[]{0x0000000000000002L});
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/contentassist/antlr/internal/InternalUmlState.g	(working copy)
>@@ -1237,7 +1237,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/ui/UmlStateExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/ui/UmlStateExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/ui/UmlStateExecutableExtensionFactory.java	(working copy)
>@@ -1,8 +1,6 @@
>-
> /*
> * generated by Xtext
> */
>- 
> package org.eclipse.papyrus.state.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -11,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- *@generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlStateExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>Index: src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateTransformer.java	(working copy)
>@@ -1,24 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.state.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UmlStateTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-	
>-}
>Index: src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.state.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlStateOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>Index: src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/state/editor/xtext/ui/outline/UmlStateOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,32 +0,0 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * CEA LIST - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.state.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UmlStateOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = { 
>-		// provide list of classes to adapt to, e.g.:
>-		// Entity.class
>-		// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>-
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -17,10 +17,10 @@
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.core.expressions;bundle-version="3.4.200",
> org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.8.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0",
> org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
> org.eclipse.papyrus.core;bundle-version="0.8.0",
>- org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0"
>+ org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.state.editor.xtext.ui.contentassist.antlr
>#P org.eclipse.papyrus.collaborationuse.editor.xtext
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -21,8 +21,8 @@
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.papyrus.log;bundle-version="0.8.0",
> org.eclipse.papyrus.properties.runtime;bundle-version="0.8.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0",
>- org.eclipse.papyrus.common.editor.xtext;bundle-version="0.8.0";visibility:=reexport
>+ org.eclipse.papyrus.common.editor.xtext;bundle-version="0.8.0";visibility:=reexport,
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.collaborationuse.editor.xtext,
>Index: src/org/eclipse/papyrus/collaborationuse/editor/xtext/GenerateUmlCollaborationUse.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/collaborationuse/editor/xtext/GenerateUmlCollaborationUse.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/collaborationuse/editor/xtext/GenerateUmlCollaborationUse.mwe2	(working copy)
>@@ -92,8 +92,8 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
>+			fragment = outline.QuickOutlineFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// quickfix API 
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.xmi	(working copy)
>@@ -244,6 +244,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -269,6 +270,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUseStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUseStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUseStandaloneSetupGenerated.java	(working copy)
>@@ -1,22 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> 
> package org.eclipse.papyrus.collaborationuse.editor.xtext;
> 
> import org.eclipse.emf.ecore.EPackage;
>-import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.xtext.ISetup;
>+import org.eclipse.emf.ecore.resource.Resource;
> 
> import com.google.inject.Guice;
> import com.google.inject.Injector;
>@@ -34,21 +21,21 @@
> 		register(injector);
> 		return injector;
> 	}
>-
>+	
> 	public Injector createInjector() {
> 		return Guice.createInjector(new org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUseRuntimeModule());
> 	}
>-
>+	
> 	public void register(Injector injector) {
>-		if(!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse")) {
>-			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse", org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage.eINSTANCE);
>-		}
>+	if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse")) {
>+		EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse", org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage.eINSTANCE);
>+	}
> 
> 		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
> 		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
> 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("umlcollaborationuse", resourceFactory);
> 		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("umlcollaborationuse", serviceProvider);
>-
>+		
> 
> 
> 
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/UmlCollaborationUseParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/UmlCollaborationUseParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/UmlCollaborationUseParser.java	(working copy)
>@@ -1,55 +1,39 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>-public class UmlCollaborationUseParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
> 
>+public class UmlCollaborationUseParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>+	
> 	@Inject
> 	private UmlCollaborationUseGrammarAccess grammarAccess;
>-
>+	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal.InternalUmlCollaborationUseParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(), re);
>-		}
> 	}
>-
>+	
>+	@Override
> 	protected org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal.InternalUmlCollaborationUseParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal.InternalUmlCollaborationUseParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal.InternalUmlCollaborationUseParser(stream, getGrammarAccess());
> 	}
>-
>-	@Override
>+	
>+	@Override 
> 	protected String getDefaultRuleName() {
> 		return "CollaborationUseRule";
> 	}
>-
>+	
> 	public UmlCollaborationUseGrammarAccess getGrammarAccess() {
> 		return this.grammarAccess;
> 	}
>-
>+	
> 	public void setGrammarAccess(UmlCollaborationUseGrammarAccess grammarAccess) {
> 		this.grammarAccess = grammarAccess;
> 	}
>-
>+	
> }
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/UmlCollaborationUseAntlrTokenFileProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/UmlCollaborationUseAntlrTokenFileProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/UmlCollaborationUseAntlrTokenFileProvider.java	(working copy)
>@@ -1,16 +1,15 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr;
> 
> import java.io.InputStream;
>-
> import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
> 
> public class UmlCollaborationUseAntlrTokenFileProvider implements IAntlrTokenFileProvider {
>-
>+	
> 	public InputStream getAntlrTokenFile() {
> 		ClassLoader classLoader = getClass().getClassLoader();
>-		return classLoader.getResourceAsStream("org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens");
>+ 	return classLoader.getResourceAsStream("org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens");
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g	(working copy)
>@@ -19,11 +19,9 @@
> @parser::header {
> package org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -31,7 +29,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
> 
> }
>@@ -40,17 +37,10 @@
> 
> 	private UmlCollaborationUseGrammarAccess grammarAccess;
> 	
>- public InternalUmlCollaborationUseParser(TokenStream input, IAstFactory factory, UmlCollaborationUseGrammarAccess grammarAccess) {
>+ public InternalUmlCollaborationUseParser(TokenStream input, UmlCollaborationUseGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -77,7 +67,7 @@
> // Entry rule entryRuleCollaborationUseRule
> entryRuleCollaborationUseRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getCollaborationUseRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getCollaborationUseRuleRule()); }
> 	 iv_ruleCollaborationUseRule=ruleCollaborationUseRule 
> 	 { $current=$iv_ruleCollaborationUseRule.current; } 
> 	 EOF 
>@@ -85,32 +75,24 @@
> 
> // Rule CollaborationUseRule
> ruleCollaborationUseRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 	 }
> 		lv_visibility_0_0=ruleVisibilityKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getCollaborationUseRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getCollaborationUseRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"visibility",
>-	 		lv_visibility_0_0, 
>-	 		"VisibilityKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"visibility",
>+ 		lv_visibility_0_0, 
>+ 		"VisibilityKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -118,58 +100,46 @@
> (
> 		lv_name_1_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
>+			newLeafNode(lv_name_1_0, grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getCollaborationUseRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getCollaborationUseRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"name",
>-	 		lv_name_1_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"name",
>+ 		lv_name_1_0, 
>+ 		"ID");
> 	 }
> 
> )
>-)	':' 
>+)	otherlv_2=':' 
> {
>- createLeafNode(grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2());
> }
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0()); 
> 	 }
> 		lv_type_3_0=ruleTypeRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getCollaborationUseRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getCollaborationUseRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"type",
>-	 		lv_type_3_0, 
>-	 		"TypeRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"type",
>+ 		lv_type_3_0, 
>+ 		"TypeRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )
>- |	'<Undefined>' 
>+ |	otherlv_4='<Undefined>' 
> {
>- createLeafNode(grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1());
> }
> ))
> ;
>@@ -181,7 +151,7 @@
> // Entry rule entryRuleTypeRule
> entryRuleTypeRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getTypeRuleRule()); }
> 	 iv_ruleTypeRule=ruleTypeRule 
> 	 { $current=$iv_ruleTypeRule.current; } 
> 	 EOF 
>@@ -189,32 +159,24 @@
> 
> // Rule TypeRule
> ruleTypeRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 	 }
> 		lv_path_0_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getTypeRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"path",
>-	 		lv_path_0_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -222,13 +184,12 @@
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getTypeRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0(), "type"); 
>+		newLeafNode(otherlv_1, grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0()); 
> 	}
> 
> )
>@@ -242,7 +203,7 @@
> // Entry rule entryRuleQualifiedName
> entryRuleQualifiedName returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getQualifiedNameRule()); }
> 	 iv_ruleQualifiedName=ruleQualifiedName 
> 	 { $current=$iv_ruleQualifiedName.current; } 
> 	 EOF 
>@@ -250,50 +211,41 @@
> 
> // Rule QualifiedName
> ruleQualifiedName returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_0=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	}
> 
> )
>-)	'::' 
>+)	otherlv_1='::' 
> {
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 }
> 		lv_remaining_2_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"remaining",
>-	 		lv_remaining_2_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -309,7 +261,7 @@
> // Entry rule entryRuleBoundSpecification
> entryRuleBoundSpecification returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getBoundSpecificationRule()); }
> 	 iv_ruleBoundSpecification=ruleBoundSpecification 
> 	 { $current=$iv_ruleBoundSpecification.current; } 
> 	 EOF 
>@@ -317,32 +269,24 @@
> 
> // Rule BoundSpecification
> ruleBoundSpecification returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		lv_value_0_0=RULE_UNLIMITEDLITERAL
> 		{
>-			createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value"); 
>+			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getBoundSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"value",
>-	 		lv_value_0_0, 
>-	 		"UnlimitedLiteral", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
> 	 }
> 
> )
>@@ -355,32 +299,30 @@
> 
> // Rule VisibilityKind
> ruleVisibilityKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'+' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='+' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'-' 
>+ |(	enumLiteral_1='-' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'#' 
>+ |(	enumLiteral_2='#' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'~' 
>+ |(	enumLiteral_3='~' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -394,7 +336,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUseLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUseLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUseLexer.java	(working copy)
>@@ -1,936 +1,1049 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.collaborationuse.editor.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;
>-import org.antlr.runtime.EarlyExitException;
>-import org.antlr.runtime.MismatchedSetException;
>-import org.antlr.runtime.NoViableAltException;
>-import org.antlr.runtime.RecognitionException;
> import org.eclipse.xtext.parser.antlr.Lexer;
> 
>-@SuppressWarnings("all")
>-public class InternalUmlCollaborationUseLexer extends Lexer {
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int Tokens = 19;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public static final int RULE_STRING = 7;
> 
>-	public static final int RULE_INT = 6;
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-	public static final int T12 = 12;
>-
>-	public static final int T13 = 13;
>-
>-	public static final int T14 = 14;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int T15 = 15;
>-
>-	public static final int T16 = 16;
>-
>-	public static final int T17 = 17;
>-
>-	public static final int T18 = 18;
>-
>-	public InternalUmlCollaborationUseLexer() {
>-		;
>-	}
>-
>-	public InternalUmlCollaborationUseLexer(CharStream input) {
>-		super(input);
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g";
>-	}
>-
>-	// $ANTLR start T12
>-	public final void mT12() throws RecognitionException {
>-		try {
>-			int _type = T12;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:10:5: ( ':' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:10:7: ':'
>-			{
>-				match(':');
>-
>-			}
>-
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>-
>-	// $ANTLR end T12
>-
>-	// $ANTLR start T13
>-	public final void mT13() throws RecognitionException {
>-		try {
>-			int _type = T13;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:11:5: ( '<Undefined>' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:11:7: '<Undefined>'
>-			{
>-				match("<Undefined>");
>+@SuppressWarnings("all")
>+public class InternalUmlCollaborationUseLexer extends Lexer {
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ 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__17=17;
>+ 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_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>+ // delegates
>+ // delegators
> 
>-			}
>+ public InternalUmlCollaborationUseLexer() {;} 
>+ public InternalUmlCollaborationUseLexer(CharStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCollaborationUseLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g"; }
> 
>-	// $ANTLR end T13
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
>+ try {
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:11:7: ( ':' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:11:9: ':'
>+ {
>+ match(':'); 
> 
>-	// $ANTLR start T14
>-	public final void mT14() throws RecognitionException {
>-		try {
>-			int _type = T14;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:12:5: ( '::' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:12:7: '::'
>-			{
>-				match("::");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__12"
> 
>-			}
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
>+ try {
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:12:7: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:12:9: '<Undefined>'
>+ {
>+ match("<Undefined>"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T14
>+ }
> 
>-	// $ANTLR start T15
>-	public final void mT15() throws RecognitionException {
>-		try {
>-			int _type = T15;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:13:5: ( '+' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:13:7: '+'
>-			{
>-				match('+');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__13"
> 
>-			}
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
>+ try {
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:13:7: ( '::' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:13:9: '::'
>+ {
>+ match("::"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T15
>+ }
> 
>-	// $ANTLR start T16
>-	public final void mT16() throws RecognitionException {
>-		try {
>-			int _type = T16;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:14:5: ( '-' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:14:7: '-'
>-			{
>-				match('-');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__14"
> 
>-			}
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
>+ try {
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:14:7: ( '+' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:14:9: '+'
>+ {
>+ match('+'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T16
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__15"
> 
>-	// $ANTLR start T17
>-	public final void mT17() throws RecognitionException {
>-		try {
>-			int _type = T17;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:15:5: ( '#' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:15:7: '#'
>-			{
>-				match('#');
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
>+ try {
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:15:7: ( '-' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:15:9: '-'
>+ {
>+ match('-'); 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__16"
> 
>-	// $ANTLR end T17
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
>+ try {
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:16:7: ( '#' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:16:9: '#'
>+ {
>+ match('#'); 
> 
>-	// $ANTLR start T18
>-	public final void mT18() throws RecognitionException {
>-		try {
>-			int _type = T18;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:16:5: ( '~' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:16:7: '~'
>-			{
>-				match('~');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__17"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
>+ try {
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:17:7: ( '~' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:17:9: '~'
>+ {
>+ match('~'); 
> 
>-	// $ANTLR end T18
>+ }
> 
>-	// $ANTLR start RULE_UNLIMITEDLITERAL
>-	public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>-		try {
>-			int _type = RULE_UNLIMITEDLITERAL;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-				int alt2 = 2;
>-				int LA2_0 = input.LA(1);
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__18"
> 
>-				if(((LA2_0 >= '0' && LA2_0 <= '9'))) {
>-					alt2 = 1;
>-				} else if((LA2_0 == '*')) {
>-					alt2 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("391:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
>+ public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>+ try {
>+ int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-					throw nvae;
>-				}
>-				switch(alt2) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:26: '0' .. '9' ( '0' .. '9' )*
>-				{
>-					matchRange('0', '9');
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:35: ( '0' .. '9' )*
>-					loop1: do {
>-						int alt1 = 2;
>-						int LA1_0 = input.LA(1);
>+ if ( ((LA2_0>='0' && LA2_0<='9')) ) {
>+ alt2=1;
>+ }
>+ else if ( (LA2_0=='*') ) {
>+ alt2=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>-						if(((LA1_0 >= '0' && LA1_0 <= '9'))) {
>-							alt1 = 1;
>-						}
>+ throw nvae;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:26: '0' .. '9' ( '0' .. '9' )*
>+ {
>+ matchRange('0','9'); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:35: ( '0' .. '9' )*
>+ loop1:
>+ do {
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>+ if ( ((LA1_0>='0' && LA1_0<='9')) ) {
>+ alt1=1;
>+ }
> 
>-						switch(alt1) {
>-						case 1:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:36: '0' .. '9'
>-						{
>-							matchRange('0', '9');
> 
>-						}
>-							break;
>+ switch (alt1) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:36: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-						default:
>-							break loop1;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop1;
>+ }
>+ } while (true);
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:391:47: '*'
>-				{
>-					match('*');
> 
>-				}
>-					break;
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:333:47: '*'
>+ {
>+ match('*'); 
> 
>-				}
>+ }
>+ break;
> 
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end RULE_UNLIMITEDLITERAL
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>-	// $ANTLR start RULE_ID
>-	public final void mRULE_ID() throws RecognitionException {
>-		try {
>-			int _type = RULE_ID;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:393:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:393:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:393:11: ( '^' )?
>-				int alt3 = 2;
>-				int LA3_0 = input.LA(1);
>+ // $ANTLR start "RULE_ID"
>+ public final void mRULE_ID() throws RecognitionException {
>+ try {
>+ int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:335:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:335:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:335:11: ( '^' )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-				if((LA3_0 == '^')) {
>-					alt3 = 1;
>-				}
>-				switch(alt3) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:393:11: '^'
>-				{
>-					match('^');
>+ if ( (LA3_0=='^') ) {
>+ alt3=1;
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:335:11: '^'
>+ {
>+ match('^'); 
> 
>-				}
>-					break;
>+ }
>+ break;
> 
>-				}
>+ }
> 
>-				if((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {
>-					input.consume();
>+ if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
>+ input.consume();
> 
>-				} else {
>-					MismatchedSetException mse = new MismatchedSetException(null, input);
>-					recover(mse);
>-					throw mse;
>-				}
>+ }
>+ else {
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:393:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-				loop4: do {
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:335:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-					if(((LA4_0 >= '0' && LA4_0 <= '9') || (LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
>-						alt4 = 1;
>-					}
>+ if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
>+ alt4=1;
>+ }
> 
> 
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.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();
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.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 {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-					}
>-						break;
>+ 	 }
>+ 	 break;
> 
>-					default:
>-						break loop4;
>-					}
>-				} while(true);
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ID"
> 
>-	// $ANTLR end RULE_ID
>+ // $ANTLR start "RULE_INT"
>+ public final void mRULE_INT() throws RecognitionException {
>+ try {
>+ int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:337:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:337:12: ( '0' .. '9' )+
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:337:12: ( '0' .. '9' )+
>+ int cnt5=0;
>+ loop5:
>+ do {
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-	// $ANTLR start RULE_INT
>-	public final void mRULE_INT() throws RecognitionException {
>-		try {
>-			int _type = RULE_INT;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:395:10: ( ( '0' .. '9' )+ )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:395:12: ( '0' .. '9' )+
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:395:12: ( '0' .. '9' )+
>-				int cnt5 = 0;
>-				loop5: do {
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
>+ if ( ((LA5_0>='0' && LA5_0<='9')) ) {
>+ alt5=1;
>+ }
> 
>-					if(((LA5_0 >= '0' && LA5_0 <= '9'))) {
>-						alt5 = 1;
>-					}
> 
>+ switch (alt5) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:337:13: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:395:13: '0' .. '9'
>-					{
>-						matchRange('0', '9');
>+ 	 }
>+ 	 break;
> 
>-					}
>-						break;
>+ 	default :
>+ 	 if ( cnt5 >= 1 ) break loop5;
>+ EarlyExitException eee =
>+ new EarlyExitException(5, input);
>+ throw eee;
>+ }
>+ cnt5++;
>+ } while (true);
> 
>-					default:
>-						if(cnt5 >= 1)
>-							break loop5;
>-						EarlyExitException eee = new EarlyExitException(5, input);
>-						throw eee;
>-					}
>-					cnt5++;
>-				} while(true);
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_INT"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "RULE_STRING"
>+ public final void mRULE_STRING() throws RecognitionException {
>+ try {
>+ int _type = RULE_STRING;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>-	// $ANTLR end RULE_INT
>+ if ( (LA8_0=='\"') ) {
>+ alt8=1;
>+ }
>+ else if ( (LA8_0=='\'') ) {
>+ alt8=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>-	// $ANTLR start RULE_STRING
>-	public final void mRULE_STRING() throws RecognitionException {
>-		try {
>-			int _type = RULE_STRING;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-				int alt8 = 2;
>-				int LA8_0 = input.LA(1);
>+ throw nvae;
>+ }
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ {
>+ match('\"'); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ loop6:
>+ do {
>+ int alt6=3;
>+ int LA6_0 = input.LA(1);
> 
>-				if((LA8_0 == '\"')) {
>-					alt8 = 1;
>-				} else if((LA8_0 == '\'')) {
>-					alt8 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("397:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ if ( (LA6_0=='\\') ) {
>+ alt6=1;
>+ }
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
>+ alt6=2;
>+ }
> 
>-					throw nvae;
>-				}
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>-				{
>-					match('\"');
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>-					loop6: do {
>-						int alt6 = 3;
>-						int LA6_0 = input.LA(1);
> 
>-						if((LA6_0 == '\\')) {
>-							alt6 = 1;
>-						} else if(((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '[') || (LA6_0 >= ']' && LA6_0 <= '\uFFFE'))) {
>-							alt6 = 2;
>-						}
>+ switch (alt6) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						switch(alt6) {
>-						case 1:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:21: '\\\\' ( '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 {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:66: ~ ( ( '\\\\' | '\"' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:62: ~ ( ( '\\\\' | '\"' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop6;
>+ }
>+ } while (true);
> 
>-						}
>-							break;
>+ match('\"'); 
> 
>-						default:
>-							break loop6;
>-						}
>-					} while(true);
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ {
>+ match('\''); 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ loop7:
>+ do {
>+ int alt7=3;
>+ int LA7_0 = input.LA(1);
> 
>-					match('\"');
>+ if ( (LA7_0=='\\') ) {
>+ alt7=1;
>+ }
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
>+ alt7=2;
>+ }
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>-				{
>-					match('\'');
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>-					loop7: do {
>-						int alt7 = 3;
>-						int LA7_0 = input.LA(1);
> 
>-						if((LA7_0 == '\\')) {
>-							alt7 = 1;
>-						} else if(((LA7_0 >= '\u0000' && LA7_0 <= '&') || (LA7_0 >= '(' && LA7_0 <= '[') || (LA7_0 >= ']' && LA7_0 <= '\uFFFE'))) {
>-							alt7 = 2;
>-						}
>+ switch (alt7) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						switch(alt7) {
>-						case 1:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:88: '\\\\' ( '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 {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:339:137: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:397:129: ~ ( ( '\\\\' | '\\'' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop7;
>+ }
>+ } while (true);
> 
>-						}
>-							break;
>+ match('\''); 
> 
>-						default:
>-							break loop7;
>-						}
>-					} while(true);
>+ }
>+ break;
> 
>-					match('\'');
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_STRING"
> 
>-			}
>+ // $ANTLR start "RULE_ML_COMMENT"
>+ public final void mRULE_ML_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:341:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:341:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ {
>+ match("/*"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:341:24: ( options {greedy=false; } : . )*
>+ loop9:
>+ do {
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>-	// $ANTLR end RULE_STRING
>+ if ( (LA9_0=='*') ) {
>+ int LA9_1 = input.LA(2);
> 
>-	// $ANTLR start RULE_ML_COMMENT
>-	public final void mRULE_ML_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_ML_COMMENT;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:399:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:399:19: '/*' ( options {greedy=false; } : . )* '*/'
>-			{
>-				match("/*");
>+ if ( (LA9_1=='/') ) {
>+ alt9=2;
>+ }
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:399:24: ( options {greedy=false; } : . )*
>-				loop9: do {
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
> 
>-					if((LA9_0 == '*')) {
>-						int LA9_1 = input.LA(2);
>+ }
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-						if((LA9_1 == '/')) {
>-							alt9 = 2;
>-						} else if(((LA9_1 >= '\u0000' && LA9_1 <= '.') || (LA9_1 >= '0' && LA9_1 <= '\uFFFE'))) {
>-							alt9 = 1;
>-						}
> 
>+ switch (alt9) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:341:52: .
>+ 	 {
>+ 	 matchAny(); 
> 
>-					} else if(((LA9_0 >= '\u0000' && LA9_0 <= ')') || (LA9_0 >= '+' && LA9_0 <= '\uFFFE'))) {
>-						alt9 = 1;
>-					}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop9;
>+ }
>+ } while (true);
> 
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:399:52: .
>-					{
>-						matchAny();
>+ match("*/"); 
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop9;
>-					}
>-				} while(true);
>+ }
> 
>-				match("*/");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>+ // $ANTLR start "RULE_SL_COMMENT"
>+ public final void mRULE_SL_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ {
>+ match("//"); 
> 
>-			}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ loop10:
>+ do {
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
>+ alt10=1;
>+ }
> 
>-	// $ANTLR end RULE_ML_COMMENT
> 
>-	// $ANTLR start RULE_SL_COMMENT
>-	public final void mRULE_SL_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_SL_COMMENT;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>-			{
>-				match("//");
>+ switch (alt10) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343: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)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:24: (~ ( ( '\\n' | '\\r' ) ) )*
>-				loop10: do {
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					if(((LA10_0 >= '\u0000' && LA10_0 <= '\t') || (LA10_0 >= '\u000B' && LA10_0 <= '\f') || (LA10_0 >= '\u000E' && LA10_0 <= '\uFFFE'))) {
>-						alt10 = 1;
>-					}
> 
>+ 	 }
>+ 	 break;
> 
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401: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) <= '\uFFFE')) {
>-							input.consume();
>+ 	default :
>+ 	 break loop10;
>+ }
>+ } while (true);
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:40: ( ( '\\r' )? '\\n' )?
>+ int alt12=2;
>+ int LA12_0 = input.LA(1);
> 
>+ if ( (LA12_0=='\n'||LA12_0=='\r') ) {
>+ alt12=1;
>+ }
>+ switch (alt12) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:41: ( '\\r' )? '\\n'
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:41: ( '\\r' )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-					}
>-						break;
>+ if ( (LA11_0=='\r') ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:343:41: '\\r'
>+ {
>+ match('\r'); 
> 
>-					default:
>-						break loop10;
>-					}
>-				} while(true);
>+ }
>+ break;
> 
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:40: ( ( '\\r' )? '\\n' )?
>-				int alt12 = 2;
>-				int LA12_0 = input.LA(1);
>+ }
> 
>-				if((LA12_0 == '\n' || LA12_0 == '\r')) {
>-					alt12 = 1;
>-				}
>-				switch(alt12) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:41: ( '\\r' )? '\\n'
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:41: ( '\\r' )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ match('\n'); 
> 
>-					if((LA11_0 == '\r')) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:401:41: '\\r'
>-					{
>-						match('\r');
>+ }
>+ break;
> 
>-					}
>-						break;
>+ }
> 
>-					}
> 
>-					match('\n');
>+ }
> 
>-				}
>-					break;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>-				}
>+ // $ANTLR start "RULE_WS"
>+ public final void mRULE_WS() throws RecognitionException {
>+ try {
>+ int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:345:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:345:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:345:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int cnt13=0;
>+ loop13:
>+ do {
>+ int alt13=2;
>+ int LA13_0 = input.LA(1);
> 
>+ if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
>+ alt13=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ switch (alt13) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:
>+ 	 {
>+ 	 if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
>+ 	 input.consume();
> 
>-	// $ANTLR end RULE_SL_COMMENT
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start RULE_WS
>-	public final void mRULE_WS() throws RecognitionException {
>-		try {
>-			int _type = RULE_WS;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:403:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:403:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:403:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-				int cnt13 = 0;
>-				loop13: do {
>-					int alt13 = 2;
>-					int LA13_0 = input.LA(1);
> 
>-					if(((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) {
>-						alt13 = 1;
>-					}
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 if ( cnt13 >= 1 ) break loop13;
>+ EarlyExitException eee =
>+ new EarlyExitException(13, input);
>+ throw eee;
>+ }
>+ cnt13++;
>+ } while (true);
> 
>-					switch(alt13) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:
>-					{
>-						if((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
>-							input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_WS"
> 
>-					}
>-						break;
>+ // $ANTLR start "RULE_ANY_OTHER"
>+ public final void mRULE_ANY_OTHER() throws RecognitionException {
>+ try {
>+ int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:347:16: ( . )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:347:18: .
>+ {
>+ matchAny(); 
> 
>-					default:
>-						if(cnt13 >= 1)
>-							break loop13;
>-						EarlyExitException eee = new EarlyExitException(13, input);
>-						throw eee;
>-					}
>-					cnt13++;
>-				} while(true);
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
>-			}
>+ public void mTokens() throws RecognitionException {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ int alt14=15;
>+ alt14 = dfa14.predict(input);
>+ switch (alt14) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:10: T__12
>+ {
>+ mT__12(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:16: T__13
>+ {
>+ mT__13(); 
> 
>-	// $ANTLR end RULE_WS
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:22: T__14
>+ {
>+ mT__14(); 
> 
>-	// $ANTLR start RULE_ANY_OTHER
>-	public final void mRULE_ANY_OTHER() throws RecognitionException {
>-		try {
>-			int _type = RULE_ANY_OTHER;
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:405:16: ( . )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:405:18: .
>-			{
>-				matchAny();
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:28: T__15
>+ {
>+ mT__15(); 
> 
>-			}
>+ }
>+ break;
>+ case 5 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:34: T__16
>+ {
>+ mT__16(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 6 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:40: T__17
>+ {
>+ mT__17(); 
> 
>-	// $ANTLR end RULE_ANY_OTHER
>+ }
>+ break;
>+ case 7 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:46: T__18
>+ {
>+ mT__18(); 
> 
>-	public void mTokens() throws RecognitionException {
>-		// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:8: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>-		int alt14 = 15;
>-		alt14 = dfa14.predict(input);
>-		switch(alt14) {
>-		case 1:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:10: T12
>-		{
>-			mT12();
>+ }
>+ break;
>+ case 8 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:52: RULE_UNLIMITEDLITERAL
>+ {
>+ mRULE_UNLIMITEDLITERAL(); 
> 
>-		}
>-			break;
>-		case 2:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:14: T13
>-		{
>-			mT13();
>+ }
>+ break;
>+ case 9 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:74: RULE_ID
>+ {
>+ mRULE_ID(); 
> 
>-		}
>-			break;
>-		case 3:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:18: T14
>-		{
>-			mT14();
>+ }
>+ break;
>+ case 10 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:82: RULE_INT
>+ {
>+ mRULE_INT(); 
> 
>-		}
>-			break;
>-		case 4:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:22: T15
>-		{
>-			mT15();
>+ }
>+ break;
>+ case 11 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:91: RULE_STRING
>+ {
>+ mRULE_STRING(); 
> 
>-		}
>-			break;
>-		case 5:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:26: T16
>-		{
>-			mT16();
>+ }
>+ break;
>+ case 12 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:103: RULE_ML_COMMENT
>+ {
>+ mRULE_ML_COMMENT(); 
> 
>-		}
>-			break;
>-		case 6:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:30: T17
>-		{
>-			mT17();
>+ }
>+ break;
>+ case 13 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:119: RULE_SL_COMMENT
>+ {
>+ mRULE_SL_COMMENT(); 
> 
>-		}
>-			break;
>-		case 7:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:34: T18
>-		{
>-			mT18();
>+ }
>+ break;
>+ case 14 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:135: RULE_WS
>+ {
>+ mRULE_WS(); 
> 
>-		}
>-			break;
>-		case 8:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:38: RULE_UNLIMITEDLITERAL
>-		{
>-			mRULE_UNLIMITEDLITERAL();
>+ }
>+ break;
>+ case 15 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:143: RULE_ANY_OTHER
>+ {
>+ mRULE_ANY_OTHER(); 
> 
>-		}
>-			break;
>-		case 9:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:60: RULE_ID
>-		{
>-			mRULE_ID();
>+ }
>+ break;
> 
>-		}
>-			break;
>-		case 10:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:68: RULE_INT
>-		{
>-			mRULE_INT();
>+ }
> 
>-		}
>-			break;
>-		case 11:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:77: RULE_STRING
>-		{
>-			mRULE_STRING();
>+ }
> 
>-		}
>-			break;
>-		case 12:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:89: RULE_ML_COMMENT
>-		{
>-			mRULE_ML_COMMENT();
> 
>-		}
>-			break;
>-		case 13:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:105: RULE_SL_COMMENT
>-		{
>-			mRULE_SL_COMMENT();
>+ protected DFA14 dfa14 = new DFA14(this);
>+ static final String DFA14_eotS =
>+ "\1\uffff\1\21\1\17\4\uffff\1\30\1\uffff\1\17\1\uffff\3\17\11\uffff"+
>+ "\1\30\6\uffff";
>+ static final String DFA14_eofS =
>+ "\36\uffff";
>+ static final String DFA14_minS =
>+ "\1\0\1\72\1\125\4\uffff\1\60\1\uffff\1\101\1\uffff\2\0\1\52\11"+
>+ "\uffff\1\60\6\uffff";
>+ static final String DFA14_maxS =
>+ "\1\uffff\1\72\1\125\4\uffff\1\71\1\uffff\1\172\1\uffff\2\uffff"+
>+ "\1\57\11\uffff\1\71\6\uffff";
>+ static final String DFA14_acceptS =
>+ "\3\uffff\1\4\1\5\1\6\1\7\1\uffff\1\10\1\uffff\1\11\3\uffff\1\16"+
>+ "\1\17\1\3\1\1\1\2\1\4\1\5\1\6\1\7\1\uffff\1\10\1\11\1\13\1\14\1"+
>+ "\15\1\16";
>+ static final String DFA14_specialS =
>+ "\1\0\12\uffff\1\1\1\2\21\uffff}>";
>+ static final String[] DFA14_transitionS = {
>+ "\11\17\2\16\2\17\1\16\22\17\1\16\1\17\1\13\1\5\3\17\1\14\2"+
>+ "\17\1\10\1\3\1\17\1\4\1\17\1\15\12\7\1\1\1\17\1\2\4\17\32\12"+
>+ "\3\17\1\11\1\12\1\17\32\12\3\17\1\6\uff81\17",
>+ "\1\20",
>+ "\1\22",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\12\27",
>+ "",
>+ "\32\31\4\uffff\1\31\1\uffff\32\31",
>+ "",
>+ "\0\32",
>+ "\0\32",
>+ "\1\33\4\uffff\1\34",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\12\27",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ ""
>+ };
> 
>-		}
>-			break;
>-		case 14:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:121: RULE_WS
>-		{
>-			mRULE_WS();
>+ static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ static final short[][] DFA14_transition;
> 
>-		}
>-			break;
>-		case 15:
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:1:129: RULE_ANY_OTHER
>-		{
>-			mRULE_ANY_OTHER();
>+ static {
>+ int numStates = DFA14_transitionS.length;
>+ DFA14_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>+ }
>+ }
> 
>-		}
>-			break;
>+ class DFA14 extends DFA {
> 
>-		}
>+ public DFA14(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 14;
>+ this.eot = DFA14_eot;
>+ this.eof = DFA14_eof;
>+ this.min = DFA14_min;
>+ this.max = DFA14_max;
>+ this.accept = DFA14_accept;
>+ this.special = DFA14_special;
>+ this.transition = DFA14_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_0 = input.LA(1);
> 
>-	}
>+ s = -1;
>+ if ( (LA14_0==':') ) {s = 1;}
> 
>+ else if ( (LA14_0=='<') ) {s = 2;}
> 
>-	protected DFA14 dfa14 = new DFA14(this);
>+ else if ( (LA14_0=='+') ) {s = 3;}
> 
>-	static final String DFA14_eotS = "\1\uffff\1\21\1\17\4\uffff\1\30\1\uffff\1\17\1\uffff\3\17\11\uffff" + "\1\30\6\uffff";
>+ else if ( (LA14_0=='-') ) {s = 4;}
> 
>-	static final String DFA14_eofS = "\36\uffff";
>+ else if ( (LA14_0=='#') ) {s = 5;}
> 
>-	static final String DFA14_minS = "\1\0\1\72\1\125\4\uffff\1\60\1\uffff\1\101\1\uffff\2\0\1\52\11\uffff" + "\1\60\6\uffff";
>+ else if ( (LA14_0=='~') ) {s = 6;}
> 
>-	static final String DFA14_maxS = "\1\ufffe\1\72\1\125\4\uffff\1\71\1\uffff\1\172\1\uffff\2\ufffe\1" + "\57\11\uffff\1\71\6\uffff";
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 7;}
> 
>-	static final String DFA14_acceptS = "\3\uffff\1\4\1\5\1\6\1\7\1\uffff\1\10\1\uffff\1\11\3\uffff\1\16" + "\1\17\1\3\1\1\1\2\1\4\1\5\1\6\1\7\1\uffff\1\10\1\11\1\13\1\15\1" + "\14\1\16";
>+ else if ( (LA14_0=='*') ) {s = 8;}
> 
>-	static final String DFA14_specialS = "\36\uffff}>";
>+ else if ( (LA14_0=='^') ) {s = 9;}
> 
>-	static final String[] DFA14_transitionS = { "\11\17\2\16\2\17\1\16\22\17\1\16\1\17\1\13\1\5\3\17\1\14\2\17" + "\1\10\1\3\1\17\1\4\1\17\1\15\12\7\1\1\1\17\1\2\4\17\32\12\3" + "\17\1\11\1\12\1\17\32\12\3\17\1\6\uff80\17", "\1\20", "\1\22", "", "", "", "", "\12\27", "", "\32\31\4\uffff\1\31\1\uffff\32\31", "", "\uffff\32", "\uffff\32", "\1\34\4\uffff\1\33", "", "", "", "", "", "", "", "", "", "\12\27", "", "", "", "", "", "" };
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')) ) {s = 10;}
> 
>-	static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ else if ( (LA14_0=='\"') ) {s = 11;}
> 
>-	static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ else if ( (LA14_0=='\'') ) {s = 12;}
> 
>-	static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ else if ( (LA14_0=='/') ) {s = 13;}
> 
>-	static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 14;}
> 
>-	static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='$' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||LA14_0==','||LA14_0=='.'||LA14_0==';'||(LA14_0>='=' && LA14_0<='@')||(LA14_0>='[' && LA14_0<=']')||LA14_0=='`'||(LA14_0>='{' && LA14_0<='}')||(LA14_0>='\u007F' && LA14_0<='\uFFFF')) ) {s = 15;}
> 
>-	static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_11 = input.LA(1);
> 
>-	static final short[][] DFA14_transition;
>+ s = -1;
>+ if ( ((LA14_11>='\u0000' && LA14_11<='\uFFFF')) ) {s = 26;}
> 
>-	static {
>-		int numStates = DFA14_transitionS.length;
>-		DFA14_transition = new short[numStates][];
>-		for(int i = 0; i < numStates; i++) {
>-			DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>-		}
>-	}
>+ else s = 15;
> 
>-	class DFA14 extends DFA {
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_12 = input.LA(1);
> 
>-		public DFA14(BaseRecognizer recognizer) {
>-			this.recognizer = recognizer;
>-			this.decisionNumber = 14;
>-			this.eot = DFA14_eot;
>-			this.eof = DFA14_eof;
>-			this.min = DFA14_min;
>-			this.max = DFA14_max;
>-			this.accept = DFA14_accept;
>-			this.special = DFA14_special;
>-			this.transition = DFA14_transition;
>-		}
>+ s = -1;
>+ if ( ((LA14_12>='\u0000' && LA14_12<='\uFFFF')) ) {s = 26;}
> 
>-		public String getDescription() {
>-			return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>-		}
>-	}
>+ else s = 15;
> 
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
>+ 
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens	(working copy)
>@@ -1,6 +1,13 @@
> RULE_ID=4
> RULE_STRING=7
> RULE_UNLIMITEDLITERAL=5
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__14=14
>+T__13=13
> RULE_ANY_OTHER=11
> RULE_INT=6
> RULE_WS=10
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUseParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUseParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUseParser.java	(working copy)
>@@ -1,869 +1,829 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal;
>-
>-import java.io.InputStream;
>+package org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.internal; 
> 
>-import org.antlr.runtime.BitSet;
>-import org.antlr.runtime.NoViableAltException;
>-import org.antlr.runtime.RecognitionException;
>-import org.antlr.runtime.Token;
>-import org.antlr.runtime.TokenStream;
>-import org.eclipse.emf.common.util.Enumerator;
>+import org.eclipse.xtext.*;
>+import org.eclipse.xtext.parser.*;
>+import org.eclipse.xtext.parser.impl.*;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
>-import org.eclipse.xtext.conversion.ValueConverterException;
>-import org.eclipse.xtext.parser.IAstFactory;
>+import org.eclipse.emf.common.util.Enumerator;
> import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
>-
>-@SuppressWarnings("all")
>-public class InternalUmlCollaborationUseParser extends AbstractInternalAntlrParser {
>-
>-	public static final String[] tokenNames = new String[]{ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'<Undefined>'", "'::'", "'+'", "'-'", "'#'", "'~'" };
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlCollaborationUseParser(TokenStream input) {
>-		super(input);
>-	}
>-
>-
>-	public String[] getTokenNames() {
>-		return tokenNames;
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g";
>-	}
>-
>-
>-
>-	private UmlCollaborationUseGrammarAccess grammarAccess;
>-
>-	public InternalUmlCollaborationUseParser(TokenStream input, IAstFactory factory, UmlCollaborationUseGrammarAccess grammarAccess) {
>-		this(input);
>-		this.factory = factory;
>-		registerRules(grammarAccess.getGrammar());
>-		this.grammarAccess = grammarAccess;
>-	}
>-
>-	@Override
>-	protected InputStream getTokenFile() {
>-		ClassLoader classLoader = getClass().getClassLoader();
>-		return classLoader.getResourceAsStream("org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.tokens");
>-	}
>-
>-	@Override
>-	protected String getFirstRuleName() {
>-		return "CollaborationUseRule";
>-	}
>-
>-	@Override
>-	protected UmlCollaborationUseGrammarAccess getGrammarAccess() {
>-		return grammarAccess;
>-	}
>-
>-
>-
>-	// $ANTLR start entryRuleCollaborationUseRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:78:1: entryRuleCollaborationUseRule returns [EObject current=null] : iv_ruleCollaborationUseRule= ruleCollaborationUseRule EOF ;
>-	public final EObject entryRuleCollaborationUseRule() throws RecognitionException {
>-		EObject current = null;
>-
>-		EObject iv_ruleCollaborationUseRule = null;
>-
>-
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:79:2: (iv_ruleCollaborationUseRule= ruleCollaborationUseRule EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:80:2: iv_ruleCollaborationUseRule= ruleCollaborationUseRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getCollaborationUseRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule75);
>-				iv_ruleCollaborationUseRule = ruleCollaborationUseRule();
>-				_fsp--;
>-
>-				current = iv_ruleCollaborationUseRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleCollaborationUseRule85);
>-
>-			}
>-
>-		}
>-
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>-
>-	// $ANTLR end entryRuleCollaborationUseRule
>-
>-
>-	// $ANTLR start ruleCollaborationUseRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:87:1: ruleCollaborationUseRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' ) ) ;
>-	public final EObject ruleCollaborationUseRule() throws RecognitionException {
>-		EObject current = null;
>-
>-		Token lv_name_1_0 = null;
>-		Enumerator lv_visibility_0_0 = null;
>-
>-		EObject lv_type_3_0 = null;
>-
>-
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>-
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:92:6: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:93:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:93:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:93:2: ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:93:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:94:1: (lv_visibility_0_0= ruleVisibilityKind )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:94:1: (lv_visibility_0_0= ruleVisibilityKind )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:95:3: lv_visibility_0_0= ruleVisibilityKind
>-						{
>-
>-							currentNode = createCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), currentNode);
>-
>-							pushFollow(FOLLOW_ruleVisibilityKind_in_ruleCollaborationUseRule131);
>-							lv_visibility_0_0 = ruleVisibilityKind();
>-							_fsp--;
>-
>-
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getCollaborationUseRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "visibility", lv_visibility_0_0, "VisibilityKind", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>-
>-
>-						}
>-
>-
>-					}
>-
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:117:2: ( (lv_name_1_0= RULE_ID ) )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:118:1: (lv_name_1_0= RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:118:1: (lv_name_1_0= RULE_ID )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:119:3: lv_name_1_0= RULE_ID
>-						{
>-							lv_name_1_0 = (Token)input.LT(1);
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleCollaborationUseRule148);
>-
>-							createLeafNode(grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0(), "name");
>-
>-
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getCollaborationUseRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>-							try {
>-								set(current, "name", lv_name_1_0, "ID", lastConsumedNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-
>-
>-						}
>-
>-
>-					}
>-
>-					match(input, 12, FOLLOW_12_in_ruleCollaborationUseRule163);
>-
>-					createLeafNode(grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2(), null);
>-
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:145:1: ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' )
>-					int alt1 = 2;
>-					int LA1_0 = input.LA(1);
>-
>-					if((LA1_0 == RULE_ID)) {
>-						alt1 = 1;
>-					} else if((LA1_0 == 13)) {
>-						alt1 = 2;
>-					} else {
>-						NoViableAltException nvae = new NoViableAltException("145:1: ( ( (lv_type_3_0= ruleTypeRule ) ) | '<Undefined>' )", 1, 0, input);
>-
>-						throw nvae;
>-					}
>-					switch(alt1) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:145:2: ( (lv_type_3_0= ruleTypeRule ) )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:145:2: ( (lv_type_3_0= ruleTypeRule ) )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:146:1: (lv_type_3_0= ruleTypeRule )
>-						{
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:146:1: (lv_type_3_0= ruleTypeRule )
>-							// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:147:3: lv_type_3_0= ruleTypeRule
>-							{
>-
>-								currentNode = createCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0(), currentNode);
>-
>-								pushFollow(FOLLOW_ruleTypeRule_in_ruleCollaborationUseRule185);
>-								lv_type_3_0 = ruleTypeRule();
>-								_fsp--;
>-
>-
>-								if(current == null) {
>-									current = factory.create(grammarAccess.getCollaborationUseRuleRule().getType().getClassifier());
>-									associateNodeWithAstElement(currentNode.getParent(), current);
>-								}
>-								try {
>-									set(current, "type", lv_type_3_0, "TypeRule", currentNode);
>-								} catch (ValueConverterException vce) {
>-									handleValueConverterException(vce);
>-								}
>-								currentNode = currentNode.getParent();
>-
>-
>-							}
>-
>-
>-						}
>-
>-
>-					}
>-						break;
>-					case 2:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:170:7: '<Undefined>'
>-					{
>-						match(input, 13, FOLLOW_13_in_ruleCollaborationUseRule201);
>-
>-						createLeafNode(grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1(), null);
>-
>-
>-					}
>-						break;
>-
>-					}
>-
>-
>-				}
>-
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
>+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
> 
>-			}
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
> 
>-		}
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+@SuppressWarnings("all")
>+public class InternalUmlCollaborationUseParser extends AbstractInternalAntlrParser {
>+ public static final String[] tokenNames = new String[] {
>+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'<Undefined>'", "'::'", "'+'", "'-'", "'#'", "'~'"
>+ };
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ 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__17=17;
>+ 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_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>-	// $ANTLR end ruleCollaborationUseRule
>+ // delegates
>+ // delegators
> 
> 
>-	// $ANTLR start entryRuleTypeRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:182:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
>-	public final EObject entryRuleTypeRule() throws RecognitionException {
>-		EObject current = null;
>+ public InternalUmlCollaborationUseParser(TokenStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCollaborationUseParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
>+ }
>+ 
> 
>-		EObject iv_ruleTypeRule = null;
>+ public String[] getTokenNames() { return InternalUmlCollaborationUseParser.tokenNames; }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g"; }
> 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:183:2: (iv_ruleTypeRule= ruleTypeRule EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:184:2: iv_ruleTypeRule= ruleTypeRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule238);
>-				iv_ruleTypeRule = ruleTypeRule();
>-				_fsp--;
> 
>-				current = iv_ruleTypeRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleTypeRule248);
>+ 	private UmlCollaborationUseGrammarAccess grammarAccess;
>+ 	
>+ public InternalUmlCollaborationUseParser(TokenStream input, UmlCollaborationUseGrammarAccess grammarAccess) {
>+ this(input);
>+ this.grammarAccess = grammarAccess;
>+ registerRules(grammarAccess.getGrammar());
>+ }
>+ 
>+ @Override
>+ protected String getFirstRuleName() {
>+ 	return "CollaborationUseRule";	
>+ 	}
>+ 	
>+ 	@Override
>+ 	protected UmlCollaborationUseGrammarAccess getGrammarAccess() {
>+ 		return grammarAccess;
>+ 	}
> 
>-			}
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ // $ANTLR start "entryRuleCollaborationUseRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:68:1: entryRuleCollaborationUseRule returns [EObject current=null] : iv_ruleCollaborationUseRule= ruleCollaborationUseRule EOF ;
>+ public final EObject entryRuleCollaborationUseRule() throws RecognitionException {
>+ EObject current = null;
> 
>-	// $ANTLR end entryRuleTypeRule
>+ EObject iv_ruleCollaborationUseRule = null;
> 
> 
>-	// $ANTLR start ruleTypeRule
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:191:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) ;
>-	public final EObject ruleTypeRule() throws RecognitionException {
>-		EObject current = null;
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:69:2: (iv_ruleCollaborationUseRule= ruleCollaborationUseRule EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:70:2: iv_ruleCollaborationUseRule= ruleCollaborationUseRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getCollaborationUseRuleRule()); 
>+ pushFollow(FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule75);
>+ iv_ruleCollaborationUseRule=ruleCollaborationUseRule();
> 
>-		EObject lv_path_0_0 = null;
>+ state._fsp--;
> 
>+ current =iv_ruleCollaborationUseRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleCollaborationUseRule85); 
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:196:6: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:197:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:197:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:197:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:197:2: ( (lv_path_0_0= ruleQualifiedName ) )?
>-					int alt2 = 2;
>-					int LA2_0 = input.LA(1);
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleCollaborationUseRule"
> 
>-					if((LA2_0 == RULE_ID)) {
>-						int LA2_1 = input.LA(2);
> 
>-						if((LA2_1 == 14)) {
>-							alt2 = 1;
>-						}
>-					}
>-					switch(alt2) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:198:1: (lv_path_0_0= ruleQualifiedName )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:198:1: (lv_path_0_0= ruleQualifiedName )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:199:3: lv_path_0_0= ruleQualifiedName
>-						{
>+ // $ANTLR start "ruleCollaborationUseRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:77:1: ruleCollaborationUseRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | otherlv_4= '<Undefined>' ) ) ;
>+ public final EObject ruleCollaborationUseRule() throws RecognitionException {
>+ EObject current = null;
> 
>-							currentNode = createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode);
>+ Token lv_name_1_0=null;
>+ Token otherlv_2=null;
>+ Token otherlv_4=null;
>+ Enumerator lv_visibility_0_0 = null;
> 
>-							pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule294);
>-							lv_path_0_0 = ruleQualifiedName();
>-							_fsp--;
>+ EObject lv_type_3_0 = null;
> 
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "path", lv_path_0_0, "QualifiedName", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:80:28: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | otherlv_4= '<Undefined>' ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:81:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | otherlv_4= '<Undefined>' ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:81:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | otherlv_4= '<Undefined>' ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:81:2: ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ':' ( ( (lv_type_3_0= ruleTypeRule ) ) | otherlv_4= '<Undefined>' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:81:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:82:1: (lv_visibility_0_0= ruleVisibilityKind )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:82:1: (lv_visibility_0_0= ruleVisibilityKind )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:83:3: lv_visibility_0_0= ruleVisibilityKind
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleVisibilityKind_in_ruleCollaborationUseRule131);
>+ lv_visibility_0_0=ruleVisibilityKind();
> 
>+ state._fsp--;
> 
>-						}
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getCollaborationUseRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"visibility",
>+ 		lv_visibility_0_0, 
>+ 		"VisibilityKind");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-					}
>-						break;
>+ }
> 
>-					}
> 
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:221:3: ( ( RULE_ID ) )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:222:1: ( RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:222:1: ( RULE_ID )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:223:3: RULE_ID
>-						{
>+ }
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:99:2: ( (lv_name_1_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:100:1: (lv_name_1_0= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:100:1: (lv_name_1_0= RULE_ID )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:101:3: lv_name_1_0= RULE_ID
>+ {
>+ lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCollaborationUseRule148); 
> 
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleTypeRule313);
>+ 			newLeafNode(lv_name_1_0, grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0()); 
>+ 		
> 
>-							createLeafNode(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0(), "type");
>+ 	 if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getCollaborationUseRuleRule());
>+ 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"name",
>+ 		lv_name_1_0, 
>+ 		"ID");
>+ 	 
> 
>+ }
> 
>-						}
> 
>+ }
> 
>-					}
>+ otherlv_2=(Token)match(input,12,FOLLOW_12_in_ruleCollaborationUseRule165); 
> 
>+ 	newLeafNode(otherlv_2, grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2());
>+ 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:121:1: ( ( (lv_type_3_0= ruleTypeRule ) ) | otherlv_4= '<Undefined>' )
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-				}
>+ if ( (LA1_0==RULE_ID) ) {
>+ alt1=1;
>+ }
>+ else if ( (LA1_0==13) ) {
>+ alt1=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 1, 0, input);
> 
>+ throw nvae;
>+ }
>+ switch (alt1) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:121:2: ( (lv_type_3_0= ruleTypeRule ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:121:2: ( (lv_type_3_0= ruleTypeRule ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:122:1: (lv_type_3_0= ruleTypeRule )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:122:1: (lv_type_3_0= ruleTypeRule )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:123:3: lv_type_3_0= ruleTypeRule
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleTypeRule_in_ruleCollaborationUseRule187);
>+ lv_type_3_0=ruleTypeRule();
> 
>-			}
>+ state._fsp--;
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
> 
>-		}
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getCollaborationUseRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"type",
>+ 		lv_type_3_0, 
>+ 		"TypeRule");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end ruleTypeRule
> 
>+ }
> 
>-	// $ANTLR start entryRuleQualifiedName
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:243:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>-	public final EObject entryRuleQualifiedName() throws RecognitionException {
>-		EObject current = null;
> 
>-		EObject iv_ruleQualifiedName = null;
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:140:7: otherlv_4= '<Undefined>'
>+ {
>+ otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleCollaborationUseRule205); 
> 
>+ 	newLeafNode(otherlv_4, grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1());
>+ 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:244:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:245:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode);
>-				pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName349);
>-				iv_ruleQualifiedName = ruleQualifiedName();
>-				_fsp--;
>+ }
>+ break;
> 
>-				current = iv_ruleQualifiedName;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName359);
>+ }
> 
>-			}
> 
>-		}
>+ }
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
> 
>-	// $ANTLR end entryRuleQualifiedName
>+ }
> 
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleCollaborationUseRule"
> 
>-	// $ANTLR start ruleQualifiedName
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:252:1: ruleQualifiedName returns [EObject current=null] : ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ;
>-	public final EObject ruleQualifiedName() throws RecognitionException {
>-		EObject current = null;
> 
>-		EObject lv_remaining_2_0 = null;
>+ // $ANTLR start "entryRuleTypeRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:152:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
>+ public final EObject entryRuleTypeRule() throws RecognitionException {
>+ EObject current = null;
> 
>+ EObject iv_ruleTypeRule = null;
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:257:6: ( ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:258:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:258:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:258:2: ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:258:2: ( ( RULE_ID ) )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:259:1: ( RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:259:1: ( RULE_ID )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:260:3: RULE_ID
>-						{
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:153:2: (iv_ruleTypeRule= ruleTypeRule EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:154:2: iv_ruleTypeRule= ruleTypeRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getTypeRuleRule()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule242);
>+ iv_ruleTypeRule=ruleTypeRule();
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>+ state._fsp--;
> 
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleQualifiedName402);
>+ current =iv_ruleTypeRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule252); 
> 
>-							createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path");
>+ }
> 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleTypeRule"
> 
>-						}
> 
>+ // $ANTLR start "ruleTypeRule"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:161:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) ;
>+ public final EObject ruleTypeRule() throws RecognitionException {
>+ EObject current = null;
> 
>-					}
>+ Token otherlv_1=null;
>+ EObject lv_path_0_0 = null;
> 
>-					match(input, 14, FOLLOW_14_in_ruleQualifiedName412);
> 
>-					createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null);
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:164:28: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:165:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:165:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:165:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:165:2: ( (lv_path_0_0= ruleQualifiedName ) )?
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:276:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>-					int alt3 = 2;
>-					int LA3_0 = input.LA(1);
>+ if ( (LA2_0==RULE_ID) ) {
>+ int LA2_1 = input.LA(2);
> 
>-					if((LA3_0 == RULE_ID)) {
>-						int LA3_1 = input.LA(2);
>+ if ( (LA2_1==14) ) {
>+ alt2=1;
>+ }
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:166:1: (lv_path_0_0= ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:166:1: (lv_path_0_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:167:3: lv_path_0_0= ruleQualifiedName
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule298);
>+ lv_path_0_0=ruleQualifiedName();
> 
>-						if((LA3_1 == 14)) {
>-							alt3 = 1;
>-						}
>-					}
>-					switch(alt3) {
>-					case 1:
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:277:1: (lv_remaining_2_0= ruleQualifiedName )
>-					{
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:277:1: (lv_remaining_2_0= ruleQualifiedName )
>-						// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:278:3: lv_remaining_2_0= ruleQualifiedName
>-						{
>+ state._fsp--;
> 
>-							currentNode = createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode);
> 
>-							pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName433);
>-							lv_remaining_2_0 = ruleQualifiedName();
>-							_fsp--;
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getTypeRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>+ }
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "remaining", lv_remaining_2_0, "QualifiedName", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
> 
>+ }
>+ break;
> 
>-						}
>+ }
> 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:183:3: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:184:1: (otherlv_1= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:184:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:185:3: otherlv_1= RULE_ID
>+ {
> 
>-					}
>-						break;
>+ 			if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getTypeRuleRule());
>+ 	 }
>+ 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRule319); 
> 
>-					}
>+ 		newLeafNode(otherlv_1, grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0()); 
>+ 	
> 
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ }
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end ruleQualifiedName
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleTypeRule"
> 
> 
>-	// $ANTLR start entryRuleBoundSpecification
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:310:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>-	public final EObject entryRuleBoundSpecification() throws RecognitionException {
>-		EObject current = null;
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:204:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>+ public final EObject entryRuleQualifiedName() throws RecognitionException {
>+ EObject current = null;
> 
>-		EObject iv_ruleBoundSpecification = null;
>+ EObject iv_ruleQualifiedName = null;
> 
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:311:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:312:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode);
>-				pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification472);
>-				iv_ruleBoundSpecification = ruleBoundSpecification();
>-				_fsp--;
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:205:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:206:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>+ {
>+ newCompositeNode(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName355);
>+ iv_ruleQualifiedName=ruleQualifiedName();
> 
>-				current = iv_ruleBoundSpecification;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleBoundSpecification482);
>+ state._fsp--;
> 
>-			}
>+ current =iv_ruleQualifiedName; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName365); 
> 
>-		}
>+ }
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleQualifiedName"
> 
>-	// $ANTLR end entryRuleBoundSpecification
> 
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:213: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;
> 
>-	// $ANTLR start ruleBoundSpecification
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:319:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>-	public final EObject ruleBoundSpecification() throws RecognitionException {
>-		EObject current = null;
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+ EObject lv_remaining_2_0 = null;
> 
>-		Token lv_value_0_0 = null;
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:216:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:217:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:217:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:217:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:217:2: ( (otherlv_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:218:1: (otherlv_0= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:218:1: (otherlv_0= RULE_ID )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:219:3: otherlv_0= RULE_ID
>+ {
> 
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:324:6: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:325:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:325:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:326:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:326:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:327:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>-					{
>-						lv_value_0_0 = (Token)input.LT(1);
>-						match(input, RULE_UNLIMITEDLITERAL, FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification523);
>+ 			if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getQualifiedNameRule());
>+ 	 }
>+ 
>+ otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName410); 
> 
>-						createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value");
>+ 		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
>+ 	
> 
>+ }
> 
>-						if(current == null) {
>-							current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-							associateNodeWithAstElement(currentNode, current);
>-						}
>-						try {
>-							set(current, "value", lv_value_0_0, "UnlimitedLiteral", lastConsumedNode);
>-						} catch (ValueConverterException vce) {
>-							handleValueConverterException(vce);
>-						}
> 
>+ }
> 
>-					}
>+ otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleQualifiedName422); 
> 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>+ 
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:234:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-				}
>+ if ( (LA3_0==RULE_ID) ) {
>+ int LA3_1 = input.LA(2);
> 
>+ if ( (LA3_1==14) ) {
>+ alt3=1;
>+ }
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:235:1: (lv_remaining_2_0= ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:235:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:236:3: lv_remaining_2_0= ruleQualifiedName
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName443);
>+ lv_remaining_2_0=ruleQualifiedName();
> 
>-			}
>+ state._fsp--;
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
> 
>-		}
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end ruleBoundSpecification
> 
>+ }
>+ break;
> 
>-	// $ANTLR start ruleVisibilityKind
>-	// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:357:1: ruleVisibilityKind returns [Enumerator current=null] : ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) ;
>-	public final Enumerator ruleVisibilityKind() throws RecognitionException {
>-		Enumerator current = null;
>+ }
> 
>-		setCurrentLookahead();
>-		resetLookahead();
>-		try {
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:361:6: ( ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) )
>-			// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:362:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
>-			{
>-				// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:362:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
>-				int alt4 = 4;
>-				switch(input.LA(1)) {
>-				case 15:
>-				{
>-					alt4 = 1;
>-				}
>-					break;
>-				case 16:
>-				{
>-					alt4 = 2;
>-				}
>-					break;
>-				case 17:
>-				{
>-					alt4 = 3;
>-				}
>-					break;
>-				case 18:
>-				{
>-					alt4 = 4;
>-				}
>-					break;
>-				default:
>-					NoViableAltException nvae = new NoViableAltException("362:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )", 4, 0, input);
> 
>-					throw nvae;
>-				}
>+ }
> 
>-				switch(alt4) {
>-				case 1:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:362:2: ( '+' )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:362:2: ( '+' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:362:4: '+'
>-					{
>-						match(input, 15, FOLLOW_15_in_ruleVisibilityKind575);
> 
>-						current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null);
>+ }
> 
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleQualifiedName"
> 
>-					}
> 
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:262:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>+ public final EObject entryRuleBoundSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:368:6: ( '-' )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:368:6: ( '-' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:368:8: '-'
>-					{
>-						match(input, 16, FOLLOW_16_in_ruleVisibilityKind590);
>+ EObject iv_ruleBoundSpecification = null;
> 
>-						current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null);
> 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:263:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:264:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>+ {
>+ newCompositeNode(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification482);
>+ iv_ruleBoundSpecification=ruleBoundSpecification();
> 
>-					}
>+ state._fsp--;
> 
>+ current =iv_ruleBoundSpecification; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification492); 
> 
>-				}
>-					break;
>-				case 3:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:374:6: ( '#' )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:374:6: ( '#' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:374:8: '#'
>-					{
>-						match(input, 17, FOLLOW_17_in_ruleVisibilityKind605);
>+ }
> 
>-						current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null);
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
> 
>-					}
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:271:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>+ public final EObject ruleBoundSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>+ Token lv_value_0_0=null;
> 
>-				}
>-					break;
>-				case 4:
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:380:6: ( '~' )
>-				{
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:380:6: ( '~' )
>-					// ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:380:8: '~'
>-					{
>-						match(input, 18, FOLLOW_18_in_ruleVisibilityKind620);
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:274:28: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:275:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:275:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:276:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:276:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:277:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>+ {
>+ lv_value_0_0=(Token)match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification533); 
> 
>-						current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null);
>+ 			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
>+ 		
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getBoundSpecificationRule());
>+ 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
>+ 	 
> 
>-					}
>+ }
> 
> 
>-				}
>-					break;
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleBoundSpecification"
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
> 
>-		}
>+ // $ANTLR start "ruleVisibilityKind"
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:301:1: ruleVisibilityKind returns [Enumerator current=null] : ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) ) ;
>+ public final Enumerator ruleVisibilityKind() throws RecognitionException {
>+ Enumerator current = null;
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
> 
>-	// $ANTLR end ruleVisibilityKind
>+ enterRule(); 
>+ try {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:303:28: ( ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) ) )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:304:1: ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:304:1: ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) )
>+ int alt4=4;
>+ switch ( input.LA(1) ) {
>+ case 15:
>+ {
>+ alt4=1;
>+ }
>+ break;
>+ case 16:
>+ {
>+ alt4=2;
>+ }
>+ break;
>+ case 17:
>+ {
>+ alt4=3;
>+ }
>+ break;
>+ case 18:
>+ {
>+ alt4=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 4, 0, input);
> 
>+ throw nvae;
>+ }
> 
>+ switch (alt4) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:304:2: (enumLiteral_0= '+' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:304:2: (enumLiteral_0= '+' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:304:4: enumLiteral_0= '+'
>+ {
>+ enumLiteral_0=(Token)match(input,15,FOLLOW_15_in_ruleVisibilityKind587); 
> 
>+ current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_0, grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
>+ 
> 
>-	public static final BitSet FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule75 = new BitSet(new long[]{ 0x0000000000000000L });
>+ }
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleCollaborationUseRule85 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_ruleVisibilityKind_in_ruleCollaborationUseRule131 = new BitSet(new long[]{ 0x0000000000000010L });
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:310:6: (enumLiteral_1= '-' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:310:6: (enumLiteral_1= '-' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:310:8: enumLiteral_1= '-'
>+ {
>+ enumLiteral_1=(Token)match(input,16,FOLLOW_16_in_ruleVisibilityKind604); 
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleCollaborationUseRule148 = new BitSet(new long[]{ 0x0000000000001000L });
>+ current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_1, grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
>+ 
> 
>-	public static final BitSet FOLLOW_12_in_ruleCollaborationUseRule163 = new BitSet(new long[]{ 0x0000000000002010L });
>+ }
> 
>-	public static final BitSet FOLLOW_ruleTypeRule_in_ruleCollaborationUseRule185 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_13_in_ruleCollaborationUseRule201 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:316:6: (enumLiteral_2= '#' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:316:6: (enumLiteral_2= '#' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:316:8: enumLiteral_2= '#'
>+ {
>+ enumLiteral_2=(Token)match(input,17,FOLLOW_17_in_ruleVisibilityKind621); 
> 
>-	public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule238 = new BitSet(new long[]{ 0x0000000000000000L });
>+ current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_2, grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
>+ 
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule248 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule294 = new BitSet(new long[]{ 0x0000000000000010L });
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule313 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:322:6: (enumLiteral_3= '~' )
>+ {
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:322:6: (enumLiteral_3= '~' )
>+ // ../org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parser/antlr/internal/InternalUmlCollaborationUse.g:322:8: enumLiteral_3= '~'
>+ {
>+ enumLiteral_3=(Token)match(input,18,FOLLOW_18_in_ruleVisibilityKind638); 
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName349 = new BitSet(new long[]{ 0x0000000000000000L });
>+ current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_3, grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
>+ 
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName359 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName402 = new BitSet(new long[]{ 0x0000000000004000L });
> 
>-	public static final BitSet FOLLOW_14_in_ruleQualifiedName412 = new BitSet(new long[]{ 0x0000000000000012L });
>+ }
>+ break;
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName433 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification472 = new BitSet(new long[]{ 0x0000000000000000L });
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification482 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification523 = new BitSet(new long[]{ 0x0000000000000002L });
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleVisibilityKind"
> 
>-	public static final BitSet FOLLOW_15_in_ruleVisibilityKind575 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // Delegated rules
> 
>-	public static final BitSet FOLLOW_16_in_ruleVisibilityKind590 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_17_in_ruleVisibilityKind605 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 
> 
>-	public static final BitSet FOLLOW_18_in_ruleVisibilityKind620 = new BitSet(new long[]{ 0x0000000000000002L });
>+ public static final BitSet FOLLOW_ruleCollaborationUseRule_in_entryRuleCollaborationUseRule75 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleCollaborationUseRule85 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleVisibilityKind_in_ruleCollaborationUseRule131 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleCollaborationUseRule148 = new BitSet(new long[]{0x0000000000001000L});
>+ public static final BitSet FOLLOW_12_in_ruleCollaborationUseRule165 = new BitSet(new long[]{0x0000000000002010L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_ruleCollaborationUseRule187 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_13_in_ruleCollaborationUseRule205 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule242 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule252 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule298 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule319 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName355 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName365 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName410 = new BitSet(new long[]{0x0000000000004000L});
>+ public static final BitSet FOLLOW_14_in_ruleQualifiedName422 = new BitSet(new long[]{0x0000000000000012L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName443 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification482 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification492 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification533 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_15_in_ruleVisibilityKind587 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_16_in_ruleVisibilityKind604 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_17_in_ruleVisibilityKind621 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_18_in_ruleVisibilityKind638 = new BitSet(new long[]{0x0000000000000002L});
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/services/UmlCollaborationUseGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/services/UmlCollaborationUseGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/services/UmlCollaborationUseGrammarAccess.java	(working copy)
>@@ -1,196 +1,133 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> 
> package org.eclipse.papyrus.collaborationuse.editor.xtext.services;
> 
>-import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
>-import org.eclipse.xtext.Alternatives;
>-import org.eclipse.xtext.Assignment;
>-import org.eclipse.xtext.CrossReference;
>-import org.eclipse.xtext.EnumRule;
>-import org.eclipse.xtext.Grammar;
>-import org.eclipse.xtext.GrammarUtil;
>-import org.eclipse.xtext.Group;
>-import org.eclipse.xtext.Keyword;
>-import org.eclipse.xtext.ParserRule;
>-import org.eclipse.xtext.RuleCall;
>-import org.eclipse.xtext.TerminalRule;
>-import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
>+import com.google.inject.Singleton;
>+import com.google.inject.Inject;
>+
>+import org.eclipse.xtext.*;
> import org.eclipse.xtext.service.GrammarProvider;
>+import org.eclipse.xtext.service.AbstractElementFinder.*;
> 
>-import com.google.inject.Inject;
>-import com.google.inject.Singleton;
>+import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> 
> @Singleton
> public class UmlCollaborationUseGrammarAccess extends AbstractGrammarElementFinder {
>-
>-
>+	
>+	
> 	public class CollaborationUseRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "CollaborationUseRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CollaborationUseRule");
> 		private final Group cGroup = (Group)rule.eContents().get(1);
>-
> 		private final Assignment cVisibilityAssignment_0 = (Assignment)cGroup.eContents().get(0);
>-
> 		private final RuleCall cVisibilityVisibilityKindEnumRuleCall_0_0 = (RuleCall)cVisibilityAssignment_0.eContents().get(0);
>-
> 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
>-
> 		private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
>-
> 		private final Keyword cColonKeyword_2 = (Keyword)cGroup.eContents().get(2);
>-
> 		private final Alternatives cAlternatives_3 = (Alternatives)cGroup.eContents().get(3);
>-
> 		private final Assignment cTypeAssignment_3_0 = (Assignment)cAlternatives_3.eContents().get(0);
>-
> 		private final RuleCall cTypeTypeRuleParserRuleCall_3_0_0 = (RuleCall)cTypeAssignment_3_0.eContents().get(0);
>-
> 		private final Keyword cUndefinedKeyword_3_1 = (Keyword)cAlternatives_3.eContents().get(1);
>-
>+		
> 		//CollaborationUseRule:
> 		//	visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>");
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>")
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//visibility=VisibilityKind
>-		public Assignment getVisibilityAssignment_0() {
>-			return cVisibilityAssignment_0;
>-		}
>+		public Assignment getVisibilityAssignment_0() { return cVisibilityAssignment_0; }
> 
> 		//VisibilityKind
>-		public RuleCall getVisibilityVisibilityKindEnumRuleCall_0_0() {
>-			return cVisibilityVisibilityKindEnumRuleCall_0_0;
>-		}
>+		public RuleCall getVisibilityVisibilityKindEnumRuleCall_0_0() { return cVisibilityVisibilityKindEnumRuleCall_0_0; }
> 
> 		//name=ID
>-		public Assignment getNameAssignment_1() {
>-			return cNameAssignment_1;
>-		}
>+		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
> 
> 		//ID
>-		public RuleCall getNameIDTerminalRuleCall_1_0() {
>-			return cNameIDTerminalRuleCall_1_0;
>-		}
>+		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
> 
> 		//":"
>-		public Keyword getColonKeyword_2() {
>-			return cColonKeyword_2;
>-		}
>+		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
> 
> 		//type=TypeRule | "<Undefined>"
>-		public Alternatives getAlternatives_3() {
>-			return cAlternatives_3;
>-		}
>+		public Alternatives getAlternatives_3() { return cAlternatives_3; }
> 
> 		//type=TypeRule
>-		public Assignment getTypeAssignment_3_0() {
>-			return cTypeAssignment_3_0;
>-		}
>+		public Assignment getTypeAssignment_3_0() { return cTypeAssignment_3_0; }
> 
> 		//TypeRule
>-		public RuleCall getTypeTypeRuleParserRuleCall_3_0_0() {
>-			return cTypeTypeRuleParserRuleCall_3_0_0;
>-		}
>+		public RuleCall getTypeTypeRuleParserRuleCall_3_0_0() { return cTypeTypeRuleParserRuleCall_3_0_0; }
> 
> 		//"<Undefined>"
>-		public Keyword getUndefinedKeyword_3_1() {
>-			return cUndefinedKeyword_3_1;
>-		}
>+		public Keyword getUndefinedKeyword_3_1() { return cUndefinedKeyword_3_1; }
> 	}
> 
> 	public class TypeRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "TypeRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TypeRule");
> 		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);
>-
> 		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
>-
> 		private final CrossReference cTypeCollaborationCrossReference_1_0 = (CrossReference)cTypeAssignment_1.eContents().get(0);
>-
> 		private final RuleCall cTypeCollaborationIDTerminalRuleCall_1_0_1 = (RuleCall)cTypeCollaborationCrossReference_1_0.eContents().get(1);
>-
>+		
> 		//TypeRule:
> 		//	path=QualifiedName? type=[uml::Collaboration];
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//path=QualifiedName? type=[uml::Collaboration]
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//path=QualifiedName?
>-		public Assignment getPathAssignment_0() {
>-			return cPathAssignment_0;
>-		}
>+		public Assignment getPathAssignment_0() { return cPathAssignment_0; }
> 
> 		//QualifiedName
>-		public RuleCall getPathQualifiedNameParserRuleCall_0_0() {
>-			return cPathQualifiedNameParserRuleCall_0_0;
>-		}
>+		public RuleCall getPathQualifiedNameParserRuleCall_0_0() { return cPathQualifiedNameParserRuleCall_0_0; }
> 
> 		//type=[uml::Collaboration]
>-		public Assignment getTypeAssignment_1() {
>-			return cTypeAssignment_1;
>-		}
>+		public Assignment getTypeAssignment_1() { return cTypeAssignment_1; }
> 
> 		//[uml::Collaboration]
>-		public CrossReference getTypeCollaborationCrossReference_1_0() {
>-			return cTypeCollaborationCrossReference_1_0;
>-		}
>+		public CrossReference getTypeCollaborationCrossReference_1_0() { return cTypeCollaborationCrossReference_1_0; }
> 
> 		//ID
>-		public RuleCall getTypeCollaborationIDTerminalRuleCall_1_0_1() {
>-			return cTypeCollaborationIDTerminalRuleCall_1_0_1;
>-		}
>+		public RuleCall getTypeCollaborationIDTerminalRuleCall_1_0_1() { return cTypeCollaborationIDTerminalRuleCall_1_0_1; }
> 	}
>-
>-
>+	
>+	
> 	private CollaborationUseRuleElements pCollaborationUseRule;
>-
> 	private TypeRuleElements pTypeRule;
>-
>+	
> 	private final GrammarProvider grammarProvider;
> 
> 	private UmlCommonGrammarAccess gaUmlCommon;
> 
> 	@Inject
>-	public UmlCollaborationUseGrammarAccess(GrammarProvider grammarProvider, UmlCommonGrammarAccess gaUmlCommon) {
>+	public UmlCollaborationUseGrammarAccess(GrammarProvider grammarProvider,
>+		UmlCommonGrammarAccess gaUmlCommon) {
> 		this.grammarProvider = grammarProvider;
> 		this.gaUmlCommon = gaUmlCommon;
> 	}
>-
>-	public Grammar getGrammar() {
>+	
>+	public Grammar getGrammar() {	
> 		return grammarProvider.getGrammar(this);
> 	}
>-
>+	
> 
> 	public UmlCommonGrammarAccess getUmlCommonGrammarAccess() {
> 		return gaUmlCommon;
> 	}
> 
>-
>+	
> 	//CollaborationUseRule:
> 	//	visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>");
> 	public CollaborationUseRuleElements getCollaborationUseRuleAccess() {
> 		return (pCollaborationUseRule != null) ? pCollaborationUseRule : (pCollaborationUseRule = new CollaborationUseRuleElements());
> 	}
>-
>+	
> 	public ParserRule getCollaborationUseRuleRule() {
> 		return getCollaborationUseRuleAccess().getRule();
> 	}
>@@ -200,7 +137,7 @@
> 	public TypeRuleElements getTypeRuleAccess() {
> 		return (pTypeRule != null) ? pTypeRule : (pTypeRule = new TypeRuleElements());
> 	}
>-
>+	
> 	public ParserRule getTypeRuleRule() {
> 		return getTypeRuleAccess().getRule();
> 	}
>@@ -210,7 +147,7 @@
> 	public UmlCommonGrammarAccess.QualifiedNameElements getQualifiedNameAccess() {
> 		return gaUmlCommon.getQualifiedNameAccess();
> 	}
>-
>+	
> 	public ParserRule getQualifiedNameRule() {
> 		return getQualifiedNameAccess().getRule();
> 	}
>@@ -220,7 +157,7 @@
> 	public UmlCommonGrammarAccess.VisibilityKindElements getVisibilityKindAccess() {
> 		return gaUmlCommon.getVisibilityKindAccess();
> 	}
>-
>+	
> 	public EnumRule getVisibilityKindRule() {
> 		return getVisibilityKindAccess().getRule();
> 	}
>@@ -230,7 +167,7 @@
> 	public UmlCommonGrammarAccess.MultiplicityRuleElements getMultiplicityRuleAccess() {
> 		return gaUmlCommon.getMultiplicityRuleAccess();
> 	}
>-
>+	
> 	public ParserRule getMultiplicityRuleRule() {
> 		return getMultiplicityRuleAccess().getRule();
> 	}
>@@ -240,7 +177,7 @@
> 	public UmlCommonGrammarAccess.BoundSpecificationElements getBoundSpecificationAccess() {
> 		return gaUmlCommon.getBoundSpecificationAccess();
> 	}
>-
>+	
> 	public ParserRule getBoundSpecificationRule() {
> 		return getBoundSpecificationAccess().getRule();
> 	}
>@@ -249,14 +186,14 @@
> 	//	"0".."9" "0".."9"* | "*";
> 	public TerminalRule getUnlimitedLiteralRule() {
> 		return gaUmlCommon.getUnlimitedLiteralRule();
>-	}
>+	} 
> 
> 	//enum Direction:
> 	//	IN="in" | OUT="out" | INOUT="inout" | RETURN="return";
> 	public UmlCommonGrammarAccess.DirectionElements getDirectionAccess() {
> 		return gaUmlCommon.getDirectionAccess();
> 	}
>-
>+	
> 	public EnumRule getDirectionRule() {
> 		return getDirectionAccess().getRule();
> 	}
>@@ -265,42 +202,42 @@
> 	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
> 	public TerminalRule getIDRule() {
> 		return gaUmlCommon.getIDRule();
>-	}
>+	} 
> 
> 	//terminal INT returns ecore::EInt:
> 	//	"0".."9"+;
> 	public TerminalRule getINTRule() {
> 		return gaUmlCommon.getINTRule();
>-	}
>+	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaUmlCommon.getSTRINGRule();
>-	}
>+	} 
> 
> 	//terminal ML_COMMENT:
> 	//	"/ *"->"* /";
> 	public TerminalRule getML_COMMENTRule() {
> 		return gaUmlCommon.getML_COMMENTRule();
>-	}
>+	} 
> 
> 	//terminal SL_COMMENT:
> 	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
> 	public TerminalRule getSL_COMMENTRule() {
> 		return gaUmlCommon.getSL_COMMENTRule();
>-	}
>+	} 
> 
> 	//terminal WS:
> 	//	(" " | "\t" | "\r" | "\n")+;
> 	public TerminalRule getWSRule() {
> 		return gaUmlCommon.getWSRule();
>-	}
>+	} 
> 
> 	//terminal ANY_OTHER:
> 	//	.;
> 	public TerminalRule getANY_OTHERRule() {
> 		return gaUmlCommon.getANY_OTHERRule();
>-	}
>+	} 
> }
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/validation/AbstractUmlCollaborationUseJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/validation/AbstractUmlCollaborationUseJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/validation/AbstractUmlCollaborationUseJavaValidator.java	(working copy)
>@@ -1,18 +1,5 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.validation;
>-
>+ 
> import java.util.ArrayList;
> import java.util.List;
> 
>@@ -20,13 +7,13 @@
> import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
> import org.eclipse.xtext.validation.ComposedChecks;
> 
>-@ComposedChecks(validators = { org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class })
>+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlCollaborationUseJavaValidator extends AbstractDeclarativeValidator {
> 
> 	@Override
> 	protected List<EPackage> getEPackages() {
>-		List<EPackage> result = new ArrayList<EPackage>();
>-		result.add(org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage.eINSTANCE);
>+	 List<EPackage> result = new ArrayList<EPackage>();
>+	 result.add(org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage.eINSTANCE);
> 		return result;
> 	}
> 
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parseTreeConstruction/UmlCollaborationUseParsetreeConstructor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parseTreeConstruction/UmlCollaborationUseParsetreeConstructor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/parseTreeConstruction/UmlCollaborationUseParsetreeConstructor.java	(working copy)
>@@ -1,879 +1,798 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.collaborationuse.editor.xtext.parseTreeConstruction;
> 
>-import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
>-import org.eclipse.xtext.Alternatives;
>-import org.eclipse.xtext.Assignment;
>-import org.eclipse.xtext.Group;
>-import org.eclipse.xtext.Keyword;
>+import org.eclipse.emf.ecore.*;
>+import org.eclipse.xtext.*;
> import org.eclipse.xtext.parsetree.reconstr.IEObjectConsumer;
> import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
> 
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess;
>+
> import com.google.inject.Inject;
> 
> @SuppressWarnings("all")
> public class UmlCollaborationUseParsetreeConstructor extends AbstractParseTreeConstructor {
>-
>+		
> 	@Inject
> 	private UmlCollaborationUseGrammarAccess grammarAccess;
>-
>+	
> 	@Override
> 	protected AbstractToken getRootToken(IEObjectConsumer inst) {
>-		return new ThisRootNode(inst);
>+		return new ThisRootNode(inst);	
> 	}
>-
>-	protected class ThisRootNode extends RootToken {
>-
>-		public ThisRootNode(IEObjectConsumer inst) {
>-			super(inst);
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_Group(this, this, 0, inst);
>-			case 1:
>-				return new TypeRule_Group(this, this, 1, inst);
>-			case 2:
>-				return new QualifiedName_Group(this, this, 2, inst);
>-			case 3:
>-				return new MultiplicityRule_Group(this, this, 3, inst);
>-			case 4:
>-				return new BoundSpecification_ValueAssignment(this, this, 4, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+	
>+protected class ThisRootNode extends RootToken {
>+	public ThisRootNode(IEObjectConsumer inst) {
>+		super(inst);
> 	}
>-
>-
>-	/************
>-	 * begin Rule CollaborationUseRule ****************
>-	 * 
>-	 * CollaborationUseRule:
>-	 * visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>");
>-	 * 
>-	 **/
>-
>-	// visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>")
>-	protected class CollaborationUseRule_Group extends GroupToken {
>-
>-		public CollaborationUseRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getGroup();
>-		}
>+	
>+	@Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_Group(this, this, 0, inst);
>+			case 1: return new TypeRule_Group(this, this, 1, inst);
>+			case 2: return new QualifiedName_Group(this, this, 2, inst);
>+			case 3: return new MultiplicityRule_Group(this, this, 3, inst);
>+			case 4: return new BoundSpecification_ValueAssignment(this, this, 4, inst);
>+			default: return null;
>+		}	
>+	}	
>+}
>+	
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_Alternatives_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+/************ begin Rule CollaborationUseRule ****************
>+ *
>+ * CollaborationUseRule:
>+ * 	visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>");
>+ *
>+ **/
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getCollaborationUseRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+// visibility=VisibilityKind name=ID ":" (type=TypeRule | "<Undefined>")
>+protected class CollaborationUseRule_Group extends GroupToken {
>+	
>+	public CollaborationUseRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// visibility=VisibilityKind
>-	protected class CollaborationUseRule_VisibilityAssignment_0 extends AssignmentToken {
>-
>-		public CollaborationUseRule_VisibilityAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getVisibilityAssignment_0();
>-		}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_Alternatives_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("visibility", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("visibility");
>-			if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), value, null)) {
>-				type = AssignmentType.ENUM_RULE_CALL;
>-				element = grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0();
>-				return obj;
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getCollaborationUseRuleRule().getType().getClassifier())
> 			return null;
>-		}
>-
>+		return eObjectConsumer;
> 	}
> 
>-	// name=ID
>-	protected class CollaborationUseRule_NameAssignment_1 extends AssignmentToken {
>-
>-		public CollaborationUseRule_NameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getNameAssignment_1();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_VisibilityAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("name", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("name");
>-			if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0(), value, null)) {
>-				type = AssignmentType.TERMINAL_RULE_CALL;
>-				element = grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0();
>-				return obj;
>-			}
>-			return null;
>-		}
>+}
> 
>+// visibility=VisibilityKind
>+protected class CollaborationUseRule_VisibilityAssignment_0 extends AssignmentToken {
>+	
>+	public CollaborationUseRule_VisibilityAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// ":"
>-	protected class CollaborationUseRule_ColonKeyword_2 extends KeywordToken {
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getVisibilityAssignment_0();
>+	}
> 
>-		public CollaborationUseRule_ColonKeyword_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2();
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("visibility",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("visibility");
>+		if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), value, null)) { 
>+			type = AssignmentType.ENUM_RULE_CALL;
>+			element = grammarAccess.getCollaborationUseRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0();
>+			return obj;
> 		}
>+		return null;
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_NameAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>+// name=ID
>+protected class CollaborationUseRule_NameAssignment_1 extends AssignmentToken {
>+	
>+	public CollaborationUseRule_NameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// type=TypeRule | "<Undefined>"
>-	protected class CollaborationUseRule_Alternatives_3 extends AlternativesToken {
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getNameAssignment_1();
>+	}
> 
>-		public CollaborationUseRule_Alternatives_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_VisibilityAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Alternatives getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3();
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("name",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("name");
>+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0(), value, null)) {
>+			type = AssignmentType.TERMINAL_RULE_CALL;
>+			element = grammarAccess.getCollaborationUseRuleAccess().getNameIDTerminalRuleCall_1_0();
>+			return obj;
> 		}
>+		return null;
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_TypeAssignment_3_0(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new CollaborationUseRule_UndefinedKeyword_3_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>+// ":"
>+protected class CollaborationUseRule_ColonKeyword_2 extends KeywordToken {
>+	
>+	public CollaborationUseRule_ColonKeyword_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// type=TypeRule
>-	protected class CollaborationUseRule_TypeAssignment_3_0 extends AssignmentToken {
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getColonKeyword_2();
>+	}
> 
>-		public CollaborationUseRule_TypeAssignment_3_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_NameAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getTypeAssignment_3_0();
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// type=TypeRule | "<Undefined>"
>+protected class CollaborationUseRule_Alternatives_3 extends AlternativesToken {
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("type", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getTypeRuleRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+	public CollaborationUseRule_Alternatives_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Alternatives getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getAlternatives_3();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_ColonKeyword_2(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_TypeAssignment_3_0(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new CollaborationUseRule_UndefinedKeyword_3_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
> 	}
> 
>-	// "<Undefined>"
>-	protected class CollaborationUseRule_UndefinedKeyword_3_1 extends KeywordToken {
>+}
> 
>-		public CollaborationUseRule_UndefinedKeyword_3_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// type=TypeRule
>+protected class CollaborationUseRule_TypeAssignment_3_0 extends AssignmentToken {
>+	
>+	public CollaborationUseRule_TypeAssignment_3_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getTypeAssignment_3_0();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new CollaborationUseRule_ColonKeyword_2(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("type",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getTypeRuleRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getCollaborationUseRuleAccess().getTypeTypeRuleParserRuleCall_3_0_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_ColonKeyword_2(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-	/************ end Rule CollaborationUseRule ****************/
>+// "<Undefined>"
>+protected class CollaborationUseRule_UndefinedKeyword_3_1 extends KeywordToken {
>+	
>+	public CollaborationUseRule_UndefinedKeyword_3_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getCollaborationUseRuleAccess().getUndefinedKeyword_3_1();
>+	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new CollaborationUseRule_ColonKeyword_2(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	/************
>-	 * begin Rule TypeRule ****************
>-	 * 
>-	 * TypeRule:
>-	 * path=QualifiedName? type=[uml::Collaboration];
>-	 * 
>-	 **/
>+}
> 
>-	// path=QualifiedName? type=[uml::Collaboration]
>-	protected class TypeRule_Group extends GroupToken {
> 
>-		public TypeRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getGroup();
>-		}
>+/************ end Rule CollaborationUseRule ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_TypeAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getTypeRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>+/************ begin Rule TypeRule ****************
>+ *
>+ * TypeRule:
>+ * 	path=QualifiedName? type=[uml::Collaboration];
>+ *
>+ **/
> 
>+// path=QualifiedName? type=[uml::Collaboration]
>+protected class TypeRule_Group extends GroupToken {
>+	
>+	public TypeRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// path=QualifiedName?
>-	protected class TypeRule_PathAssignment_0 extends AssignmentToken {
>-
>-		public TypeRule_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getPathAssignment_0();
>-		}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_TypeAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("path", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getTypeRuleRule().getType().getClassifier())
> 			return null;
>-		}
>-
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex, index, consumed);
>-			}
>-		}
>+		return eObjectConsumer;
> 	}
> 
>-	// type=[uml::Collaboration]
>-	protected class TypeRule_TypeAssignment_1 extends AssignmentToken {
>-
>-		public TypeRule_TypeAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getTypeAssignment_1();
>-		}
>+// path=QualifiedName?
>+protected class TypeRule_PathAssignment_0 extends AssignmentToken {
>+	
>+	public TypeRule_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getPathAssignment_0();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index - 1, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("type", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0().getType().getClassifier())) {
>-					type = AssignmentType.CROSS_REFERENCE;
>-					element = grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0();
>-					return obj;
>-				}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("path",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(); 
>+				consumed = obj;
>+				return param;
> 			}
>-			return null;
> 		}
>-
>+		return null;
> 	}
> 
>-
>-	/************ end Rule TypeRule ****************/
>-
>-
>-	/************
>-	 * begin Rule QualifiedName ****************
>-	 * 
>-	 * QualifiedName:
>-	 * path=[uml::Namespace] "::" remaining=QualifiedName?;
>-	 * 
>-	 **/
>-
>-	// path=[uml::Namespace] "::" remaining=QualifiedName?
>-	protected class QualifiedName_Group extends GroupToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex , index, consumed);
>+		}	
>+	}	
>+}
> 
>-		public QualifiedName_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// type=[uml::Collaboration]
>+protected class TypeRule_TypeAssignment_1 extends AssignmentToken {
>+	
>+	public TypeRule_TypeAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getTypeAssignment_1();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getGroup();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index - 1, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_RemainingAssignment_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("type",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0().getType().getClassifier())) {
>+				type = AssignmentType.CROSS_REFERENCE;
>+				element = grammarAccess.getTypeRuleAccess().getTypeCollaborationCrossReference_1_0(); 
>+				return obj;
> 			}
> 		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getQualifiedNameRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+		return null;
> 	}
> 
>-	// path=[uml::Namespace]
>-	protected class QualifiedName_PathAssignment_0 extends AssignmentToken {
>+}
> 
>-		public QualifiedName_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getPathAssignment_0();
>-		}
>+/************ end Rule TypeRule ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("path", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0().getType().getClassifier())) {
>-					type = AssignmentType.CROSS_REFERENCE;
>-					element = grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0();
>-					return obj;
>-				}
>-			}
>-			return null;
>-		}
>+/************ begin Rule QualifiedName ****************
>+ *
>+ * QualifiedName:
>+ * 	path=[uml::Namespace] "::" remaining=QualifiedName?;
>+ *
>+ **/
> 
>+// path=[uml::Namespace] "::" remaining=QualifiedName?
>+protected class QualifiedName_Group extends GroupToken {
>+	
>+	public QualifiedName_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// "::"
>-	protected class QualifiedName_ColonColonKeyword_1 extends KeywordToken {
>-
>-		public QualifiedName_ColonColonKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getGroup();
> 	}
> 
>-	// remaining=QualifiedName?
>-	protected class QualifiedName_RemainingAssignment_2 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_RemainingAssignment_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		public QualifiedName_RemainingAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getQualifiedNameRule().getType().getClassifier())
>+			return null;
>+		return eObjectConsumer;
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2();
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// path=[uml::Namespace]
>+protected class QualifiedName_PathAssignment_0 extends AssignmentToken {
>+	
>+	public QualifiedName_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getPathAssignment_0();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("remaining", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("remaining");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("path",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0().getType().getClassifier())) {
>+				type = AssignmentType.CROSS_REFERENCE;
>+				element = grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(); 
>+				return obj;
> 			}
> 		}
>+		return null;
> 	}
> 
>-
>-	/************ end Rule QualifiedName ****************/
>+}
> 
>+// "::"
>+protected class QualifiedName_ColonColonKeyword_1 extends KeywordToken {
>+	
>+	public QualifiedName_ColonColonKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1();
>+	}
> 
>-	/************
>-	 * begin Rule MultiplicityRule ****************
>-	 * 
>-	 * MultiplicityRule:
>-	 * "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>-	 * 
>-	 **/
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	// "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>-	protected class MultiplicityRule_Group extends GroupToken {
>+}
> 
>-		public MultiplicityRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// remaining=QualifiedName?
>+protected class QualifiedName_RemainingAssignment_2 extends AssignmentToken {
>+	
>+	public QualifiedName_RemainingAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getGroup();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_RightSquareBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("remaining",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("remaining");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getMultiplicityRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+		return null;
> 	}
> 
>-	// "["
>-	protected class MultiplicityRule_LeftSquareBracketKeyword_0 extends KeywordToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public MultiplicityRule_LeftSquareBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0();
>-		}
>+/************ end Rule QualifiedName ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
> 
>-	}
>+/************ begin Rule MultiplicityRule ****************
>+ *
>+ * MultiplicityRule:
>+ * 	"[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>+ *
>+ **/
> 
>-	// bounds+=BoundSpecification
>-	protected class MultiplicityRule_BoundsAssignment_1 extends AssignmentToken {
>+// "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>+protected class MultiplicityRule_Group extends GroupToken {
>+	
>+	public MultiplicityRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getGroup();
>+	}
> 
>-		public MultiplicityRule_BoundsAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_RightSquareBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1();
>-		}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getMultiplicityRuleRule().getType().getClassifier())
>+			return null;
>+		return eObjectConsumer;
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("bounds", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+// "["
>+protected class MultiplicityRule_LeftSquareBracketKeyword_0 extends KeywordToken {
>+	
>+	public MultiplicityRule_LeftSquareBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_LeftSquareBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
> 	}
> 
>-	// (".." bounds+=BoundSpecification)?
>-	protected class MultiplicityRule_Group_2 extends GroupToken {
>+}
> 
>-		public MultiplicityRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// bounds+=BoundSpecification
>+protected class MultiplicityRule_BoundsAssignment_1 extends AssignmentToken {
>+	
>+	public MultiplicityRule_BoundsAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getGroup_2();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_BoundsAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("bounds",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// ".."
>-	protected class MultiplicityRule_FullStopFullStopKeyword_2_0 extends KeywordToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new MultiplicityRule_LeftSquareBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public MultiplicityRule_FullStopFullStopKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// (".." bounds+=BoundSpecification)?
>+protected class MultiplicityRule_Group_2 extends GroupToken {
>+	
>+	public MultiplicityRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getGroup_2();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_BoundsAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>+// ".."
>+protected class MultiplicityRule_FullStopFullStopKeyword_2_0 extends KeywordToken {
>+	
>+	public MultiplicityRule_FullStopFullStopKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// bounds+=BoundSpecification
>-	protected class MultiplicityRule_BoundsAssignment_2_1 extends AssignmentToken {
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0();
>+	}
> 
>-		public MultiplicityRule_BoundsAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1();
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// bounds+=BoundSpecification
>+protected class MultiplicityRule_BoundsAssignment_2_1 extends AssignmentToken {
>+	
>+	public MultiplicityRule_BoundsAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("bounds", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_FullStopFullStopKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("bounds",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>+		return null;
> 	}
> 
>-
>-	// "]"
>-	protected class MultiplicityRule_RightSquareBracketKeyword_3 extends KeywordToken {
>-
>-		public MultiplicityRule_RightSquareBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3();
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new MultiplicityRule_FullStopFullStopKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>+// "]"
>+protected class MultiplicityRule_RightSquareBracketKeyword_3 extends KeywordToken {
>+	
>+	public MultiplicityRule_RightSquareBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3();
> 	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	/************ end Rule MultiplicityRule ****************/
>+}
> 
> 
>-	/************
>-	 * begin Rule BoundSpecification ****************
>-	 * 
>-	 * BoundSpecification:
>-	 * value=UnlimitedLiteral;
>-	 * 
>-	 **/
>+/************ end Rule MultiplicityRule ****************/
> 
>-	// value=UnlimitedLiteral
>-	protected class BoundSpecification_ValueAssignment extends AssignmentToken {
> 
>-		public BoundSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+/************ begin Rule BoundSpecification ****************
>+ *
>+ * BoundSpecification:
>+ * 	value=UnlimitedLiteral;
>+ *
>+ **/
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getBoundSpecificationAccess().getValueAssignment();
>-		}
>+// value=UnlimitedLiteral
>+protected class BoundSpecification_ValueAssignment extends AssignmentToken {
>+	
>+	public BoundSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getBoundSpecificationAccess().getValueAssignment();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getBoundSpecificationRule().getType().getClassifier())
>-				return null;
>-			if((value = eObjectConsumer.getConsumable("value", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>-			if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), value, null)) {
>-				type = AssignmentType.TERMINAL_RULE_CALL;
>-				element = grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0();
>-				return obj;
>-			}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getBoundSpecificationRule().getType().getClassifier())
> 			return null;
>+		if((value = eObjectConsumer.getConsumable("value",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), value, null)) {
>+			type = AssignmentType.TERMINAL_RULE_CALL;
>+			element = grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0();
>+			return obj;
> 		}
>-
>+		return null;
> 	}
> 
>-	/************ end Rule BoundSpecification ****************/
>+}
>+
>+/************ end Rule BoundSpecification ****************/
> 
> }
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/AbstractUmlCollaborationUseRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/AbstractUmlCollaborationUseRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/AbstractUmlCollaborationUseRuntimeModule.java	(working copy)
>@@ -14,7 +14,7 @@
> /**
> * Manual modifications go to {org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUseRuntimeModule}
> */
>-@SuppressWarnings("all")
>+ @SuppressWarnings("all")
> public abstract class AbstractUmlCollaborationUseRuntimeModule extends DefaultRuntimeModule {
> 
> 	protected Properties properties = null;
>@@ -24,16 +24,16 @@
> 		properties = tryBindProperties(binder, "org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.properties");
> 		super.configure(binder);
> 	}
>-
>+	
> 	public void configureLanguageName(Binder binder) {
> 		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.collaborationuse.editor.xtext.UmlCollaborationUse");
> 	}
>-
>+	
> 	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("umlcollaborationuse");
> 	}
>-
>+	
> 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
> 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
> 		return org.eclipse.papyrus.collaborationuse.editor.xtext.services.UmlCollaborationUseGrammarAccess.class;
>@@ -45,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.collaborationuse.editor.xtext.parser.antlr.UmlCollaborationUseParser.class;
> 	}
> 
>@@ -80,8 +80,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
>-	@org.eclipse.xtext.service.SingletonBinding(eager = true)
>-	public Class<? extends org.eclipse.papyrus.collaborationuse.editor.xtext.validation.UmlCollaborationUseJavaValidator> bindUmlCollaborationUseJavaValidator() {
>+	@org.eclipse.xtext.service.SingletonBinding(eager=true)	public Class<? extends org.eclipse.papyrus.collaborationuse.editor.xtext.validation.UmlCollaborationUseJavaValidator> bindUmlCollaborationUseJavaValidator() {
> 		return org.eclipse.papyrus.collaborationuse.editor.xtext.validation.UmlCollaborationUseJavaValidator.class;
> 	}
> 
>@@ -92,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -100,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>@@ -122,7 +126,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/UmlCollaborationUsePackage.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/UmlCollaborationUsePackage.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/UmlCollaborationUsePackage.java	(working copy)
>@@ -10,6 +10,7 @@
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EReference;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
> 
> /**
>@@ -17,289 +18,254 @@
> * The Package for the model.
> * It contains accessors for the meta objects to represent
> * <ul>
>- * <li>each class,</li>
>- * <li>each feature of each class,</li>
>- * <li>each enum,</li>
>- * <li>and each data type</li>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUseFactory
> * @model kind="package"
> * @generated
> */
>-public interface UmlCollaborationUsePackage extends EPackage {
>+public interface UmlCollaborationUsePackage extends EPackage
>+{
>+ /**
>+ * The package name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNAME = "umlCollaborationUse";
> 
>-	/**
>-	 * The package name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNAME = "umlCollaborationUse";
>+ /**
>+ * The package namespace URI.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_URI = "http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse";
> 
>-	/**
>-	 * The package namespace URI.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNS_URI = "http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse";
>+ /**
>+ * The package namespace name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_PREFIX = "umlCollaborationUse";
> 
>-	/**
>-	 * The package namespace name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNS_PREFIX = "umlCollaborationUse";
>+ /**
>+ * The singleton instance of the package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ UmlCollaborationUsePackage eINSTANCE = org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl.init();
> 
>-	/**
>-	 * The singleton instance of the package.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	UmlCollaborationUsePackage eINSTANCE = org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl.init();
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl Collaboration Use Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getCollaborationUseRule()
>+ * @generated
>+ */
>+ int COLLABORATION_USE_RULE = 0;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl
>-	 * Collaboration Use Rule}' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getCollaborationUseRule()
>-	 * @generated
>-	 */
>-	int COLLABORATION_USE_RULE = 0;
>+ /**
>+ * The feature id for the 'Visibility' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int COLLABORATION_USE_RULE__VISIBILITY = 0;
> 
>-	/**
>-	 * The feature id for the 'Visibility' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int COLLABORATION_USE_RULE__VISIBILITY = 0;
>+ /**
>+ * The feature id for the 'Name' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int COLLABORATION_USE_RULE__NAME = 1;
> 
>-	/**
>-	 * The feature id for the 'Name' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int COLLABORATION_USE_RULE__NAME = 1;
>+ /**
>+ * The feature id for the 'Type' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int COLLABORATION_USE_RULE__TYPE = 2;
> 
>-	/**
>-	 * The feature id for the 'Type' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int COLLABORATION_USE_RULE__TYPE = 2;
>+ /**
>+ * The number of structural features of the 'Collaboration Use Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int COLLABORATION_USE_RULE_FEATURE_COUNT = 3;
> 
>-	/**
>-	 * The number of structural features of the 'Collaboration Use Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int COLLABORATION_USE_RULE_FEATURE_COUNT = 3;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl Type Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getTypeRule()
>+ * @generated
>+ */
>+ int TYPE_RULE = 1;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl Type Rule}'
>-	 * class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getTypeRule()
>-	 * @generated
>-	 */
>-	int TYPE_RULE = 1;
>+ /**
>+ * The feature id for the 'Path' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TYPE_RULE__PATH = UmlCommonPackage.TYPE_RULE__PATH;
> 
>-	/**
>-	 * The feature id for the 'Path' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_RULE__PATH = UmlCommonPackage.TYPE_RULE__PATH;
>+ /**
>+ * The feature id for the 'Type' reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TYPE_RULE__TYPE = UmlCommonPackage.TYPE_RULE__TYPE;
> 
>-	/**
>-	 * The feature id for the 'Type' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_RULE__TYPE = UmlCommonPackage.TYPE_RULE__TYPE;
>+ /**
>+ * The number of structural features of the 'Type Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TYPE_RULE_FEATURE_COUNT = UmlCommonPackage.TYPE_RULE_FEATURE_COUNT + 0;
> 
>-	/**
>-	 * The number of structural features of the 'Type Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_RULE_FEATURE_COUNT = UmlCommonPackage.TYPE_RULE_FEATURE_COUNT + 0;
> 
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule Collaboration Use Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Collaboration Use Rule'.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule
>+ * @generated
>+ */
>+ EClass getCollaborationUseRule();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule
>-	 * Collaboration Use Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Collaboration Use Rule'.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule
>-	 * @generated
>-	 */
>-	EClass getCollaborationUseRule();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility Visibility}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Visibility'.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility()
>+ * @see #getCollaborationUseRule()
>+ * @generated
>+ */
>+ EAttribute getCollaborationUseRule_Visibility();
> 
>-	/**
>-	 * Returns the meta object for the attribute '
>-	 * {@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility Visibility}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Visibility'.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility()
>-	 * @see #getCollaborationUseRule()
>-	 * @generated
>-	 */
>-	EAttribute getCollaborationUseRule_Visibility();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName Name}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Name'.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName()
>+ * @see #getCollaborationUseRule()
>+ * @generated
>+ */
>+ EAttribute getCollaborationUseRule_Name();
> 
>-	/**
>-	 * Returns the meta object for the attribute '
>-	 * {@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName Name}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Name'.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName()
>-	 * @see #getCollaborationUseRule()
>-	 * @generated
>-	 */
>-	EAttribute getCollaborationUseRule_Name();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType Type}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Type'.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType()
>+ * @see #getCollaborationUseRule()
>+ * @generated
>+ */
>+ EReference getCollaborationUseRule_Type();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '
>-	 * {@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType Type}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Type'.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType()
>-	 * @see #getCollaborationUseRule()
>-	 * @generated
>-	 */
>-	EReference getCollaborationUseRule_Type();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule Type Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Type Rule'.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule
>+ * @generated
>+ */
>+ EClass getTypeRule();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule Type Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Type Rule'.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule
>-	 * @generated
>-	 */
>-	EClass getTypeRule();
>+ /**
>+ * Returns the factory that creates the instances of the model.
>+ * 
>+ * 
>+ * @return the factory that creates the instances of the model.
>+ * @generated
>+ */
>+ UmlCollaborationUseFactory getUmlCollaborationUseFactory();
> 
>-	/**
>-	 * Returns the factory that creates the instances of the model.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the factory that creates the instances of the model.
>-	 * @generated
>-	 */
>-	UmlCollaborationUseFactory getUmlCollaborationUseFactory();
>+ /**
>+ * 
>+ * Defines literals for the meta objects that represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @generated
>+ */
>+ interface Literals
>+ {
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl Collaboration Use Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getCollaborationUseRule()
>+ * @generated
>+ */
>+ EClass COLLABORATION_USE_RULE = eINSTANCE.getCollaborationUseRule();
> 
>-	/**
>-	 * 
>-	 * Defines literals for the meta objects that represent
>-	 * <ul>
>-	 * <li>each class,</li>
>-	 * <li>each feature of each class,</li>
>-	 * <li>each enum,</li>
>-	 * <li>and each data type</li>
>-	 * </ul>
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	interface Literals {
>+ /**
>+ * The meta object literal for the 'Visibility' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute COLLABORATION_USE_RULE__VISIBILITY = eINSTANCE.getCollaborationUseRule_Visibility();
> 
>-		/**
>-		 * The meta object literal for the '
>-		 * {@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl Collaboration Use Rule}
>-		 * ' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl
>-		 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getCollaborationUseRule()
>-		 * @generated
>-		 */
>-		EClass COLLABORATION_USE_RULE = eINSTANCE.getCollaborationUseRule();
>+ /**
>+ * The meta object literal for the 'Name' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute COLLABORATION_USE_RULE__NAME = eINSTANCE.getCollaborationUseRule_Name();
> 
>-		/**
>-		 * The meta object literal for the 'Visibility' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute COLLABORATION_USE_RULE__VISIBILITY = eINSTANCE.getCollaborationUseRule_Visibility();
>+ /**
>+ * The meta object literal for the 'Type' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference COLLABORATION_USE_RULE__TYPE = eINSTANCE.getCollaborationUseRule_Type();
> 
>-		/**
>-		 * The meta object literal for the 'Name' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute COLLABORATION_USE_RULE__NAME = eINSTANCE.getCollaborationUseRule_Name();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl Type Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getTypeRule()
>+ * @generated
>+ */
>+ EClass TYPE_RULE = eINSTANCE.getTypeRule();
> 
>-		/**
>-		 * The meta object literal for the 'Type' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COLLABORATION_USE_RULE__TYPE = eINSTANCE.getCollaborationUseRule_Type();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl
>-		 * Type Rule}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.TypeRuleImpl
>-		 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUsePackageImpl#getTypeRule()
>-		 * @generated
>-		 */
>-		EClass TYPE_RULE = eINSTANCE.getTypeRule();
>-
>-	}
>+ }
> 
> } //UmlCollaborationUsePackage
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/UmlCollaborationUseFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/UmlCollaborationUseFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/UmlCollaborationUseFactory.java	(working copy)
>@@ -13,49 +13,44 @@
> * The Factory for the model.
> * It provides a create method for each non-abstract class of the model.
> * 
>- * 
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage
> * @generated
> */
>-public interface UmlCollaborationUseFactory extends EFactory {
>+public interface UmlCollaborationUseFactory extends EFactory
>+{
>+ /**
>+ * The singleton instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ UmlCollaborationUseFactory eINSTANCE = org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUseFactoryImpl.init();
> 
>-	/**
>-	 * The singleton instance of the factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	UmlCollaborationUseFactory eINSTANCE = org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.UmlCollaborationUseFactoryImpl.init();
>+ /**
>+ * Returns a new object of class 'Collaboration Use Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Collaboration Use Rule'.
>+ * @generated
>+ */
>+ CollaborationUseRule createCollaborationUseRule();
> 
>-	/**
>-	 * Returns a new object of class 'Collaboration Use Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Collaboration Use Rule'.
>-	 * @generated
>-	 */
>-	CollaborationUseRule createCollaborationUseRule();
>+ /**
>+ * Returns a new object of class 'Type Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Type Rule'.
>+ * @generated
>+ */
>+ TypeRule createTypeRule();
> 
>-	/**
>-	 * Returns a new object of class 'Type Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Type Rule'.
>-	 * @generated
>-	 */
>-	TypeRule createTypeRule();
>-
>-	/**
>-	 * Returns the package supported by this factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the package supported by this factory.
>-	 * @generated
>-	 */
>-	UmlCollaborationUsePackage getUmlCollaborationUsePackage();
>+ /**
>+ * Returns the package supported by this factory.
>+ * 
>+ * 
>+ * @return the package supported by this factory.
>+ * @generated
>+ */
>+ UmlCollaborationUsePackage getUmlCollaborationUsePackage();
> 
> } //UmlCollaborationUseFactory
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/TypeRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/TypeRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/TypeRuleImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> package org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl;
> 
> import org.eclipse.emf.ecore.EClass;
>+
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
> 
>@@ -16,30 +17,30 @@
> * 
> * 
> * 
>- * 
>+ *
> * @generated
> */
>-public class TypeRuleImpl extends org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl implements TypeRule {
>+public class TypeRuleImpl extends org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl implements TypeRule
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected TypeRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected TypeRuleImpl() {
>-		super();
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlCollaborationUsePackage.Literals.TYPE_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlCollaborationUsePackage.Literals.TYPE_RULE;
>+ }
> 
> } //TypeRuleImpl
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/CollaborationUseRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/CollaborationUseRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/CollaborationUseRuleImpl.java	(working copy)
>@@ -8,13 +8,17 @@
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>+
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.InternalEObject;
>+
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind;
> 
> /**
>@@ -24,302 +28,300 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl#getVisibility Visibility}</li>
>- * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl#getName Name}</li>
>- * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl#getType Type}</li>
>+ * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl#getVisibility Visibility}</li>
>+ * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.impl.CollaborationUseRuleImpl#getType Type}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class CollaborationUseRuleImpl extends MinimalEObjectImpl.Container implements CollaborationUseRule {
>+public class CollaborationUseRuleImpl extends MinimalEObjectImpl.Container implements CollaborationUseRule
>+{
>+ /**
>+ * The default value of the '{@link #getVisibility() Visibility}' attribute.
>+ * 
>+ * 
>+ * @see #getVisibility()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PUBLIC;
> 
>-	/**
>-	 * The default value of the '{@link #getVisibility() Visibility}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getVisibility()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PUBLIC;
>+ /**
>+ * The cached value of the '{@link #getVisibility() Visibility}' attribute.
>+ * 
>+ * 
>+ * @see #getVisibility()
>+ * @generated
>+ * @ordered
>+ */
>+ protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getVisibility() Visibility}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getVisibility()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
>+ /**
>+ * The default value of the '{@link #getName() Name}' attribute.
>+ * 
>+ * 
>+ * @see #getName()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String NAME_EDEFAULT = null;
> 
>-	/**
>-	 * The default value of the '{@link #getName() Name}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String NAME_EDEFAULT = null;
>+ /**
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ * 
>+ * 
>+ * @see #getName()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String name = NAME_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getName() Name}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected String name = NAME_EDEFAULT;
>+ /**
>+ * The cached value of the '{@link #getType() Type}' containment reference.
>+ * 
>+ * 
>+ * @see #getType()
>+ * @generated
>+ * @ordered
>+ */
>+ protected TypeRule type;
> 
>-	/**
>-	 * The cached value of the '{@link #getType() Type}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getType()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected TypeRule type;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected CollaborationUseRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected CollaborationUseRuleImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlCollaborationUsePackage.Literals.COLLABORATION_USE_RULE;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlCollaborationUsePackage.Literals.COLLABORATION_USE_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public VisibilityKind getVisibility()
>+ {
>+ return visibility;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public VisibilityKind getVisibility() {
>-		return visibility;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setVisibility(VisibilityKind newVisibility)
>+ {
>+ VisibilityKind oldVisibility = visibility;
>+ visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY, oldVisibility, visibility));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setVisibility(VisibilityKind newVisibility) {
>-		VisibilityKind oldVisibility = visibility;
>-		visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY, oldVisibility, visibility));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getName() {
>-		return name;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setName(String newName)
>+ {
>+ String oldName = name;
>+ name = newName;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME, oldName, name));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setName(String newName) {
>-		String oldName = name;
>-		name = newName;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME, oldName, name));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TypeRule getType()
>+ {
>+ return type;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public TypeRule getType() {
>-		return type;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetType(TypeRule newType, NotificationChain msgs)
>+ {
>+ TypeRule oldType = type;
>+ type = newType;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, oldType, newType);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetType(TypeRule newType, NotificationChain msgs) {
>-		TypeRule oldType = type;
>-		type = newType;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, oldType, newType);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setType(TypeRule newType)
>+ {
>+ if (newType != type)
>+ {
>+ NotificationChain msgs = null;
>+ if (type != null)
>+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, null, msgs);
>+ if (newType != null)
>+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, null, msgs);
>+ msgs = basicSetType(newType, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, newType, newType));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setType(TypeRule newType) {
>-		if(newType != type) {
>-			NotificationChain msgs = null;
>-			if(type != null)
>-				msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, null, msgs);
>-			if(newType != null)
>-				msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, null, msgs);
>-			msgs = basicSetType(newType, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE, newType, newType));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>+ return basicSetType(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>-		switch(featureID) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>-			return basicSetType(null, msgs);
>-		}
>-		return super.eInverseRemove(otherEnd, featureID, msgs);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>+ return getVisibility();
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>+ return getName();
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>+ return getType();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>-			return getVisibility();
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>-			return getName();
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>-			return getType();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>+ setVisibility((VisibilityKind)newValue);
>+ return;
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>+ setName((String)newValue);
>+ return;
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>+ setType((TypeRule)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>-			setVisibility((VisibilityKind)newValue);
>-			return;
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>-			setName((String)newValue);
>-			return;
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>-			setType((TypeRule)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>+ setVisibility(VISIBILITY_EDEFAULT);
>+ return;
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>+ setName(NAME_EDEFAULT);
>+ return;
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>+ setType((TypeRule)null);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>-			setVisibility(VISIBILITY_EDEFAULT);
>-			return;
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>-			setName(NAME_EDEFAULT);
>-			return;
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>-			setType((TypeRule)null);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>+ return visibility != VISIBILITY_EDEFAULT;
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>+ return type != null;
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__VISIBILITY:
>-			return visibility != VISIBILITY_EDEFAULT;
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__NAME:
>-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE__TYPE:
>-			return type != null;
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy()) return super.toString();
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		if(eIsProxy())
>-			return super.toString();
>-
>-		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (visibility: ");
>-		result.append(visibility);
>-		result.append(", name: ");
>-		result.append(name);
>-		result.append(')');
>-		return result.toString();
>-	}
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (visibility: ");
>+ result.append(visibility);
>+ result.append(", name: ");
>+ result.append(name);
>+ result.append(')');
>+ return result.toString();
>+ }
> 
> } //CollaborationUseRuleImpl
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/UmlCollaborationUseFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/UmlCollaborationUseFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/UmlCollaborationUseFactoryImpl.java	(working copy)
>@@ -9,112 +9,114 @@
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EPackage;
>+
> import org.eclipse.emf.ecore.impl.EFactoryImpl;
>+
> import org.eclipse.emf.ecore.plugin.EcorePlugin;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUseFactory;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
>+
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.*;
> 
> /**
> * 
> * An implementation of the model Factory.
> * 
>- * 
> * @generated
> */
>-public class UmlCollaborationUseFactoryImpl extends EFactoryImpl implements UmlCollaborationUseFactory {
>+public class UmlCollaborationUseFactoryImpl extends EFactoryImpl implements UmlCollaborationUseFactory
>+{
>+ /**
>+ * Creates the default factory implementation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static UmlCollaborationUseFactory init()
>+ {
>+ try
>+ {
>+ UmlCollaborationUseFactory theUmlCollaborationUseFactory = (UmlCollaborationUseFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse"); 
>+ if (theUmlCollaborationUseFactory != null)
>+ {
>+ return theUmlCollaborationUseFactory;
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ EcorePlugin.INSTANCE.log(exception);
>+ }
>+ return new UmlCollaborationUseFactoryImpl();
>+ }
> 
>-	/**
>-	 * Creates the default factory implementation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static UmlCollaborationUseFactory init() {
>-		try {
>-			UmlCollaborationUseFactory theUmlCollaborationUseFactory = (UmlCollaborationUseFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse");
>-			if(theUmlCollaborationUseFactory != null) {
>-				return theUmlCollaborationUseFactory;
>-			}
>-		} catch (Exception exception) {
>-			EcorePlugin.INSTANCE.log(exception);
>-		}
>-		return new UmlCollaborationUseFactoryImpl();
>-	}
>+ /**
>+ * Creates an instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUseFactoryImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * Creates an instance of the factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseFactoryImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public EObject create(EClass eClass)
>+ {
>+ switch (eClass.getClassifierID())
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE: return createCollaborationUseRule();
>+ case UmlCollaborationUsePackage.TYPE_RULE: return createTypeRule();
>+ default:
>+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public EObject create(EClass eClass) {
>-		switch(eClass.getClassifierID()) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE:
>-			return createCollaborationUseRule();
>-		case UmlCollaborationUsePackage.TYPE_RULE:
>-			return createTypeRule();
>-		default:
>-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public CollaborationUseRule createCollaborationUseRule()
>+ {
>+ CollaborationUseRuleImpl collaborationUseRule = new CollaborationUseRuleImpl();
>+ return collaborationUseRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public CollaborationUseRule createCollaborationUseRule() {
>-		CollaborationUseRuleImpl collaborationUseRule = new CollaborationUseRuleImpl();
>-		return collaborationUseRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TypeRule createTypeRule()
>+ {
>+ TypeRuleImpl typeRule = new TypeRuleImpl();
>+ return typeRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public TypeRule createTypeRule() {
>-		TypeRuleImpl typeRule = new TypeRuleImpl();
>-		return typeRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUsePackage getUmlCollaborationUsePackage()
>+ {
>+ return (UmlCollaborationUsePackage)getEPackage();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUsePackage getUmlCollaborationUsePackage() {
>-		return (UmlCollaborationUsePackage)getEPackage();
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @deprecated
>-	 * @generated
>-	 */
>-	@Deprecated
>-	public static UmlCollaborationUsePackage getPackage() {
>-		return UmlCollaborationUsePackage.eINSTANCE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @deprecated
>+ * @generated
>+ */
>+ @Deprecated
>+ public static UmlCollaborationUsePackage getPackage()
>+ {
>+ return UmlCollaborationUsePackage.eINSTANCE;
>+ }
> 
> } //UmlCollaborationUseFactoryImpl
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/UmlCollaborationUsePackageImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/UmlCollaborationUsePackageImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/impl/UmlCollaborationUsePackageImpl.java	(working copy)
>@@ -10,238 +10,236 @@
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EReference;
>+
> import org.eclipse.emf.ecore.impl.EPackageImpl;
>+
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUseFactory;
> import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
> 
> /**
> * 
> * An implementation of the model Package.
> * 
>- * 
> * @generated
> */
>-public class UmlCollaborationUsePackageImpl extends EPackageImpl implements UmlCollaborationUsePackage {
>+public class UmlCollaborationUsePackageImpl extends EPackageImpl implements UmlCollaborationUsePackage
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass collaborationUseRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass collaborationUseRuleEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass typeRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass typeRuleEClass = null;
>+ /**
>+ * Creates an instance of the model Package, registered with
>+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+ * package URI value.
>+ * 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.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.ecore.EPackage.Registry
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#eNS_URI
>+ * @see #init()
>+ * @generated
>+ */
>+ private UmlCollaborationUsePackageImpl()
>+ {
>+ super(eNS_URI, UmlCollaborationUseFactory.eINSTANCE);
>+ }
> 
>-	/**
>-	 * Creates an instance of the model Package, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
>-	 * package
>-	 * package URI value.
>-	 * 
>-	 * 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.  
>-	 * 
>-	 * @see org.eclipse.emf.ecore.EPackage.Registry
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#eNS_URI
>-	 * @see #init()
>-	 * @generated
>-	 */
>-	private UmlCollaborationUsePackageImpl() {
>-		super(eNS_URI, UmlCollaborationUseFactory.eINSTANCE);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static boolean isInited = false;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static boolean isInited = false;
>+ /**
>+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+ * 
>+ * This method is used to initialize {@link UmlCollaborationUsePackage#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
>+ * @see #eNS_URI
>+ * @see #createPackageContents()
>+ * @see #initializePackageContents()
>+ * @generated
>+ */
>+ public static UmlCollaborationUsePackage init()
>+ {
>+ if (isInited) return (UmlCollaborationUsePackage)EPackage.Registry.INSTANCE.getEPackage(UmlCollaborationUsePackage.eNS_URI);
> 
>-	/**
>-	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>-	 * 
>-	 * 
>-	 * This method is used to initialize {@link UmlCollaborationUsePackage#eINSTANCE} when that field is accessed. Clients should not invoke it
>-	 * directly. Instead, they should simply access that field to obtain the package.  
>-	 * 
>-	 * @see #eNS_URI
>-	 * @see #createPackageContents()
>-	 * @see #initializePackageContents()
>-	 * @generated
>-	 */
>-	public static UmlCollaborationUsePackage init() {
>-		if(isInited)
>-			return (UmlCollaborationUsePackage)EPackage.Registry.INSTANCE.getEPackage(UmlCollaborationUsePackage.eNS_URI);
>+ // Obtain or create and register package
>+ UmlCollaborationUsePackageImpl theUmlCollaborationUsePackage = (UmlCollaborationUsePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlCollaborationUsePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlCollaborationUsePackageImpl());
> 
>-		// Obtain or create and register package
>-		UmlCollaborationUsePackageImpl theUmlCollaborationUsePackage = (UmlCollaborationUsePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlCollaborationUsePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlCollaborationUsePackageImpl());
>+ isInited = true;
> 
>-		isInited = true;
>+ // Initialize simple dependencies
>+ UmlCommonPackage.eINSTANCE.eClass();
> 
>-		// Initialize simple dependencies
>-		UmlCommonPackage.eINSTANCE.eClass();
>+ // Create package meta-data objects
>+ theUmlCollaborationUsePackage.createPackageContents();
> 
>-		// Create package meta-data objects
>-		theUmlCollaborationUsePackage.createPackageContents();
>+ // Initialize created meta-data
>+ theUmlCollaborationUsePackage.initializePackageContents();
> 
>-		// Initialize created meta-data
>-		theUmlCollaborationUsePackage.initializePackageContents();
>+ // Mark meta-data to indicate it can't be changed
>+ theUmlCollaborationUsePackage.freeze();
> 
>-		// Mark meta-data to indicate it can't be changed
>-		theUmlCollaborationUsePackage.freeze();
>+ 
>+ // Update the registry and return the package
>+ EPackage.Registry.INSTANCE.put(UmlCollaborationUsePackage.eNS_URI, theUmlCollaborationUsePackage);
>+ return theUmlCollaborationUsePackage;
>+ }
> 
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getCollaborationUseRule()
>+ {
>+ return collaborationUseRuleEClass;
>+ }
> 
>-		// Update the registry and return the package
>-		EPackage.Registry.INSTANCE.put(UmlCollaborationUsePackage.eNS_URI, theUmlCollaborationUsePackage);
>-		return theUmlCollaborationUsePackage;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getCollaborationUseRule_Visibility()
>+ {
>+ return (EAttribute)collaborationUseRuleEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getCollaborationUseRule() {
>-		return collaborationUseRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getCollaborationUseRule_Name()
>+ {
>+ return (EAttribute)collaborationUseRuleEClass.getEStructuralFeatures().get(1);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getCollaborationUseRule_Visibility() {
>-		return (EAttribute)collaborationUseRuleEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getCollaborationUseRule_Type()
>+ {
>+ return (EReference)collaborationUseRuleEClass.getEStructuralFeatures().get(2);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getCollaborationUseRule_Name() {
>-		return (EAttribute)collaborationUseRuleEClass.getEStructuralFeatures().get(1);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getTypeRule()
>+ {
>+ return typeRuleEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getCollaborationUseRule_Type() {
>-		return (EReference)collaborationUseRuleEClass.getEStructuralFeatures().get(2);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUseFactory getUmlCollaborationUseFactory()
>+ {
>+ return (UmlCollaborationUseFactory)getEFactoryInstance();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getTypeRule() {
>-		return typeRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private boolean isCreated = false;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseFactory getUmlCollaborationUseFactory() {
>-		return (UmlCollaborationUseFactory)getEFactoryInstance();
>-	}
>+ /**
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void createPackageContents()
>+ {
>+ if (isCreated) return;
>+ isCreated = true;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private boolean isCreated = false;
>+ // Create classes and their features
>+ collaborationUseRuleEClass = createEClass(COLLABORATION_USE_RULE);
>+ createEAttribute(collaborationUseRuleEClass, COLLABORATION_USE_RULE__VISIBILITY);
>+ createEAttribute(collaborationUseRuleEClass, COLLABORATION_USE_RULE__NAME);
>+ createEReference(collaborationUseRuleEClass, COLLABORATION_USE_RULE__TYPE);
> 
>-	/**
>-	 * Creates the meta-model objects for the package. This method is
>-	 * guarded to have no affect on any invocation but its first.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void createPackageContents() {
>-		if(isCreated)
>-			return;
>-		isCreated = true;
>+ typeRuleEClass = createEClass(TYPE_RULE);
>+ }
> 
>-		// Create classes and their features
>-		collaborationUseRuleEClass = createEClass(COLLABORATION_USE_RULE);
>-		createEAttribute(collaborationUseRuleEClass, COLLABORATION_USE_RULE__VISIBILITY);
>-		createEAttribute(collaborationUseRuleEClass, COLLABORATION_USE_RULE__NAME);
>-		createEReference(collaborationUseRuleEClass, COLLABORATION_USE_RULE__TYPE);
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private boolean isInitialized = false;
> 
>-		typeRuleEClass = createEClass(TYPE_RULE);
>-	}
>+ /**
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void initializePackageContents()
>+ {
>+ if (isInitialized) return;
>+ isInitialized = true;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private boolean isInitialized = false;
>+ // Initialize package
>+ setName(eNAME);
>+ setNsPrefix(eNS_PREFIX);
>+ setNsURI(eNS_URI);
> 
>-	/**
>-	 * Complete the initialization of the package and its meta-model. This
>-	 * method is guarded to have no affect on any invocation but its first.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void initializePackageContents() {
>-		if(isInitialized)
>-			return;
>-		isInitialized = true;
>+ // Obtain other dependent packages
>+ UmlCommonPackage theUmlCommonPackage = (UmlCommonPackage)EPackage.Registry.INSTANCE.getEPackage(UmlCommonPackage.eNS_URI);
> 
>-		// Initialize package
>-		setName(eNAME);
>-		setNsPrefix(eNS_PREFIX);
>-		setNsURI(eNS_URI);
>+ // Create type parameters
> 
>-		// Obtain other dependent packages
>-		UmlCommonPackage theUmlCommonPackage = (UmlCommonPackage)EPackage.Registry.INSTANCE.getEPackage(UmlCommonPackage.eNS_URI);
>+ // Set bounds for type parameters
> 
>-		// Create type parameters
>+ // Add supertypes to classes
>+ typeRuleEClass.getESuperTypes().add(theUmlCommonPackage.getTypeRule());
> 
>-		// Set bounds for type parameters
>+ // Initialize classes and features; add operations and parameters
>+ initEClass(collaborationUseRuleEClass, CollaborationUseRule.class, "CollaborationUseRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getCollaborationUseRule_Visibility(), theUmlCommonPackage.getVisibilityKind(), "visibility", null, 0, 1, CollaborationUseRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getCollaborationUseRule_Name(), ecorePackage.getEString(), "name", null, 0, 1, CollaborationUseRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getCollaborationUseRule_Type(), this.getTypeRule(), null, "type", null, 0, 1, CollaborationUseRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		// Add supertypes to classes
>-		typeRuleEClass.getESuperTypes().add(theUmlCommonPackage.getTypeRule());
>+ initEClass(typeRuleEClass, TypeRule.class, "TypeRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
> 
>-		// Initialize classes and features; add operations and parameters
>-		initEClass(collaborationUseRuleEClass, CollaborationUseRule.class, "CollaborationUseRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEAttribute(getCollaborationUseRule_Visibility(), theUmlCommonPackage.getVisibilityKind(), "visibility", null, 0, 1, CollaborationUseRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEAttribute(getCollaborationUseRule_Name(), ecorePackage.getEString(), "name", null, 0, 1, CollaborationUseRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEReference(getCollaborationUseRule_Type(), this.getTypeRule(), null, "type", null, 0, 1, CollaborationUseRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-
>-		initEClass(typeRuleEClass, TypeRule.class, "TypeRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-
>-		// Create resource
>-		createResource(eNS_URI);
>-	}
>+ // Create resource
>+ createResource(eNS_URI);
>+ }
> 
> } //UmlCollaborationUsePackageImpl
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseResourceImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseResourceImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseResourceImpl.java	(working copy)
>@@ -7,29 +7,28 @@
> package org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.util;
> 
> import org.eclipse.emf.common.util.URI;
>+
> import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
> 
> /**
> * 
> * The Resource associated with the package.
> * 
>- * 
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.util.UmlCollaborationUseResourceFactoryImpl
> * @generated
> */
>-public class UmlCollaborationUseResourceImpl extends XMLResourceImpl {
>-
>-	/**
>-	 * Creates an instance of the resource.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param uri
>-	 * the URI of the new resource.
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseResourceImpl(URI uri) {
>-		super(uri);
>-	}
>+public class UmlCollaborationUseResourceImpl extends XMLResourceImpl
>+{
>+ /**
>+ * Creates an instance of the resource.
>+ * 
>+ * 
>+ * @param uri the URI of the new resource.
>+ * @generated
>+ */
>+ public UmlCollaborationUseResourceImpl(URI uri)
>+ {
>+ super(uri);
>+ }
> 
> } //UmlCollaborationUseResourceImpl
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseXMLProcessor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseXMLProcessor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseXMLProcessor.java	(working copy)
>@@ -9,46 +9,50 @@
> 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.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
> 
> /**
> * This class contains helper methods to serialize and deserialize XML documents
> * 
> * 
>- * 
> * @generated
> */
>-public class UmlCollaborationUseXMLProcessor extends XMLProcessor {
>+public class UmlCollaborationUseXMLProcessor extends XMLProcessor
>+{
> 
>-	/**
>-	 * Public constructor to instantiate the helper.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseXMLProcessor() {
>-		super((EPackage.Registry.INSTANCE));
>-		UmlCollaborationUsePackage.eINSTANCE.eClass();
>-	}
>-
>-	/**
>-	 * Register for "*" and "xml" file extensions the UmlCollaborationUseResourceFactoryImpl factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected Map<String, Resource.Factory> getRegistrations() {
>-		if(registrations == null) {
>-			super.getRegistrations();
>-			registrations.put(XML_EXTENSION, new UmlCollaborationUseResourceFactoryImpl());
>-			registrations.put(STAR_EXTENSION, new UmlCollaborationUseResourceFactoryImpl());
>-		}
>-		return registrations;
>-	}
>+ /**
>+ * Public constructor to instantiate the helper.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUseXMLProcessor()
>+ {
>+ super((EPackage.Registry.INSTANCE));
>+ UmlCollaborationUsePackage.eINSTANCE.eClass();
>+ }
>+ 
>+ /**
>+ * Register for "*" and "xml" file extensions the UmlCollaborationUseResourceFactoryImpl factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected Map<String, Resource.Factory> getRegistrations()
>+ {
>+ if (registrations == null)
>+ {
>+ super.getRegistrations();
>+ registrations.put(XML_EXTENSION, new UmlCollaborationUseResourceFactoryImpl());
>+ registrations.put(STAR_EXTENSION, new UmlCollaborationUseResourceFactoryImpl());
>+ }
>+ return registrations;
>+ }
> 
> } //UmlCollaborationUseXMLProcessor
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseResourceFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseResourceFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseResourceFactoryImpl.java	(working copy)
>@@ -7,51 +7,53 @@
> package org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.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;
> 
> /**
> * 
> * The Resource Factory associated with the package.
> * 
>- * 
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.util.UmlCollaborationUseResourceImpl
> * @generated
> */
>-public class UmlCollaborationUseResourceFactoryImpl extends ResourceFactoryImpl {
>+public class UmlCollaborationUseResourceFactoryImpl extends ResourceFactoryImpl
>+{
>+ /**
>+ * Creates an instance of the resource factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUseResourceFactoryImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * Creates an instance of the resource factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseResourceFactoryImpl() {
>-		super();
>-	}
>+ /**
>+ * Creates an instance of the resource.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Resource createResource(URI uri)
>+ {
>+ XMLResource result = new UmlCollaborationUseResourceImpl(uri);
>+ result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
>+ result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
> 
>-	/**
>-	 * Creates an instance of the resource.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Resource createResource(URI uri) {
>-		XMLResource result = new UmlCollaborationUseResourceImpl(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.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_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;
>-	}
>+ result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
>+ return result;
>+ }
> 
> } //UmlCollaborationUseResourceFactoryImpl
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseSwitch.java	(working copy)
>@@ -6,179 +6,158 @@
> */
> package org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.util;
> 
>-import java.util.List;
>-
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
>+
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.*;
> 
> /**
> * 
> * The Switch 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.
> * 
>- * 
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage
> * @generated
> */
>-public class UmlCollaborationUseSwitch<T> {
>+public class UmlCollaborationUseSwitch<T> extends Switch<T>
>+{
>+ /**
>+ * The cached model package
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static UmlCollaborationUsePackage modelPackage;
> 
>-	/**
>-	 * The cached model package
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected static UmlCollaborationUsePackage modelPackage;
>+ /**
>+ * Creates an instance of the switch.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUseSwitch()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = UmlCollaborationUsePackage.eINSTANCE;
>+ }
>+ }
> 
>-	/**
>-	 * Creates an instance of the switch.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseSwitch() {
>-		if(modelPackage == null) {
>-			modelPackage = UmlCollaborationUsePackage.eINSTANCE;
>-		}
>-	}
>+ /**
>+ * Checks whether this is a switch for the given package.
>+ * 
>+ * 
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
>+ * @generated
>+ */
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
>+ {
>+ return ePackage == modelPackage;
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	public T doSwitch(EObject theEObject) {
>-		return doSwitch(theEObject.eClass(), theEObject);
>-	}
>+ /**
>+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * 
>+ * 
>+ * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @generated
>+ */
>+ @Override
>+ protected T doSwitch(int classifierID, EObject theEObject)
>+ {
>+ switch (classifierID)
>+ {
>+ case UmlCollaborationUsePackage.COLLABORATION_USE_RULE:
>+ {
>+ CollaborationUseRule collaborationUseRule = (CollaborationUseRule)theEObject;
>+ T result = caseCollaborationUseRule(collaborationUseRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlCollaborationUsePackage.TYPE_RULE:
>+ {
>+ TypeRule typeRule = (TypeRule)theEObject;
>+ T result = caseTypeRule(typeRule);
>+ if (result == null) result = caseUmlCommon_TypeRule(typeRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ default: return defaultCase(theEObject);
>+ }
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	protected T doSwitch(EClass theEClass, EObject theEObject) {
>-		if(theEClass.eContainer() == modelPackage) {
>-			return doSwitch(theEClass.getClassifierID(), theEObject);
>-		} else {
>-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
>-			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
>-		}
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Collaboration Use Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Collaboration Use Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseCollaborationUseRule(CollaborationUseRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	protected T doSwitch(int classifierID, EObject theEObject) {
>-		switch(classifierID) {
>-		case UmlCollaborationUsePackage.COLLABORATION_USE_RULE:
>-		{
>-			CollaborationUseRule collaborationUseRule = (CollaborationUseRule)theEObject;
>-			T result = caseCollaborationUseRule(collaborationUseRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlCollaborationUsePackage.TYPE_RULE:
>-		{
>-			TypeRule typeRule = (TypeRule)theEObject;
>-			T result = caseTypeRule(typeRule);
>-			if(result == null)
>-				result = caseUmlCommon_TypeRule(typeRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		default:
>-			return defaultCase(theEObject);
>-		}
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Type Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Type Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseTypeRule(TypeRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Collaboration Use Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Collaboration Use Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseCollaborationUseRule(CollaborationUseRule object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Type Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Type Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseUmlCommon_TypeRule(org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseTypeRule(TypeRule object) {
>-		return null;
>-	}
>-
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseUmlCommon_TypeRule(org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule object) {
>-		return null;
>-	}
>-
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'EObject'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'EObject'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>-	 * @generated
>-	 */
>-	public T defaultCase(EObject object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch, but this is the last case anyway.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'EObject'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>+ * @generated
>+ */
>+ @Override
>+ public T defaultCase(EObject object)
>+ {
>+ return null;
>+ }
> 
> } //UmlCollaborationUseSwitch
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseAdapterFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseAdapterFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/util/UmlCollaborationUseAdapterFactory.java	(working copy)
>@@ -8,169 +8,169 @@
> 
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notifier;
>+
> import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
>+
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule;
>-import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage;
>+
>+import org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.*;
> 
> /**
> * 
> * The Adapter Factory for the model.
> * It provides an adapter <code>createXXX</code> method for each class of the model.
> * 
>- * 
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage
> * @generated
> */
>-public class UmlCollaborationUseAdapterFactory extends AdapterFactoryImpl {
>-
>-	/**
>-	 * The cached model package.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected static UmlCollaborationUsePackage modelPackage;
>-
>-	/**
>-	 * Creates an instance of the adapter factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCollaborationUseAdapterFactory() {
>-		if(modelPackage == null) {
>-			modelPackage = UmlCollaborationUsePackage.eINSTANCE;
>-		}
>-	}
>-
>-	/**
>-	 * Returns whether this factory is applicable for the type of the object.
>-	 * 
>-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>-	 * 
>-	 * 
>-	 * @return whether this factory is applicable for the type of the object.
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean isFactoryForType(Object object) {
>-		if(object == modelPackage) {
>-			return true;
>-		}
>-		if(object instanceof EObject) {
>-			return ((EObject)object).eClass().getEPackage() == modelPackage;
>-		}
>-		return false;
>-	}
>-
>-	/**
>-	 * The switch that delegates to the <code>createXXX</code> methods.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected UmlCollaborationUseSwitch<Adapter> modelSwitch = new UmlCollaborationUseSwitch<Adapter>() {
>+public class UmlCollaborationUseAdapterFactory extends AdapterFactoryImpl
>+{
>+ /**
>+ * The cached model package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static UmlCollaborationUsePackage modelPackage;
> 
>-		@Override
>-		public Adapter caseCollaborationUseRule(CollaborationUseRule object) {
>-			return createCollaborationUseRuleAdapter();
>-		}
>+ /**
>+ * Creates an instance of the adapter factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCollaborationUseAdapterFactory()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = UmlCollaborationUsePackage.eINSTANCE;
>+ }
>+ }
> 
>-		@Override
>-		public Adapter caseTypeRule(TypeRule object) {
>-			return createTypeRuleAdapter();
>-		}
>+ /**
>+ * Returns whether this factory is applicable for the type of the object.
>+ * 
>+ * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>+ * 
>+ * @return whether this factory is applicable for the type of the object.
>+ * @generated
>+ */
>+ @Override
>+ public boolean isFactoryForType(Object object)
>+ {
>+ if (object == modelPackage)
>+ {
>+ return true;
>+ }
>+ if (object instanceof EObject)
>+ {
>+ return ((EObject)object).eClass().getEPackage() == modelPackage;
>+ }
>+ return false;
>+ }
> 
>-		@Override
>-		public Adapter caseUmlCommon_TypeRule(org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule object) {
>-			return createUmlCommon_TypeRuleAdapter();
>-		}
>+ /**
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected UmlCollaborationUseSwitch<Adapter> modelSwitch =
>+ new UmlCollaborationUseSwitch<Adapter>()
>+ {
>+ @Override
>+ public Adapter caseCollaborationUseRule(CollaborationUseRule object)
>+ {
>+ return createCollaborationUseRuleAdapter();
>+ }
>+ @Override
>+ public Adapter caseTypeRule(TypeRule object)
>+ {
>+ return createTypeRuleAdapter();
>+ }
>+ @Override
>+ public Adapter caseUmlCommon_TypeRule(org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule object)
>+ {
>+ return createUmlCommon_TypeRuleAdapter();
>+ }
>+ @Override
>+ public Adapter defaultCase(EObject object)
>+ {
>+ return createEObjectAdapter();
>+ }
>+ };
> 
>-		@Override
>-		public Adapter defaultCase(EObject object) {
>-			return createEObjectAdapter();
>-		}
>-	};
>+ /**
>+ * Creates an adapter for the <code>target</code>.
>+ * 
>+ * 
>+ * @param target the object to adapt.
>+ * @return the adapter for the <code>target</code>.
>+ * @generated
>+ */
>+ @Override
>+ public Adapter createAdapter(Notifier target)
>+ {
>+ return modelSwitch.doSwitch((EObject)target);
>+ }
> 
>-	/**
>-	 * Creates an adapter for the <code>target</code>.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param target
>-	 * the object to adapt.
>-	 * @return the adapter for the <code>target</code>.
>-	 * @generated
>-	 */
>-	@Override
>-	public Adapter createAdapter(Notifier target) {
>-		return modelSwitch.doSwitch((EObject)target);
>-	}
> 
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule Collaboration Use Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule
>+ * @generated
>+ */
>+ public Adapter createCollaborationUseRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates a new adapter for an object of class '
>-	 * {@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule Collaboration Use Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule
>-	 * @generated
>-	 */
>-	public Adapter createCollaborationUseRuleAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule Type Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule
>+ * @generated
>+ */
>+ public Adapter createTypeRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule
>-	 * Type Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.TypeRule
>-	 * @generated
>-	 */
>-	public Adapter createTypeRuleAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule Type Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>+ * @generated
>+ */
>+ public Adapter createUmlCommon_TypeRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule Type Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>-	 * @generated
>-	 */
>-	public Adapter createUmlCommon_TypeRuleAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for the default case.
>-	 * 
>-	 * This default implementation returns null.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @generated
>-	 */
>-	public Adapter createEObjectAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for the default case.
>+ * 
>+ * This default implementation returns null.
>+ * 
>+ * @return the new adapter.
>+ * @generated
>+ */
>+ public Adapter createEObjectAdapter()
>+ {
>+ return null;
>+ }
> 
> } //UmlCollaborationUseAdapterFactory
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/CollaborationUseRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/CollaborationUseRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/CollaborationUseRule.java	(working copy)
>@@ -7,116 +7,108 @@
> package org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse;
> 
> import org.eclipse.emf.ecore.EObject;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind;
> 
> /**
> * 
> * A representation of the model object 'Collaboration Use Rule'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility Visibility}</li>
>- * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName Name}</li>
>- * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType Type}</li>
>+ * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility Visibility}</li>
>+ * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName Name}</li>
>+ * <li>{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType Type}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule()
> * @model
> * @generated
> */
>-public interface CollaborationUseRule extends EObject {
>+public interface CollaborationUseRule extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Visibility' attribute.
>+ * The literals are from the enumeration {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind}.
>+ * 
>+ * 
>+ * If the meaning of the 'Visibility' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Visibility' attribute.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @see #setVisibility(VisibilityKind)
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule_Visibility()
>+ * @model
>+ * @generated
>+ */
>+ VisibilityKind getVisibility();
> 
>-	/**
>-	 * Returns the value of the 'Visibility' attribute.
>-	 * The literals are from the enumeration {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Visibility' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Visibility' attribute.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-	 * @see #setVisibility(VisibilityKind)
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule_Visibility()
>-	 * @model
>-	 * @generated
>-	 */
>-	VisibilityKind getVisibility();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility Visibility}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Visibility' attribute.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @see #getVisibility()
>+ * @generated
>+ */
>+ void setVisibility(VisibilityKind value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getVisibility
>-	 * Visibility}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Visibility' attribute.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-	 * @see #getVisibility()
>-	 * @generated
>-	 */
>-	void setVisibility(VisibilityKind value);
>+ /**
>+ * Returns the value of the 'Name' attribute.
>+ * 
>+ * 
>+ * If the meaning of the 'Name' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Name' attribute.
>+ * @see #setName(String)
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule_Name()
>+ * @model
>+ * @generated
>+ */
>+ String getName();
> 
>-	/**
>-	 * Returns the value of the 'Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Name' attribute.
>-	 * @see #setName(String)
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule_Name()
>-	 * @model
>-	 * @generated
>-	 */
>-	String getName();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName Name}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Name' attribute.
>+ * @see #getName()
>+ * @generated
>+ */
>+ void setName(String value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getName Name}
>-	 * ' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Name' attribute.
>-	 * @see #getName()
>-	 * @generated
>-	 */
>-	void setName(String value);
>+ /**
>+ * Returns the value of the 'Type' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Type' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Type' containment reference.
>+ * @see #setType(TypeRule)
>+ * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule_Type()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ TypeRule getType();
> 
>-	/**
>-	 * Returns the value of the 'Type' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Type' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Type' containment reference.
>-	 * @see #setType(TypeRule)
>-	 * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getCollaborationUseRule_Type()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	TypeRule getType();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType Type}
>-	 * ' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Type' containment reference.
>-	 * @see #getType()
>-	 * @generated
>-	 */
>-	void setType(TypeRule value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.CollaborationUseRule#getType Type}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Type' containment reference.
>+ * @see #getType()
>+ * @generated
>+ */
>+ void setType(TypeRule value);
> 
> } // CollaborationUseRule
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/TypeRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/TypeRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/umlCollaborationUse/TypeRule.java	(working copy)
>@@ -11,11 +11,12 @@
> * 
> * A representation of the model object 'Type Rule'.
> * 
>- * 
>- * 
>+ *
>+ *
> * @see org.eclipse.papyrus.collaborationuse.editor.xtext.umlCollaborationUse.UmlCollaborationUsePackage#getTypeRule()
> * @model
> * @generated
> */
>-public interface TypeRule extends org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule {
>+public interface TypeRule extends org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>+{
> } // TypeRule
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore	(working copy)
>@@ -5,10 +5,10 @@
> nsURI="http://www.eclipse.org/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse"
> nsPrefix="umlCollaborationUse">
> <eClassifiers xsi:type="ecore:EClass" name="CollaborationUseRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="ecore:EEnum ../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//TypeRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#//TypeRule"
> containment="true"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeRule" eSuperTypes="../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeRule" eSuperTypes="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule"/>
> </ecore:EPackage>
>Index: src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.genmodel	(working copy)
>@@ -6,14 +6,14 @@
> modelPluginID="org.eclipse.papyrus.collaborationuse.editor.xtext" forceOverwrite="true"
> modelName="UmlCollaborationUse" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.collaborationuse.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.collaborationuse.editor.xtext.editor" usedGenPackages="../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UMLCommon.genmodel#//umlCommon">
>+ editorPluginID="org.eclipse.papyrus.collaborationuse.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UMLCommon.genmodel#//umlCommon">
> <genPackages prefix="UmlCollaborationUse" basePackage="org.eclipse.papyrus.collaborationuse.editor.xtext"
>- resource="XML" disposableProviderFactory="true" ecorePackage="UmlCollaborationUse.ecore#/">
>- <genClasses ecoreClass="UmlCollaborationUse.ecore#//CollaborationUseRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlCollaborationUse.ecore#//CollaborationUseRule/visibility"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlCollaborationUse.ecore#//CollaborationUseRule/name"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlCollaborationUse.ecore#//CollaborationUseRule/type"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#/">
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#//CollaborationUseRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#//CollaborationUseRule/visibility"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#//CollaborationUseRule/name"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#//CollaborationUseRule/type"/>
> </genClasses>
>- <genClasses ecoreClass="UmlCollaborationUse.ecore#//TypeRule"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.collaborationuse.editor.xtext/src-gen/org/eclipse/papyrus/collaborationuse/editor/xtext/UmlCollaborationUse.ecore#//TypeRule"/>
> </genPackages>
> </genmodel:GenModel>
>#P org.eclipse.papyrus.common.editor.xtext
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/UmlCommonAntlrTokenFileProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/UmlCommonAntlrTokenFileProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/UmlCommonAntlrTokenFileProvider.java	(working copy)
>@@ -1,16 +1,15 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.common.editor.xtext.parser.antlr;
> 
> import java.io.InputStream;
>-
> import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
> 
> public class UmlCommonAntlrTokenFileProvider implements IAntlrTokenFileProvider {
>-
>+	
> 	public InputStream getAntlrTokenFile() {
> 		ClassLoader classLoader = getClass().getClassLoader();
>-		return classLoader.getResourceAsStream("org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens");
>+ 	return classLoader.getResourceAsStream("org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens");
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/UmlCommonParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/UmlCommonParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/UmlCommonParser.java	(working copy)
>@@ -1,55 +1,39 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.common.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>-public class UmlCommonParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>+import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> 
>+public class UmlCommonParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>+	
> 	@Inject
> 	private UmlCommonGrammarAccess grammarAccess;
>-
>+	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal.InternalUmlCommonParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(), re);
>-		}
> 	}
>-
>+	
>+	@Override
> 	protected org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal.InternalUmlCommonParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal.InternalUmlCommonParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal.InternalUmlCommonParser(stream, getGrammarAccess());
> 	}
>-
>-	@Override
>+	
>+	@Override 
> 	protected String getDefaultRuleName() {
> 		return "QualifiedName";
> 	}
>-
>+	
> 	public UmlCommonGrammarAccess getGrammarAccess() {
> 		return this.grammarAccess;
> 	}
>-
>+	
> 	public void setGrammarAccess(UmlCommonGrammarAccess grammarAccess) {
> 		this.grammarAccess = grammarAccess;
> 	}
>-
>+	
> }
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g	(working copy)
>@@ -19,11 +19,9 @@
> @parser::header {
> package org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -31,7 +29,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> 
> }
>@@ -40,17 +37,10 @@
> 
> 	private UmlCommonGrammarAccess grammarAccess;
> 	
>- public InternalUmlCommonParser(TokenStream input, IAstFactory factory, UmlCommonGrammarAccess grammarAccess) {
>+ public InternalUmlCommonParser(TokenStream input, UmlCommonGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -77,7 +67,7 @@
> // Entry rule entryRuleQualifiedName
> entryRuleQualifiedName returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getQualifiedNameRule()); }
> 	 iv_ruleQualifiedName=ruleQualifiedName 
> 	 { $current=$iv_ruleQualifiedName.current; } 
> 	 EOF 
>@@ -85,50 +75,41 @@
> 
> // Rule QualifiedName
> ruleQualifiedName returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_0=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	}
> 
> )
>-)	'::' 
>+)	otherlv_1='::' 
> {
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 }
> 		lv_remaining_2_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"remaining",
>-	 		lv_remaining_2_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -146,7 +127,7 @@
> // Entry rule entryRuleBoundSpecification
> entryRuleBoundSpecification returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getBoundSpecificationRule()); }
> 	 iv_ruleBoundSpecification=ruleBoundSpecification 
> 	 { $current=$iv_ruleBoundSpecification.current; } 
> 	 EOF 
>@@ -154,32 +135,24 @@
> 
> // Rule BoundSpecification
> ruleBoundSpecification returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		lv_value_0_0=RULE_UNLIMITEDLITERAL
> 		{
>-			createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value"); 
>+			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getBoundSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"value",
>-	 		lv_value_0_0, 
>-	 		"UnlimitedLiteral", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
> 	 }
> 
> )
>@@ -200,7 +173,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens	(working copy)
>@@ -1,6 +1,7 @@
> RULE_ID=4
> RULE_STRING=7
> RULE_UNLIMITEDLITERAL=5
>+T__12=12
> RULE_ANY_OTHER=11
> RULE_INT=6
> RULE_WS=10
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommonParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommonParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommonParser.java	(working copy)
>@@ -1,352 +1,323 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal;
>-
>-import java.io.InputStream;
>+package org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal; 
> 
>-import org.antlr.runtime.BitSet;
>-import org.antlr.runtime.RecognitionException;
>-import org.antlr.runtime.Token;
>-import org.antlr.runtime.TokenStream;
>+import org.eclipse.xtext.*;
>+import org.eclipse.xtext.parser.*;
>+import org.eclipse.xtext.parser.impl.*;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
>-import org.eclipse.xtext.conversion.ValueConverterException;
>-import org.eclipse.xtext.parser.IAstFactory;
>+import org.eclipse.emf.common.util.Enumerator;
> import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
>-
>-@SuppressWarnings("all")
>-public class InternalUmlCommonParser extends AbstractInternalAntlrParser {
>-
>-	public static final String[] tokenNames = new String[]{ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'::'" };
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlCommonParser(TokenStream input) {
>-		super(input);
>-	}
>-
>-
>-	public String[] getTokenNames() {
>-		return tokenNames;
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g";
>-	}
>-
>-
>-
>-	private UmlCommonGrammarAccess grammarAccess;
>-
>-	public InternalUmlCommonParser(TokenStream input, IAstFactory factory, UmlCommonGrammarAccess grammarAccess) {
>-		this(input);
>-		this.factory = factory;
>-		registerRules(grammarAccess.getGrammar());
>-		this.grammarAccess = grammarAccess;
>-	}
>-
>-	@Override
>-	protected InputStream getTokenFile() {
>-		ClassLoader classLoader = getClass().getClassLoader();
>-		return classLoader.getResourceAsStream("org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.tokens");
>-	}
>-
>-	@Override
>-	protected String getFirstRuleName() {
>-		return "QualifiedName";
>-	}
>-
>-	@Override
>-	protected UmlCommonGrammarAccess getGrammarAccess() {
>-		return grammarAccess;
>-	}
>-
>-
>-
>-	// $ANTLR start entryRuleQualifiedName
>-	// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:78:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>-	public final EObject entryRuleQualifiedName() throws RecognitionException {
>-		EObject current = null;
>-
>-		EObject iv_ruleQualifiedName = null;
>-
>-
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:79:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:80:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode);
>-				pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName75);
>-				iv_ruleQualifiedName = ruleQualifiedName();
>-				_fsp--;
>-
>-				current = iv_ruleQualifiedName;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName85);
>-
>-			}
>-
>-		}
>-
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>-
>-	// $ANTLR end entryRuleQualifiedName
>-
>-
>-	// $ANTLR start ruleQualifiedName
>-	// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:87:1: ruleQualifiedName returns [EObject current=null] : ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ;
>-	public final EObject ruleQualifiedName() throws RecognitionException {
>-		EObject current = null;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
>+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>+import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> 
>-		EObject lv_remaining_2_0 = null;
> 
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:92:6: ( ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:93:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:93:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:93:2: ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>-				{
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:93:2: ( ( RULE_ID ) )
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:94:1: ( RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:94:1: ( RULE_ID )
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:95:3: RULE_ID
>-						{
>+@SuppressWarnings("all")
>+public class InternalUmlCommonParser extends AbstractInternalAntlrParser {
>+ public static final String[] tokenNames = new String[] {
>+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'::'"
>+ };
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__12=12;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>+ // delegates
>+ // delegators
> 
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleQualifiedName128);
> 
>-							createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path");
>+ public InternalUmlCommonParser(TokenStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCommonParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
>+ }
>+ 
> 
>+ public String[] getTokenNames() { return InternalUmlCommonParser.tokenNames; }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g"; }
> 
>-						}
> 
> 
>-					}
>+ 	private UmlCommonGrammarAccess grammarAccess;
>+ 	
>+ public InternalUmlCommonParser(TokenStream input, UmlCommonGrammarAccess grammarAccess) {
>+ this(input);
>+ this.grammarAccess = grammarAccess;
>+ registerRules(grammarAccess.getGrammar());
>+ }
>+ 
>+ @Override
>+ protected String getFirstRuleName() {
>+ 	return "QualifiedName";	
>+ 	}
>+ 	
>+ 	@Override
>+ 	protected UmlCommonGrammarAccess getGrammarAccess() {
>+ 		return grammarAccess;
>+ 	}
> 
>-					match(input, 12, FOLLOW_12_in_ruleQualifiedName138);
> 
>-					createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null);
> 
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:111:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>-					int alt1 = 2;
>-					int LA1_0 = input.LA(1);
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:68:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>+ public final EObject entryRuleQualifiedName() throws RecognitionException {
>+ EObject current = null;
> 
>-					if((LA1_0 == RULE_ID)) {
>-						alt1 = 1;
>-					}
>-					switch(alt1) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:112:1: (lv_remaining_2_0= ruleQualifiedName )
>-					{
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:112:1: (lv_remaining_2_0= ruleQualifiedName )
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:113:3: lv_remaining_2_0= ruleQualifiedName
>-						{
>+ EObject iv_ruleQualifiedName = null;
> 
>-							currentNode = createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode);
> 
>-							pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName159);
>-							lv_remaining_2_0 = ruleQualifiedName();
>-							_fsp--;
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:69:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:70:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>+ {
>+ newCompositeNode(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName75);
>+ iv_ruleQualifiedName=ruleQualifiedName();
> 
>+ state._fsp--;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "remaining", lv_remaining_2_0, "QualifiedName", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ current =iv_ruleQualifiedName; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName85); 
> 
>+ }
> 
>-						}
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleQualifiedName"
> 
> 
>-					}
>-						break;
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:77: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;
> 
>-					}
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+ EObject lv_remaining_2_0 = null;
> 
> 
>-				}
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:80:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:81:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:81:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:81:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:81:2: ( (otherlv_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:82:1: (otherlv_0= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:82:1: (otherlv_0= RULE_ID )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:83:3: otherlv_0= RULE_ID
>+ {
> 
>+ 			if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getQualifiedNameRule());
>+ 	 }
>+ 
>+ otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName130); 
> 
>-			}
>+ 		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
>+ 	
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ }
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end ruleQualifiedName
>+ otherlv_1=(Token)match(input,12,FOLLOW_12_in_ruleQualifiedName142); 
> 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>+ 
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:98:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-	// $ANTLR start entryRuleBoundSpecification
>-	// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:147:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>-	public final EObject entryRuleBoundSpecification() throws RecognitionException {
>-		EObject current = null;
>+ if ( (LA1_0==RULE_ID) ) {
>+ alt1=1;
>+ }
>+ switch (alt1) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:99:1: (lv_remaining_2_0= ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:99:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:100:3: lv_remaining_2_0= ruleQualifiedName
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName163);
>+ lv_remaining_2_0=ruleQualifiedName();
> 
>-		EObject iv_ruleBoundSpecification = null;
>+ state._fsp--;
> 
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:148:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:149:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode);
>-				pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification200);
>-				iv_ruleBoundSpecification = ruleBoundSpecification();
>-				_fsp--;
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-				current = iv_ruleBoundSpecification;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleBoundSpecification210);
>+ }
> 
>-			}
> 
>-		}
>+ }
>+ break;
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end entryRuleBoundSpecification
> 
>+ }
> 
>-	// $ANTLR start ruleBoundSpecification
>-	// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:156:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>-	public final EObject ruleBoundSpecification() throws RecognitionException {
>-		EObject current = null;
> 
>-		Token lv_value_0_0 = null;
>+ }
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleQualifiedName"
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:161:6: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:162:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:162:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:163:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>-				{
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:163:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:164:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>-					{
>-						lv_value_0_0 = (Token)input.LT(1);
>-						match(input, RULE_UNLIMITEDLITERAL, FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification251);
> 
>-						createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value");
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:128:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>+ public final EObject entryRuleBoundSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>+ EObject iv_ruleBoundSpecification = null;
> 
>-						if(current == null) {
>-							current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-							associateNodeWithAstElement(currentNode, current);
>-						}
>-						try {
>-							set(current, "value", lv_value_0_0, "UnlimitedLiteral", lastConsumedNode);
>-						} catch (ValueConverterException vce) {
>-							handleValueConverterException(vce);
>-						}
> 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:129:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:130:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>+ {
>+ newCompositeNode(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification204);
>+ iv_ruleBoundSpecification=ruleBoundSpecification();
> 
>-					}
>+ state._fsp--;
> 
>+ current =iv_ruleBoundSpecification; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification214); 
> 
>-				}
>+ }
> 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
>-			}
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:137:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>+ public final EObject ruleBoundSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>-		}
>+ Token lv_value_0_0=null;
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:140:28: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:141:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:141:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:142:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:142:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:143:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>+ {
>+ lv_value_0_0=(Token)match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification255); 
> 
>-	// $ANTLR end ruleBoundSpecification
>+ 			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
>+ 		
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getBoundSpecificationRule());
>+ 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
>+ 	 
> 
>+ }
> 
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName75 = new BitSet(new long[]{ 0x0000000000000000L });
>+ }
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName85 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName128 = new BitSet(new long[]{ 0x0000000000001000L });
>+ }
> 
>-	public static final BitSet FOLLOW_12_in_ruleQualifiedName138 = new BitSet(new long[]{ 0x0000000000000012L });
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleBoundSpecification"
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName159 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // Delegated rules
> 
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification200 = new BitSet(new long[]{ 0x0000000000000000L });
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification210 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 
> 
>-	public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification251 = new BitSet(new long[]{ 0x0000000000000002L });
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName75 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName85 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName130 = new BitSet(new long[]{0x0000000000001000L});
>+ public static final BitSet FOLLOW_12_in_ruleQualifiedName142 = new BitSet(new long[]{0x0000000000000012L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName163 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification204 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification214 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification255 = new BitSet(new long[]{0x0000000000000002L});
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommonLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommonLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommonLexer.java	(working copy)
>@@ -1,773 +1,855 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.common.editor.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;
>-import org.antlr.runtime.EarlyExitException;
>-import org.antlr.runtime.MismatchedSetException;
>-import org.antlr.runtime.NoViableAltException;
>-import org.antlr.runtime.RecognitionException;
> import org.eclipse.xtext.parser.antlr.Lexer;
> 
>-@SuppressWarnings("all")
>-public class InternalUmlCommonLexer extends Lexer {
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int T12 = 12;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int Tokens = 13;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlCommonLexer() {
>-		;
>-	}
>-
>-	public InternalUmlCommonLexer(CharStream input) {
>-		super(input);
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g";
>-	}
> 
>-	// $ANTLR start T12
>-	public final void mT12() throws RecognitionException {
>-		try {
>-			int _type = T12;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:10:5: ( '::' )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:10:7: '::'
>-			{
>-				match("::");
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-
>-			}
>-
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+@SuppressWarnings("all")
>+public class InternalUmlCommonLexer extends Lexer {
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__12=12;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>-	// $ANTLR end T12
>+ // delegates
>+ // delegators
> 
>-	// $ANTLR start RULE_UNLIMITEDLITERAL
>-	public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>-		try {
>-			int _type = RULE_UNLIMITEDLITERAL;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-				int alt2 = 2;
>-				int LA2_0 = input.LA(1);
>+ public InternalUmlCommonLexer() {;} 
>+ public InternalUmlCommonLexer(CharStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCommonLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
> 
>-				if(((LA2_0 >= '0' && LA2_0 <= '9'))) {
>-					alt2 = 1;
>-				} else if((LA2_0 == '*')) {
>-					alt2 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("197:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g"; }
> 
>-					throw nvae;
>-				}
>-				switch(alt2) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:26: '0' .. '9' ( '0' .. '9' )*
>-				{
>-					matchRange('0', '9');
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:35: ( '0' .. '9' )*
>-					loop1: do {
>-						int alt1 = 2;
>-						int LA1_0 = input.LA(1);
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
>+ try {
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:11:7: ( '::' )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:11:9: '::'
>+ {
>+ match("::"); 
> 
>-						if(((LA1_0 >= '0' && LA1_0 <= '9'))) {
>-							alt1 = 1;
>-						}
> 
>+ }
> 
>-						switch(alt1) {
>-						case 1:
>-							// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:36: '0' .. '9'
>-						{
>-							matchRange('0', '9');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__12"
> 
>-						}
>-							break;
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
>+ public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>+ try {
>+ int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-						default:
>-							break loop1;
>-						}
>-					} while(true);
>+ if ( ((LA2_0>='0' && LA2_0<='9')) ) {
>+ alt2=1;
>+ }
>+ else if ( (LA2_0=='*') ) {
>+ alt2=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>+ throw nvae;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:26: '0' .. '9' ( '0' .. '9' )*
>+ {
>+ matchRange('0','9'); 
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:35: ( '0' .. '9' )*
>+ loop1:
>+ do {
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:197:47: '*'
>-				{
>-					match('*');
>+ if ( ((LA1_0>='0' && LA1_0<='9')) ) {
>+ alt1=1;
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ switch (alt1) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:36: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>+ 	 }
>+ 	 break;
> 
>-			}
>+ 	default :
>+ 	 break loop1;
>+ }
>+ } while (true);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_UNLIMITEDLITERAL
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:170:47: '*'
>+ {
>+ match('*'); 
> 
>-	// $ANTLR start RULE_ID
>-	public final void mRULE_ID() throws RecognitionException {
>-		try {
>-			int _type = RULE_ID;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:199:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:199:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:199:11: ( '^' )?
>-				int alt3 = 2;
>-				int LA3_0 = input.LA(1);
>+ }
>+ break;
> 
>-				if((LA3_0 == '^')) {
>-					alt3 = 1;
>-				}
>-				switch(alt3) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:199:11: '^'
>-				{
>-					match('^');
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ }
> 
>-				if((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {
>-					input.consume();
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>-				} else {
>-					MismatchedSetException mse = new MismatchedSetException(null, input);
>-					recover(mse);
>-					throw mse;
>-				}
>+ // $ANTLR start "RULE_ID"
>+ public final void mRULE_ID() throws RecognitionException {
>+ try {
>+ int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:172:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:172:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:172:11: ( '^' )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:199:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-				loop4: do {
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
>+ if ( (LA3_0=='^') ) {
>+ alt3=1;
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:172:11: '^'
>+ {
>+ match('^'); 
> 
>-					if(((LA4_0 >= '0' && LA4_0 <= '9') || (LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
>-						alt4 = 1;
>-					}
>+ }
>+ break;
> 
>+ }
> 
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.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();
>+ if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
>+ input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
>+ else {
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:172:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-					}
>-						break;
>+ if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
>+ alt4=1;
>+ }
> 
>-					default:
>-						break loop4;
>-					}
>-				} while(true);
> 
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.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 {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_ID
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR start RULE_INT
>-	public final void mRULE_INT() throws RecognitionException {
>-		try {
>-			int _type = RULE_INT;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:201:10: ( ( '0' .. '9' )+ )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:201:12: ( '0' .. '9' )+
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:201:12: ( '0' .. '9' )+
>-				int cnt5 = 0;
>-				loop5: do {
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
>-					if(((LA5_0 >= '0' && LA5_0 <= '9'))) {
>-						alt5 = 1;
>-					}
> 
>+ }
> 
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:201:13: '0' .. '9'
>-					{
>-						matchRange('0', '9');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ID"
> 
>-					}
>-						break;
>+ // $ANTLR start "RULE_INT"
>+ public final void mRULE_INT() throws RecognitionException {
>+ try {
>+ int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:174:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:174:12: ( '0' .. '9' )+
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:174:12: ( '0' .. '9' )+
>+ int cnt5=0;
>+ loop5:
>+ do {
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-					default:
>-						if(cnt5 >= 1)
>-							break loop5;
>-						EarlyExitException eee = new EarlyExitException(5, input);
>-						throw eee;
>-					}
>-					cnt5++;
>-				} while(true);
>+ if ( ((LA5_0>='0' && LA5_0<='9')) ) {
>+ alt5=1;
>+ }
> 
> 
>-			}
>+ switch (alt5) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:174:13: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR end RULE_INT
>+ 	default :
>+ 	 if ( cnt5 >= 1 ) break loop5;
>+ EarlyExitException eee =
>+ new EarlyExitException(5, input);
>+ throw eee;
>+ }
>+ cnt5++;
>+ } while (true);
> 
>-	// $ANTLR start RULE_STRING
>-	public final void mRULE_STRING() throws RecognitionException {
>-		try {
>-			int _type = RULE_STRING;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-				int alt8 = 2;
>-				int LA8_0 = input.LA(1);
> 
>-				if((LA8_0 == '\"')) {
>-					alt8 = 1;
>-				} else if((LA8_0 == '\'')) {
>-					alt8 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("203:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ }
> 
>-					throw nvae;
>-				}
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>-				{
>-					match('\"');
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>-					loop6: do {
>-						int alt6 = 3;
>-						int LA6_0 = input.LA(1);
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_INT"
> 
>-						if((LA6_0 == '\\')) {
>-							alt6 = 1;
>-						} else if(((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '[') || (LA6_0 >= ']' && LA6_0 <= '\uFFFE'))) {
>-							alt6 = 2;
>-						}
>+ // $ANTLR start "RULE_STRING"
>+ public final void mRULE_STRING() throws RecognitionException {
>+ try {
>+ int _type = RULE_STRING;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>+ if ( (LA8_0=='\"') ) {
>+ alt8=1;
>+ }
>+ else if ( (LA8_0=='\'') ) {
>+ alt8=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>-						switch(alt6) {
>-						case 1:
>-							// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:21: '\\\\' ( '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();
>+ throw nvae;
>+ }
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ {
>+ match('\"'); 
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ loop6:
>+ do {
>+ int alt6=3;
>+ int LA6_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( (LA6_0=='\\') ) {
>+ alt6=1;
>+ }
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
>+ alt6=2;
>+ }
> 
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:62: ~ ( ( '\\\\' | '\"' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ switch (alt6) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-						}
>-							break;
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:66: ~ ( ( '\\\\' | '\"' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-						default:
>-							break loop6;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					match('\"');
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>-				{
>-					match('\'');
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>-					loop7: do {
>-						int alt7 = 3;
>-						int LA7_0 = input.LA(1);
>+ 	 }
>+ 	 break;
> 
>-						if((LA7_0 == '\\')) {
>-							alt7 = 1;
>-						} else if(((LA7_0 >= '\u0000' && LA7_0 <= '&') || (LA7_0 >= '(' && LA7_0 <= '[') || (LA7_0 >= ']' && LA7_0 <= '\uFFFE'))) {
>-							alt7 = 2;
>-						}
>+ 	default :
>+ 	 break loop6;
>+ }
>+ } while (true);
> 
>+ match('\"'); 
> 
>-						switch(alt7) {
>-						case 1:
>-							// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:88: '\\\\' ( '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();
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ {
>+ match('\''); 
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ loop7:
>+ do {
>+ int alt7=3;
>+ int LA7_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( (LA7_0=='\\') ) {
>+ alt7=1;
>+ }
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
>+ alt7=2;
>+ }
> 
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:203:129: ~ ( ( '\\\\' | '\\'' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ switch (alt7) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-						}
>-							break;
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:176:137: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-						default:
>-							break loop7;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					match('\'');
> 
>-				}
>-					break;
>+ 	 }
>+ 	 break;
> 
>-				}
>+ 	default :
>+ 	 break loop7;
>+ }
>+ } while (true);
> 
>+ match('\''); 
> 
>-			}
>+ }
>+ break;
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end RULE_STRING
> 
>-	// $ANTLR start RULE_ML_COMMENT
>-	public final void mRULE_ML_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_ML_COMMENT;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:205:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:205:19: '/*' ( options {greedy=false; } : . )* '*/'
>-			{
>-				match("/*");
>+ }
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:205:24: ( options {greedy=false; } : . )*
>-				loop9: do {
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_STRING"
> 
>-					if((LA9_0 == '*')) {
>-						int LA9_1 = input.LA(2);
>+ // $ANTLR start "RULE_ML_COMMENT"
>+ public final void mRULE_ML_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:178:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:178:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ {
>+ match("/*"); 
> 
>-						if((LA9_1 == '/')) {
>-							alt9 = 2;
>-						} else if(((LA9_1 >= '\u0000' && LA9_1 <= '.') || (LA9_1 >= '0' && LA9_1 <= '\uFFFE'))) {
>-							alt9 = 1;
>-						}
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:178:24: ( options {greedy=false; } : . )*
>+ loop9:
>+ do {
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>+ if ( (LA9_0=='*') ) {
>+ int LA9_1 = input.LA(2);
> 
>-					} else if(((LA9_0 >= '\u0000' && LA9_0 <= ')') || (LA9_0 >= '+' && LA9_0 <= '\uFFFE'))) {
>-						alt9 = 1;
>-					}
>+ if ( (LA9_1=='/') ) {
>+ alt9=2;
>+ }
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
> 
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:205:52: .
>-					{
>-						matchAny();
>+ }
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop9;
>-					}
>-				} while(true);
>+ switch (alt9) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:178:52: .
>+ 	 {
>+ 	 matchAny(); 
> 
>-				match("*/");
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop9;
>+ }
>+ } while (true);
> 
>-			}
>+ match("*/"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_ML_COMMENT
>+ }
> 
>-	// $ANTLR start RULE_SL_COMMENT
>-	public final void mRULE_SL_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_SL_COMMENT;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>-			{
>-				match("//");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:24: (~ ( ( '\\n' | '\\r' ) ) )*
>-				loop10: do {
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ // $ANTLR start "RULE_SL_COMMENT"
>+ public final void mRULE_SL_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ {
>+ match("//"); 
> 
>-					if(((LA10_0 >= '\u0000' && LA10_0 <= '\t') || (LA10_0 >= '\u000B' && LA10_0 <= '\f') || (LA10_0 >= '\u000E' && LA10_0 <= '\uFFFE'))) {
>-						alt10 = 1;
>-					}
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ loop10:
>+ do {
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
>+ alt10=1;
>+ }
> 
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207: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) <= '\uFFFE')) {
>-							input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ switch (alt10) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180: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)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop10;
>-					}
>-				} while(true);
>+ 	 }
>+ 	 break;
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:40: ( ( '\\r' )? '\\n' )?
>-				int alt12 = 2;
>-				int LA12_0 = input.LA(1);
>+ 	default :
>+ 	 break loop10;
>+ }
>+ } while (true);
> 
>-				if((LA12_0 == '\n' || LA12_0 == '\r')) {
>-					alt12 = 1;
>-				}
>-				switch(alt12) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:41: ( '\\r' )? '\\n'
>-				{
>-					// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:41: ( '\\r' )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:40: ( ( '\\r' )? '\\n' )?
>+ int alt12=2;
>+ int LA12_0 = input.LA(1);
> 
>-					if((LA11_0 == '\r')) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:207:41: '\\r'
>-					{
>-						match('\r');
>+ if ( (LA12_0=='\n'||LA12_0=='\r') ) {
>+ alt12=1;
>+ }
>+ switch (alt12) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:41: ( '\\r' )? '\\n'
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:41: ( '\\r' )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-					}
>-						break;
>+ if ( (LA11_0=='\r') ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:180:41: '\\r'
>+ {
>+ match('\r'); 
> 
>-					}
>+ }
>+ break;
> 
>-					match('\n');
>+ }
> 
>-				}
>-					break;
>+ match('\n'); 
> 
>-				}
>+ }
>+ break;
> 
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end RULE_SL_COMMENT
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>-	// $ANTLR start RULE_WS
>-	public final void mRULE_WS() throws RecognitionException {
>-		try {
>-			int _type = RULE_WS;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:209:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:209:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:209:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-				int cnt13 = 0;
>-				loop13: do {
>-					int alt13 = 2;
>-					int LA13_0 = input.LA(1);
>+ // $ANTLR start "RULE_WS"
>+ public final void mRULE_WS() throws RecognitionException {
>+ try {
>+ int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:182:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:182:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:182:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int cnt13=0;
>+ loop13:
>+ do {
>+ int alt13=2;
>+ int LA13_0 = input.LA(1);
> 
>-					if(((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) {
>-						alt13 = 1;
>-					}
>+ if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
>+ alt13=1;
>+ }
> 
> 
>-					switch(alt13) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:
>-					{
>-						if((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
>-							input.consume();
>+ switch (alt13) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:
>+ 	 {
>+ 	 if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
>+ 	 input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-					}
>-						break;
>+ 	 }
>+ 	 break;
> 
>-					default:
>-						if(cnt13 >= 1)
>-							break loop13;
>-						EarlyExitException eee = new EarlyExitException(13, input);
>-						throw eee;
>-					}
>-					cnt13++;
>-				} while(true);
>+ 	default :
>+ 	 if ( cnt13 >= 1 ) break loop13;
>+ EarlyExitException eee =
>+ new EarlyExitException(13, input);
>+ throw eee;
>+ }
>+ cnt13++;
>+ } while (true);
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_WS"
> 
>-	// $ANTLR end RULE_WS
>+ // $ANTLR start "RULE_ANY_OTHER"
>+ public final void mRULE_ANY_OTHER() throws RecognitionException {
>+ try {
>+ int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:184:16: ( . )
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:184:18: .
>+ {
>+ matchAny(); 
> 
>-	// $ANTLR start RULE_ANY_OTHER
>-	public final void mRULE_ANY_OTHER() throws RecognitionException {
>-		try {
>-			int _type = RULE_ANY_OTHER;
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:211:16: ( . )
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:211:18: .
>-			{
>-				matchAny();
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ public void mTokens() throws RecognitionException {
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:8: ( T__12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ int alt14=9;
>+ alt14 = dfa14.predict(input);
>+ switch (alt14) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:10: T__12
>+ {
>+ mT__12(); 
> 
>-	// $ANTLR end RULE_ANY_OTHER
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:16: RULE_UNLIMITEDLITERAL
>+ {
>+ mRULE_UNLIMITEDLITERAL(); 
> 
>-	public void mTokens() throws RecognitionException {
>-		// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:8: ( T12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>-		int alt14 = 9;
>-		alt14 = dfa14.predict(input);
>-		switch(alt14) {
>-		case 1:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:10: T12
>-		{
>-			mT12();
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:38: RULE_ID
>+ {
>+ mRULE_ID(); 
> 
>-		}
>-			break;
>-		case 2:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:14: RULE_UNLIMITEDLITERAL
>-		{
>-			mRULE_UNLIMITEDLITERAL();
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:46: RULE_INT
>+ {
>+ mRULE_INT(); 
> 
>-		}
>-			break;
>-		case 3:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:36: RULE_ID
>-		{
>-			mRULE_ID();
>+ }
>+ break;
>+ case 5 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:55: RULE_STRING
>+ {
>+ mRULE_STRING(); 
> 
>-		}
>-			break;
>-		case 4:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:44: RULE_INT
>-		{
>-			mRULE_INT();
>+ }
>+ break;
>+ case 6 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:67: RULE_ML_COMMENT
>+ {
>+ mRULE_ML_COMMENT(); 
> 
>-		}
>-			break;
>-		case 5:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:53: RULE_STRING
>-		{
>-			mRULE_STRING();
>+ }
>+ break;
>+ case 7 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:83: RULE_SL_COMMENT
>+ {
>+ mRULE_SL_COMMENT(); 
> 
>-		}
>-			break;
>-		case 6:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:65: RULE_ML_COMMENT
>-		{
>-			mRULE_ML_COMMENT();
>+ }
>+ break;
>+ case 8 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:99: RULE_WS
>+ {
>+ mRULE_WS(); 
> 
>-		}
>-			break;
>-		case 7:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:81: RULE_SL_COMMENT
>-		{
>-			mRULE_SL_COMMENT();
>+ }
>+ break;
>+ case 9 :
>+ // ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:107: RULE_ANY_OTHER
>+ {
>+ mRULE_ANY_OTHER(); 
> 
>-		}
>-			break;
>-		case 8:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:97: RULE_WS
>-		{
>-			mRULE_WS();
>+ }
>+ break;
> 
>-		}
>-			break;
>-		case 9:
>-			// ../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/parser/antlr/internal/InternalUmlCommon.g:1:105: RULE_ANY_OTHER
>-		{
>-			mRULE_ANY_OTHER();
>+ }
> 
>-		}
>-			break;
>+ }
> 
>-		}
> 
>-	}
>+ protected DFA14 dfa14 = new DFA14(this);
>+ static final String DFA14_eotS =
>+ "\1\uffff\1\12\1\15\1\uffff\1\12\1\uffff\3\12\3\uffff\1\15\6\uffff";
>+ static final String DFA14_eofS =
>+ "\23\uffff";
>+ static final String DFA14_minS =
>+ "\1\0\1\72\1\60\1\uffff\1\101\1\uffff\2\0\1\52\3\uffff\1\60\6\uffff";
>+ static final String DFA14_maxS =
>+ "\1\uffff\1\72\1\71\1\uffff\1\172\1\uffff\2\uffff\1\57\3\uffff\1"+
>+ "\71\6\uffff";
>+ static final String DFA14_acceptS =
>+ "\3\uffff\1\2\1\uffff\1\3\3\uffff\1\10\1\11\1\1\1\uffff\1\2\1\3"+
>+ "\1\5\1\6\1\7\1\10";
>+ static final String DFA14_specialS =
>+ "\1\1\5\uffff\1\2\1\0\13\uffff}>";
>+ static final String[] DFA14_transitionS = {
>+ "\11\12\2\11\2\12\1\11\22\12\1\11\1\12\1\6\4\12\1\7\2\12\1\3"+
>+ "\4\12\1\10\12\2\1\1\6\12\32\5\3\12\1\4\1\5\1\12\32\5\uff85\12",
>+ "\1\13",
>+ "\12\14",
>+ "",
>+ "\32\16\4\uffff\1\16\1\uffff\32\16",
>+ "",
>+ "\0\17",
>+ "\0\17",
>+ "\1\20\4\uffff\1\21",
>+ "",
>+ "",
>+ "",
>+ "\12\14",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ ""
>+ };
> 
>+ static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ static final short[][] DFA14_transition;
> 
>-	protected DFA14 dfa14 = new DFA14(this);
>+ static {
>+ int numStates = DFA14_transitionS.length;
>+ DFA14_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>+ }
>+ }
> 
>-	static final String DFA14_eotS = "\1\uffff\1\12\1\15\1\uffff\1\12\1\uffff\3\12\3\uffff\1\15\6\uffff";
>+ class DFA14 extends DFA {
> 
>-	static final String DFA14_eofS = "\23\uffff";
>+ public DFA14(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 14;
>+ this.eot = DFA14_eot;
>+ this.eof = DFA14_eof;
>+ this.min = DFA14_min;
>+ this.max = DFA14_max;
>+ this.accept = DFA14_accept;
>+ this.special = DFA14_special;
>+ this.transition = DFA14_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_7 = input.LA(1);
> 
>-	static final String DFA14_minS = "\1\0\1\72\1\60\1\uffff\1\101\1\uffff\2\0\1\52\3\uffff\1\60\6\uffff";
>+ s = -1;
>+ if ( ((LA14_7>='\u0000' && LA14_7<='\uFFFF')) ) {s = 15;}
> 
>-	static final String DFA14_maxS = "\1\ufffe\1\72\1\71\1\uffff\1\172\1\uffff\2\ufffe\1\57\3\uffff\1" + "\71\6\uffff";
>+ else s = 10;
> 
>-	static final String DFA14_acceptS = "\3\uffff\1\2\1\uffff\1\3\3\uffff\1\10\1\11\1\1\1\uffff\1\2\1\3\1" + "\5\1\7\1\6\1\10";
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_0 = input.LA(1);
> 
>-	static final String DFA14_specialS = "\23\uffff}>";
>+ s = -1;
>+ if ( (LA14_0==':') ) {s = 1;}
> 
>-	static final String[] DFA14_transitionS = { "\11\12\2\11\2\12\1\11\22\12\1\11\1\12\1\6\4\12\1\7\2\12\1\3" + "\4\12\1\10\12\2\1\1\6\12\32\5\3\12\1\4\1\5\1\12\32\5\uff84\12", "\1\13", "\12\14", "", "\32\16\4\uffff\1\16\1\uffff\32\16", "", "\uffff\17", "\uffff\17", "\1\21\4\uffff\1\20", "", "", "", "\12\14", "", "", "", "", "", "" };
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 2;}
> 
>-	static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ else if ( (LA14_0=='*') ) {s = 3;}
> 
>-	static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ else if ( (LA14_0=='^') ) {s = 4;}
> 
>-	static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')) ) {s = 5;}
> 
>-	static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ else if ( (LA14_0=='\"') ) {s = 6;}
> 
>-	static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ else if ( (LA14_0=='\'') ) {s = 7;}
> 
>-	static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ else if ( (LA14_0=='/') ) {s = 8;}
> 
>-	static final short[][] DFA14_transition;
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 9;}
> 
>-	static {
>-		int numStates = DFA14_transitionS.length;
>-		DFA14_transition = new short[numStates][];
>-		for(int i = 0; i < numStates; i++) {
>-			DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>-		}
>-	}
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='#' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='.')||(LA14_0>=';' && LA14_0<='@')||(LA14_0>='[' && LA14_0<=']')||LA14_0=='`'||(LA14_0>='{' && LA14_0<='\uFFFF')) ) {s = 10;}
> 
>-	class DFA14 extends DFA {
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_6 = input.LA(1);
> 
>-		public DFA14(BaseRecognizer recognizer) {
>-			this.recognizer = recognizer;
>-			this.decisionNumber = 14;
>-			this.eot = DFA14_eot;
>-			this.eof = DFA14_eof;
>-			this.min = DFA14_min;
>-			this.max = DFA14_max;
>-			this.accept = DFA14_accept;
>-			this.special = DFA14_special;
>-			this.transition = DFA14_transition;
>-		}
>+ s = -1;
>+ if ( ((LA14_6>='\u0000' && LA14_6<='\uFFFF')) ) {s = 15;}
> 
>-		public String getDescription() {
>-			return "1:1: Tokens : ( T12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>-		}
>-	}
>+ else s = 10;
> 
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
>+ 
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore	(working copy)
>@@ -4,14 +4,14 @@
> xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="umlCommon"
> nsURI="http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon" nsPrefix="umlCommon">
> <eClassifiers xsi:type="ecore:EClass" name="QualifiedName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="#//QualifiedName"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/model/UML.ecore#//Namespace"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//QualifiedName"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="TypeRule">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//QualifiedName"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//QualifiedName"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Type"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/model/UML.ecore#//Type"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">
> <eLiterals name="public" literal="+"/>
>@@ -21,7 +21,8 @@
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="MultiplicityRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" upperBound="-1"
>- eType="#//BoundSpecification" containment="true"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//BoundSpecification"
>+ containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="BoundSpecification">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.genmodel	(working copy)
>@@ -6,34 +6,34 @@
> modelPluginID="org.eclipse.papyrus.common.editor.xtext" forceOverwrite="true"
> modelName="UmlCommon" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.common.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.common.editor.xtext.editor" usedGenPackages="../../../../../../../model/UML.genmodel#//uml">
>+ editorPluginID="org.eclipse.papyrus.common.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.common.editor.xtext/model/UML.genmodel#//uml">
> <genPackages prefix="UmlCommon" basePackage="org.eclipse.papyrus.common.editor.xtext"
>- resource="XML" disposableProviderFactory="true" ecorePackage="UmlCommon.ecore#/">
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlCommon.ecore#//VisibilityKind">
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//VisibilityKind/public"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//VisibilityKind/private"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//VisibilityKind/protected"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//VisibilityKind/package"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#/">
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind/public"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind/private"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind/protected"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind/package"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlCommon.ecore#//Direction">
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//Direction/IN"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//Direction/OUT"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//Direction/INOUT"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlCommon.ecore#//Direction/RETURN"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction/IN"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction/OUT"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction/INOUT"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction/RETURN"/>
> </genEnums>
>- <genClasses ecoreClass="UmlCommon.ecore#//QualifiedName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlCommon.ecore#//QualifiedName/path"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlCommon.ecore#//QualifiedName/remaining"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//QualifiedName">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//QualifiedName/path"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//QualifiedName/remaining"/>
> </genClasses>
>- <genClasses ecoreClass="UmlCommon.ecore#//TypeRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlCommon.ecore#//TypeRule/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlCommon.ecore#//TypeRule/type"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule/path"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule/type"/>
> </genClasses>
>- <genClasses ecoreClass="UmlCommon.ecore#//MultiplicityRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlCommon.ecore#//MultiplicityRule/bounds"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//MultiplicityRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//MultiplicityRule/bounds"/>
> </genClasses>
>- <genClasses ecoreClass="UmlCommon.ecore#//BoundSpecification">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlCommon.ecore#//BoundSpecification/value"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//BoundSpecification">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//BoundSpecification/value"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommonStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommonStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommonStandaloneSetupGenerated.java	(working copy)
>@@ -1,22 +1,9 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> 
> package org.eclipse.papyrus.common.editor.xtext;
> 
> import org.eclipse.emf.ecore.EPackage;
>-import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.xtext.ISetup;
>+import org.eclipse.emf.ecore.resource.Resource;
> 
> import com.google.inject.Guice;
> import com.google.inject.Injector;
>@@ -34,22 +21,21 @@
> 		register(injector);
> 		return injector;
> 	}
>-
>+	
> 	public Injector createInjector() {
> 		return Guice.createInjector(new org.eclipse.papyrus.common.editor.xtext.UmlCommonRuntimeModule());
> 	}
>-
>+	
> 	public void register(Injector injector) {
>-		if(!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon")) {
>-			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon", org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage.eINSTANCE);
>-		}
>+	if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon")) {
>+		EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon", org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage.eINSTANCE);
>+	}
> 
> 		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
> 		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
> 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("umlcommon", resourceFactory);
> 		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("umlcommon", serviceProvider);
>-
>-
>+		
> 
> 
> 
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/services/UmlCommonGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/services/UmlCommonGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/services/UmlCommonGrammarAccess.java	(working copy)
>@@ -1,433 +1,274 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> 
> package org.eclipse.papyrus.common.editor.xtext.services;
> 
>-import org.eclipse.xtext.Alternatives;
>-import org.eclipse.xtext.Assignment;
>-import org.eclipse.xtext.CrossReference;
>-import org.eclipse.xtext.EnumLiteralDeclaration;
>-import org.eclipse.xtext.EnumRule;
>-import org.eclipse.xtext.Grammar;
>-import org.eclipse.xtext.GrammarUtil;
>-import org.eclipse.xtext.Group;
>-import org.eclipse.xtext.Keyword;
>-import org.eclipse.xtext.ParserRule;
>-import org.eclipse.xtext.RuleCall;
>-import org.eclipse.xtext.TerminalRule;
>-import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
>-import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
>+import com.google.inject.Singleton;
>+import com.google.inject.Inject;
>+
>+import org.eclipse.xtext.*;
> import org.eclipse.xtext.service.GrammarProvider;
>+import org.eclipse.xtext.service.AbstractElementFinder.*;
> 
>-import com.google.inject.Inject;
>-import com.google.inject.Singleton;
>+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
> 
> @Singleton
> public class UmlCommonGrammarAccess extends AbstractGrammarElementFinder {
>-
>-
>+	
>+	
> 	public class QualifiedNameElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "QualifiedName");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "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);
>-
> 		private final RuleCall cPathNamespaceIDTerminalRuleCall_0_0_1 = (RuleCall)cPathNamespaceCrossReference_0_0.eContents().get(1);
>-
> 		private final Keyword cColonColonKeyword_1 = (Keyword)cGroup.eContents().get(1);
>-
> 		private final Assignment cRemainingAssignment_2 = (Assignment)cGroup.eContents().get(2);
>-
> 		private final RuleCall cRemainingQualifiedNameParserRuleCall_2_0 = (RuleCall)cRemainingAssignment_2.eContents().get(0);
>-
>+		
> 		//QualifiedName:
> 		//	path=[uml::Namespace] "::" remaining=QualifiedName?;
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//path=[uml::Namespace] "::" remaining=QualifiedName?
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//path=[uml::Namespace]
>-		public Assignment getPathAssignment_0() {
>-			return cPathAssignment_0;
>-		}
>+		public Assignment getPathAssignment_0() { return cPathAssignment_0; }
> 
> 		//[uml::Namespace]
>-		public CrossReference getPathNamespaceCrossReference_0_0() {
>-			return cPathNamespaceCrossReference_0_0;
>-		}
>+		public CrossReference getPathNamespaceCrossReference_0_0() { return cPathNamespaceCrossReference_0_0; }
> 
> 		//ID
>-		public RuleCall getPathNamespaceIDTerminalRuleCall_0_0_1() {
>-			return cPathNamespaceIDTerminalRuleCall_0_0_1;
>-		}
>+		public RuleCall getPathNamespaceIDTerminalRuleCall_0_0_1() { return cPathNamespaceIDTerminalRuleCall_0_0_1; }
> 
> 		//"::"
>-		public Keyword getColonColonKeyword_1() {
>-			return cColonColonKeyword_1;
>-		}
>+		public Keyword getColonColonKeyword_1() { return cColonColonKeyword_1; }
> 
> 		//remaining=QualifiedName?
>-		public Assignment getRemainingAssignment_2() {
>-			return cRemainingAssignment_2;
>-		}
>+		public Assignment getRemainingAssignment_2() { return cRemainingAssignment_2; }
> 
> 		//QualifiedName
>-		public RuleCall getRemainingQualifiedNameParserRuleCall_2_0() {
>-			return cRemainingQualifiedNameParserRuleCall_2_0;
>-		}
>+		public RuleCall getRemainingQualifiedNameParserRuleCall_2_0() { return cRemainingQualifiedNameParserRuleCall_2_0; }
> 	}
> 
> 	public class TypeRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "TypeRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TypeRule");
> 		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);
>-
> 		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
>-
> 		private final CrossReference cTypeTypeCrossReference_1_0 = (CrossReference)cTypeAssignment_1.eContents().get(0);
>-
> 		private final RuleCall cTypeTypeIDTerminalRuleCall_1_0_1 = (RuleCall)cTypeTypeCrossReference_1_0.eContents().get(1);
>-
>+		
> 		//TypeRule:
> 		//	path=QualifiedName? type=[uml::Type];
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//path=QualifiedName? type=[uml::Type]
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//path=QualifiedName?
>-		public Assignment getPathAssignment_0() {
>-			return cPathAssignment_0;
>-		}
>+		public Assignment getPathAssignment_0() { return cPathAssignment_0; }
> 
> 		//QualifiedName
>-		public RuleCall getPathQualifiedNameParserRuleCall_0_0() {
>-			return cPathQualifiedNameParserRuleCall_0_0;
>-		}
>+		public RuleCall getPathQualifiedNameParserRuleCall_0_0() { return cPathQualifiedNameParserRuleCall_0_0; }
> 
> 		//type=[uml::Type]
>-		public Assignment getTypeAssignment_1() {
>-			return cTypeAssignment_1;
>-		}
>+		public Assignment getTypeAssignment_1() { return cTypeAssignment_1; }
> 
> 		//[uml::Type]
>-		public CrossReference getTypeTypeCrossReference_1_0() {
>-			return cTypeTypeCrossReference_1_0;
>-		}
>+		public CrossReference getTypeTypeCrossReference_1_0() { return cTypeTypeCrossReference_1_0; }
> 
> 		//ID
>-		public RuleCall getTypeTypeIDTerminalRuleCall_1_0_1() {
>-			return cTypeTypeIDTerminalRuleCall_1_0_1;
>-		}
>+		public RuleCall getTypeTypeIDTerminalRuleCall_1_0_1() { return cTypeTypeIDTerminalRuleCall_1_0_1; }
> 	}
> 
> 	public class MultiplicityRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "MultiplicityRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MultiplicityRule");
> 		private final Group cGroup = (Group)rule.eContents().get(1);
>-
> 		private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
>-
> 		private final Assignment cBoundsAssignment_1 = (Assignment)cGroup.eContents().get(1);
>-
> 		private final RuleCall cBoundsBoundSpecificationParserRuleCall_1_0 = (RuleCall)cBoundsAssignment_1.eContents().get(0);
>-
> 		private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
>-
> 		private final Keyword cFullStopFullStopKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
>-
> 		private final Assignment cBoundsAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
>-
> 		private final RuleCall cBoundsBoundSpecificationParserRuleCall_2_1_0 = (RuleCall)cBoundsAssignment_2_1.eContents().get(0);
>-
> 		private final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
>-
>+		
> 		//MultiplicityRule:
> 		//	"[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//"[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//"["
>-		public Keyword getLeftSquareBracketKeyword_0() {
>-			return cLeftSquareBracketKeyword_0;
>-		}
>+		public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
> 
> 		//bounds+=BoundSpecification
>-		public Assignment getBoundsAssignment_1() {
>-			return cBoundsAssignment_1;
>-		}
>+		public Assignment getBoundsAssignment_1() { return cBoundsAssignment_1; }
> 
> 		//BoundSpecification
>-		public RuleCall getBoundsBoundSpecificationParserRuleCall_1_0() {
>-			return cBoundsBoundSpecificationParserRuleCall_1_0;
>-		}
>+		public RuleCall getBoundsBoundSpecificationParserRuleCall_1_0() { return cBoundsBoundSpecificationParserRuleCall_1_0; }
> 
> 		//(".." bounds+=BoundSpecification)?
>-		public Group getGroup_2() {
>-			return cGroup_2;
>-		}
>+		public Group getGroup_2() { return cGroup_2; }
> 
> 		//".."
>-		public Keyword getFullStopFullStopKeyword_2_0() {
>-			return cFullStopFullStopKeyword_2_0;
>-		}
>+		public Keyword getFullStopFullStopKeyword_2_0() { return cFullStopFullStopKeyword_2_0; }
> 
> 		//bounds+=BoundSpecification
>-		public Assignment getBoundsAssignment_2_1() {
>-			return cBoundsAssignment_2_1;
>-		}
>+		public Assignment getBoundsAssignment_2_1() { return cBoundsAssignment_2_1; }
> 
> 		//BoundSpecification
>-		public RuleCall getBoundsBoundSpecificationParserRuleCall_2_1_0() {
>-			return cBoundsBoundSpecificationParserRuleCall_2_1_0;
>-		}
>+		public RuleCall getBoundsBoundSpecificationParserRuleCall_2_1_0() { return cBoundsBoundSpecificationParserRuleCall_2_1_0; }
> 
> 		//"]"
>-		public Keyword getRightSquareBracketKeyword_3() {
>-			return cRightSquareBracketKeyword_3;
>-		}
>+		public Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }
> 	}
> 
> 	public class BoundSpecificationElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "BoundSpecification");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BoundSpecification");
> 		private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
>-
> 		private final RuleCall cValueUnlimitedLiteralTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
>-
>+		
> 		//BoundSpecification:
> 		//	value=UnlimitedLiteral;
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//value=UnlimitedLiteral
>-		public Assignment getValueAssignment() {
>-			return cValueAssignment;
>-		}
>+		public Assignment getValueAssignment() { return cValueAssignment; }
> 
> 		//UnlimitedLiteral
>-		public RuleCall getValueUnlimitedLiteralTerminalRuleCall_0() {
>-			return cValueUnlimitedLiteralTerminalRuleCall_0;
>-		}
>+		public RuleCall getValueUnlimitedLiteralTerminalRuleCall_0() { return cValueUnlimitedLiteralTerminalRuleCall_0; }
> 	}
>-
>-
>+	
>+	
> 	public class VisibilityKindElements extends AbstractEnumRuleElementFinder {
>-
>-		private final EnumRule rule = (EnumRule)GrammarUtil.findRuleForName(getGrammar(), "VisibilityKind");
>-
>+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "VisibilityKind");
> 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
>-
> 		private final EnumLiteralDeclaration cPublicEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
>-
> 		private final Keyword cPublicPlusSignKeyword_0_0 = (Keyword)cPublicEnumLiteralDeclaration_0.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cPrivateEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
>-
> 		private final Keyword cPrivateHyphenMinusKeyword_1_0 = (Keyword)cPrivateEnumLiteralDeclaration_1.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cProtectedEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
>-
> 		private final Keyword cProtectedNumberSignKeyword_2_0 = (Keyword)cProtectedEnumLiteralDeclaration_2.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cPackageEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
>-
> 		private final Keyword cPackageTildeKeyword_3_0 = (Keyword)cPackageEnumLiteralDeclaration_3.eContents().get(0);
>-
>+		
> 		//enum VisibilityKind:
> 		//	public="+" | private="-" | protected="#" | package="~";
>-		public EnumRule getRule() {
>-			return rule;
>-		}
>+		public EnumRule getRule() { return rule; }
> 
> 		//public="+" | private="-" | protected="#" | package="~"
>-		public Alternatives getAlternatives() {
>-			return cAlternatives;
>-		}
>+		public Alternatives getAlternatives() { return cAlternatives; }
> 
> 		//public="+"
>-		public EnumLiteralDeclaration getPublicEnumLiteralDeclaration_0() {
>-			return cPublicEnumLiteralDeclaration_0;
>-		}
>+		public EnumLiteralDeclaration getPublicEnumLiteralDeclaration_0() { return cPublicEnumLiteralDeclaration_0; }
> 
> 		//"+"
>-		public Keyword getPublicPlusSignKeyword_0_0() {
>-			return cPublicPlusSignKeyword_0_0;
>-		}
>+		public Keyword getPublicPlusSignKeyword_0_0() { return cPublicPlusSignKeyword_0_0; }
> 
> 		//private="-"
>-		public EnumLiteralDeclaration getPrivateEnumLiteralDeclaration_1() {
>-			return cPrivateEnumLiteralDeclaration_1;
>-		}
>+		public EnumLiteralDeclaration getPrivateEnumLiteralDeclaration_1() { return cPrivateEnumLiteralDeclaration_1; }
> 
> 		//"-"
>-		public Keyword getPrivateHyphenMinusKeyword_1_0() {
>-			return cPrivateHyphenMinusKeyword_1_0;
>-		}
>+		public Keyword getPrivateHyphenMinusKeyword_1_0() { return cPrivateHyphenMinusKeyword_1_0; }
> 
> 		//protected="#"
>-		public EnumLiteralDeclaration getProtectedEnumLiteralDeclaration_2() {
>-			return cProtectedEnumLiteralDeclaration_2;
>-		}
>+		public EnumLiteralDeclaration getProtectedEnumLiteralDeclaration_2() { return cProtectedEnumLiteralDeclaration_2; }
> 
> 		//"#"
>-		public Keyword getProtectedNumberSignKeyword_2_0() {
>-			return cProtectedNumberSignKeyword_2_0;
>-		}
>+		public Keyword getProtectedNumberSignKeyword_2_0() { return cProtectedNumberSignKeyword_2_0; }
> 
> 		//package="~"
>-		public EnumLiteralDeclaration getPackageEnumLiteralDeclaration_3() {
>-			return cPackageEnumLiteralDeclaration_3;
>-		}
>+		public EnumLiteralDeclaration getPackageEnumLiteralDeclaration_3() { return cPackageEnumLiteralDeclaration_3; }
> 
> 		//"~"
>-		public Keyword getPackageTildeKeyword_3_0() {
>-			return cPackageTildeKeyword_3_0;
>-		}
>+		public Keyword getPackageTildeKeyword_3_0() { return cPackageTildeKeyword_3_0; }
> 	}
> 
> 	public class DirectionElements extends AbstractEnumRuleElementFinder {
>-
>-		private final EnumRule rule = (EnumRule)GrammarUtil.findRuleForName(getGrammar(), "Direction");
>-
>+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Direction");
> 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
>-
> 		private final EnumLiteralDeclaration cINEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
>-
> 		private final Keyword cINInKeyword_0_0 = (Keyword)cINEnumLiteralDeclaration_0.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cOUTEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
>-
> 		private final Keyword cOUTOutKeyword_1_0 = (Keyword)cOUTEnumLiteralDeclaration_1.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cINOUTEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
>-
> 		private final Keyword cINOUTInoutKeyword_2_0 = (Keyword)cINOUTEnumLiteralDeclaration_2.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cRETURNEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
>-
> 		private final Keyword cRETURNReturnKeyword_3_0 = (Keyword)cRETURNEnumLiteralDeclaration_3.eContents().get(0);
>-
>+		
> 		//enum Direction:
> 		//	IN="in" | OUT="out" | INOUT="inout" | RETURN="return";
>-		public EnumRule getRule() {
>-			return rule;
>-		}
>+		public EnumRule getRule() { return rule; }
> 
> 		//IN="in" | OUT="out" | INOUT="inout" | RETURN="return"
>-		public Alternatives getAlternatives() {
>-			return cAlternatives;
>-		}
>+		public Alternatives getAlternatives() { return cAlternatives; }
> 
> 		//IN="in"
>-		public EnumLiteralDeclaration getINEnumLiteralDeclaration_0() {
>-			return cINEnumLiteralDeclaration_0;
>-		}
>+		public EnumLiteralDeclaration getINEnumLiteralDeclaration_0() { return cINEnumLiteralDeclaration_0; }
> 
> 		//"in"
>-		public Keyword getINInKeyword_0_0() {
>-			return cINInKeyword_0_0;
>-		}
>+		public Keyword getINInKeyword_0_0() { return cINInKeyword_0_0; }
> 
> 		//OUT="out"
>-		public EnumLiteralDeclaration getOUTEnumLiteralDeclaration_1() {
>-			return cOUTEnumLiteralDeclaration_1;
>-		}
>+		public EnumLiteralDeclaration getOUTEnumLiteralDeclaration_1() { return cOUTEnumLiteralDeclaration_1; }
> 
> 		//"out"
>-		public Keyword getOUTOutKeyword_1_0() {
>-			return cOUTOutKeyword_1_0;
>-		}
>+		public Keyword getOUTOutKeyword_1_0() { return cOUTOutKeyword_1_0; }
> 
> 		//INOUT="inout"
>-		public EnumLiteralDeclaration getINOUTEnumLiteralDeclaration_2() {
>-			return cINOUTEnumLiteralDeclaration_2;
>-		}
>+		public EnumLiteralDeclaration getINOUTEnumLiteralDeclaration_2() { return cINOUTEnumLiteralDeclaration_2; }
> 
> 		//"inout"
>-		public Keyword getINOUTInoutKeyword_2_0() {
>-			return cINOUTInoutKeyword_2_0;
>-		}
>+		public Keyword getINOUTInoutKeyword_2_0() { return cINOUTInoutKeyword_2_0; }
> 
> 		//RETURN="return"
>-		public EnumLiteralDeclaration getRETURNEnumLiteralDeclaration_3() {
>-			return cRETURNEnumLiteralDeclaration_3;
>-		}
>+		public EnumLiteralDeclaration getRETURNEnumLiteralDeclaration_3() { return cRETURNEnumLiteralDeclaration_3; }
> 
> 		//"return"
>-		public Keyword getRETURNReturnKeyword_3_0() {
>-			return cRETURNReturnKeyword_3_0;
>-		}
>+		public Keyword getRETURNReturnKeyword_3_0() { return cRETURNReturnKeyword_3_0; }
> 	}
>-
>+	
> 	private QualifiedNameElements pQualifiedName;
>-
> 	private TypeRuleElements pTypeRule;
>-
> 	private VisibilityKindElements unknownRuleVisibilityKind;
>-
> 	private MultiplicityRuleElements pMultiplicityRule;
>-
> 	private BoundSpecificationElements pBoundSpecification;
>-
> 	private TerminalRule tUnlimitedLiteral;
>-
> 	private DirectionElements unknownRuleDirection;
>-
>+	
> 	private final GrammarProvider grammarProvider;
> 
> 	private TerminalsGrammarAccess gaTerminals;
> 
> 	@Inject
>-	public UmlCommonGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess gaTerminals) {
>+	public UmlCommonGrammarAccess(GrammarProvider grammarProvider,
>+		TerminalsGrammarAccess gaTerminals) {
> 		this.grammarProvider = grammarProvider;
> 		this.gaTerminals = gaTerminals;
> 	}
>-
>-	public Grammar getGrammar() {
>+	
>+	public Grammar getGrammar() {	
> 		return grammarProvider.getGrammar(this);
> 	}
>-
>+	
> 
> 	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
> 		return gaTerminals;
> 	}
> 
>-
>+	
> 	//QualifiedName:
> 	//	path=[uml::Namespace] "::" remaining=QualifiedName?;
> 	public QualifiedNameElements getQualifiedNameAccess() {
> 		return (pQualifiedName != null) ? pQualifiedName : (pQualifiedName = new QualifiedNameElements());
> 	}
>-
>+	
> 	public ParserRule getQualifiedNameRule() {
> 		return getQualifiedNameAccess().getRule();
> 	}
>@@ -437,7 +278,7 @@
> 	public TypeRuleElements getTypeRuleAccess() {
> 		return (pTypeRule != null) ? pTypeRule : (pTypeRule = new TypeRuleElements());
> 	}
>-
>+	
> 	public ParserRule getTypeRuleRule() {
> 		return getTypeRuleAccess().getRule();
> 	}
>@@ -447,7 +288,7 @@
> 	public VisibilityKindElements getVisibilityKindAccess() {
> 		return (unknownRuleVisibilityKind != null) ? unknownRuleVisibilityKind : (unknownRuleVisibilityKind = new VisibilityKindElements());
> 	}
>-
>+	
> 	public EnumRule getVisibilityKindRule() {
> 		return getVisibilityKindAccess().getRule();
> 	}
>@@ -457,7 +298,7 @@
> 	public MultiplicityRuleElements getMultiplicityRuleAccess() {
> 		return (pMultiplicityRule != null) ? pMultiplicityRule : (pMultiplicityRule = new MultiplicityRuleElements());
> 	}
>-
>+	
> 	public ParserRule getMultiplicityRuleRule() {
> 		return getMultiplicityRuleAccess().getRule();
> 	}
>@@ -467,7 +308,7 @@
> 	public BoundSpecificationElements getBoundSpecificationAccess() {
> 		return (pBoundSpecification != null) ? pBoundSpecification : (pBoundSpecification = new BoundSpecificationElements());
> 	}
>-
>+	
> 	public ParserRule getBoundSpecificationRule() {
> 		return getBoundSpecificationAccess().getRule();
> 	}
>@@ -475,15 +316,15 @@
> 	//terminal UnlimitedLiteral:
> 	//	"0".."9" "0".."9"* | "*";
> 	public TerminalRule getUnlimitedLiteralRule() {
>-		return (tUnlimitedLiteral != null) ? tUnlimitedLiteral : (tUnlimitedLiteral = (TerminalRule)GrammarUtil.findRuleForName(getGrammar(), "UnlimitedLiteral"));
>-	}
>+		return (tUnlimitedLiteral != null) ? tUnlimitedLiteral : (tUnlimitedLiteral = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "UnlimitedLiteral"));
>+	} 
> 
> 	//enum Direction:
> 	//	IN="in" | OUT="out" | INOUT="inout" | RETURN="return";
> 	public DirectionElements getDirectionAccess() {
> 		return (unknownRuleDirection != null) ? unknownRuleDirection : (unknownRuleDirection = new DirectionElements());
> 	}
>-
>+	
> 	public EnumRule getDirectionRule() {
> 		return getDirectionAccess().getRule();
> 	}
>@@ -492,42 +333,42 @@
> 	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
> 	public TerminalRule getIDRule() {
> 		return gaTerminals.getIDRule();
>-	}
>+	} 
> 
> 	//terminal INT returns ecore::EInt:
> 	//	"0".."9"+;
> 	public TerminalRule getINTRule() {
> 		return gaTerminals.getINTRule();
>-	}
>+	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaTerminals.getSTRINGRule();
>-	}
>+	} 
> 
> 	//terminal ML_COMMENT:
> 	//	"/ *"->"* /";
> 	public TerminalRule getML_COMMENTRule() {
> 		return gaTerminals.getML_COMMENTRule();
>-	}
>+	} 
> 
> 	//terminal SL_COMMENT:
> 	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
> 	public TerminalRule getSL_COMMENTRule() {
> 		return gaTerminals.getSL_COMMENTRule();
>-	}
>+	} 
> 
> 	//terminal WS:
> 	//	(" " | "\t" | "\r" | "\n")+;
> 	public TerminalRule getWSRule() {
> 		return gaTerminals.getWSRule();
>-	}
>+	} 
> 
> 	//terminal ANY_OTHER:
> 	//	.;
> 	public TerminalRule getANY_OTHERRule() {
> 		return gaTerminals.getANY_OTHERRule();
>-	}
>+	} 
> }
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonResourceFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonResourceFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonResourceFactoryImpl.java	(working copy)
>@@ -7,51 +7,53 @@
> package org.eclipse.papyrus.common.editor.xtext.umlCommon.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;
> 
> /**
> * 
> * The Resource Factory associated with the package.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.util.UmlCommonResourceImpl
> * @generated
> */
>-public class UmlCommonResourceFactoryImpl extends ResourceFactoryImpl {
>+public class UmlCommonResourceFactoryImpl extends ResourceFactoryImpl
>+{
>+ /**
>+ * Creates an instance of the resource factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonResourceFactoryImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * Creates an instance of the resource factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonResourceFactoryImpl() {
>-		super();
>-	}
>+ /**
>+ * Creates an instance of the resource.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Resource createResource(URI uri)
>+ {
>+ XMLResource result = new UmlCommonResourceImpl(uri);
>+ result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
>+ result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
> 
>-	/**
>-	 * Creates an instance of the resource.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Resource createResource(URI uri) {
>-		XMLResource result = new UmlCommonResourceImpl(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.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_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;
>-	}
>+ result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
>+ return result;
>+ }
> 
> } //UmlCommonResourceFactoryImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonXMLProcessor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonXMLProcessor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonXMLProcessor.java	(working copy)
>@@ -9,46 +9,50 @@
> 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.common.editor.xtext.umlCommon.UmlCommonPackage;
> 
> /**
> * This class contains helper methods to serialize and deserialize XML documents
> * 
> * 
>- * 
> * @generated
> */
>-public class UmlCommonXMLProcessor extends XMLProcessor {
>+public class UmlCommonXMLProcessor extends XMLProcessor
>+{
> 
>-	/**
>-	 * Public constructor to instantiate the helper.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonXMLProcessor() {
>-		super((EPackage.Registry.INSTANCE));
>-		UmlCommonPackage.eINSTANCE.eClass();
>-	}
>-
>-	/**
>-	 * Register for "*" and "xml" file extensions the UmlCommonResourceFactoryImpl factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected Map<String, Resource.Factory> getRegistrations() {
>-		if(registrations == null) {
>-			super.getRegistrations();
>-			registrations.put(XML_EXTENSION, new UmlCommonResourceFactoryImpl());
>-			registrations.put(STAR_EXTENSION, new UmlCommonResourceFactoryImpl());
>-		}
>-		return registrations;
>-	}
>+ /**
>+ * Public constructor to instantiate the helper.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonXMLProcessor()
>+ {
>+ super((EPackage.Registry.INSTANCE));
>+ UmlCommonPackage.eINSTANCE.eClass();
>+ }
>+ 
>+ /**
>+ * Register for "*" and "xml" file extensions the UmlCommonResourceFactoryImpl factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected Map<String, Resource.Factory> getRegistrations()
>+ {
>+ if (registrations == null)
>+ {
>+ super.getRegistrations();
>+ registrations.put(XML_EXTENSION, new UmlCommonResourceFactoryImpl());
>+ registrations.put(STAR_EXTENSION, new UmlCommonResourceFactoryImpl());
>+ }
>+ return registrations;
>+ }
> 
> } //UmlCommonXMLProcessor
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonResourceImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonResourceImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonResourceImpl.java	(working copy)
>@@ -7,29 +7,28 @@
> package org.eclipse.papyrus.common.editor.xtext.umlCommon.util;
> 
> import org.eclipse.emf.common.util.URI;
>+
> import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
> 
> /**
> * 
> * The Resource associated with the package.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.util.UmlCommonResourceFactoryImpl
> * @generated
> */
>-public class UmlCommonResourceImpl extends XMLResourceImpl {
>-
>-	/**
>-	 * Creates an instance of the resource.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param uri
>-	 * the URI of the new resource.
>-	 * @generated
>-	 */
>-	public UmlCommonResourceImpl(URI uri) {
>-		super(uri);
>-	}
>+public class UmlCommonResourceImpl extends XMLResourceImpl
>+{
>+ /**
>+ * Creates an instance of the resource.
>+ * 
>+ * 
>+ * @param uri the URI of the new resource.
>+ * @generated
>+ */
>+ public UmlCommonResourceImpl(URI uri)
>+ {
>+ super(uri);
>+ }
> 
> } //UmlCommonResourceImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonSwitch.java	(working copy)
>@@ -6,212 +6,187 @@
> */
> package org.eclipse.papyrus.common.editor.xtext.umlCommon.util;
> 
>-import java.util.List;
>-
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
>+
>+import org.eclipse.papyrus.common.editor.xtext.umlCommon.*;
> 
> /**
> * 
> * The Switch 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.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage
> * @generated
> */
>-public class UmlCommonSwitch<T> {
>+public class UmlCommonSwitch<T> extends Switch<T>
>+{
>+ /**
>+ * The cached model package
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static UmlCommonPackage modelPackage;
> 
>-	/**
>-	 * The cached model package
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected static UmlCommonPackage modelPackage;
>+ /**
>+ * Creates an instance of the switch.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonSwitch()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = UmlCommonPackage.eINSTANCE;
>+ }
>+ }
> 
>-	/**
>-	 * Creates an instance of the switch.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonSwitch() {
>-		if(modelPackage == null) {
>-			modelPackage = UmlCommonPackage.eINSTANCE;
>-		}
>-	}
>+ /**
>+ * Checks whether this is a switch for the given package.
>+ * 
>+ * 
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
>+ * @generated
>+ */
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
>+ {
>+ return ePackage == modelPackage;
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	public T doSwitch(EObject theEObject) {
>-		return doSwitch(theEObject.eClass(), theEObject);
>-	}
>+ /**
>+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * 
>+ * 
>+ * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @generated
>+ */
>+ @Override
>+ protected T doSwitch(int classifierID, EObject theEObject)
>+ {
>+ switch (classifierID)
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME:
>+ {
>+ QualifiedName qualifiedName = (QualifiedName)theEObject;
>+ T result = caseQualifiedName(qualifiedName);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlCommonPackage.TYPE_RULE:
>+ {
>+ TypeRule typeRule = (TypeRule)theEObject;
>+ T result = caseTypeRule(typeRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlCommonPackage.MULTIPLICITY_RULE:
>+ {
>+ MultiplicityRule multiplicityRule = (MultiplicityRule)theEObject;
>+ T result = caseMultiplicityRule(multiplicityRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlCommonPackage.BOUND_SPECIFICATION:
>+ {
>+ BoundSpecification boundSpecification = (BoundSpecification)theEObject;
>+ T result = caseBoundSpecification(boundSpecification);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ default: return defaultCase(theEObject);
>+ }
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	protected T doSwitch(EClass theEClass, EObject theEObject) {
>-		if(theEClass.eContainer() == modelPackage) {
>-			return doSwitch(theEClass.getClassifierID(), theEObject);
>-		} else {
>-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
>-			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
>-		}
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Qualified Name'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Qualified Name'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseQualifiedName(QualifiedName object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	protected T doSwitch(int classifierID, EObject theEObject) {
>-		switch(classifierID) {
>-		case UmlCommonPackage.QUALIFIED_NAME:
>-		{
>-			QualifiedName qualifiedName = (QualifiedName)theEObject;
>-			T result = caseQualifiedName(qualifiedName);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlCommonPackage.TYPE_RULE:
>-		{
>-			TypeRule typeRule = (TypeRule)theEObject;
>-			T result = caseTypeRule(typeRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlCommonPackage.MULTIPLICITY_RULE:
>-		{
>-			MultiplicityRule multiplicityRule = (MultiplicityRule)theEObject;
>-			T result = caseMultiplicityRule(multiplicityRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlCommonPackage.BOUND_SPECIFICATION:
>-		{
>-			BoundSpecification boundSpecification = (BoundSpecification)theEObject;
>-			T result = caseBoundSpecification(boundSpecification);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		default:
>-			return defaultCase(theEObject);
>-		}
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Type Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Type Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseTypeRule(TypeRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Qualified Name'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Qualified Name'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseQualifiedName(QualifiedName object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Multiplicity Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Multiplicity Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseMultiplicityRule(MultiplicityRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseTypeRule(TypeRule object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Bound Specification'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Bound Specification'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseBoundSpecification(BoundSpecification object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Multiplicity Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Multiplicity Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseMultiplicityRule(MultiplicityRule object) {
>-		return null;
>-	}
>-
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Bound Specification'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Bound Specification'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseBoundSpecification(BoundSpecification object) {
>-		return null;
>-	}
>-
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'EObject'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'EObject'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>-	 * @generated
>-	 */
>-	public T defaultCase(EObject object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch, but this is the last case anyway.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'EObject'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>+ * @generated
>+ */
>+ @Override
>+ public T defaultCase(EObject object)
>+ {
>+ return null;
>+ }
> 
> } //UmlCommonSwitch
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonAdapterFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonAdapterFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/util/UmlCommonAdapterFactory.java	(working copy)
>@@ -8,191 +8,189 @@
> 
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notifier;
>+
> import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
>+
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
>+
>+import org.eclipse.papyrus.common.editor.xtext.umlCommon.*;
> 
> /**
> * 
> * The Adapter Factory for the model.
> * It provides an adapter <code>createXXX</code> method for each class of the model.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage
> * @generated
> */
>-public class UmlCommonAdapterFactory extends AdapterFactoryImpl {
>+public class UmlCommonAdapterFactory extends AdapterFactoryImpl
>+{
>+ /**
>+ * The cached model package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static UmlCommonPackage modelPackage;
> 
>-	/**
>-	 * The cached model package.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected static UmlCommonPackage modelPackage;
>+ /**
>+ * Creates an instance of the adapter factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonAdapterFactory()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = UmlCommonPackage.eINSTANCE;
>+ }
>+ }
> 
>-	/**
>-	 * Creates an instance of the adapter factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonAdapterFactory() {
>-		if(modelPackage == null) {
>-			modelPackage = UmlCommonPackage.eINSTANCE;
>-		}
>-	}
>+ /**
>+ * Returns whether this factory is applicable for the type of the object.
>+ * 
>+ * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>+ * 
>+ * @return whether this factory is applicable for the type of the object.
>+ * @generated
>+ */
>+ @Override
>+ public boolean isFactoryForType(Object object)
>+ {
>+ if (object == modelPackage)
>+ {
>+ return true;
>+ }
>+ if (object instanceof EObject)
>+ {
>+ return ((EObject)object).eClass().getEPackage() == modelPackage;
>+ }
>+ return false;
>+ }
> 
>-	/**
>-	 * Returns whether this factory is applicable for the type of the object.
>-	 * 
>-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>-	 * 
>-	 * 
>-	 * @return whether this factory is applicable for the type of the object.
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean isFactoryForType(Object object) {
>-		if(object == modelPackage) {
>-			return true;
>-		}
>-		if(object instanceof EObject) {
>-			return ((EObject)object).eClass().getEPackage() == modelPackage;
>-		}
>-		return false;
>-	}
>+ /**
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected UmlCommonSwitch<Adapter> modelSwitch =
>+ new UmlCommonSwitch<Adapter>()
>+ {
>+ @Override
>+ public Adapter caseQualifiedName(QualifiedName object)
>+ {
>+ return createQualifiedNameAdapter();
>+ }
>+ @Override
>+ public Adapter caseTypeRule(TypeRule object)
>+ {
>+ return createTypeRuleAdapter();
>+ }
>+ @Override
>+ public Adapter caseMultiplicityRule(MultiplicityRule object)
>+ {
>+ return createMultiplicityRuleAdapter();
>+ }
>+ @Override
>+ public Adapter caseBoundSpecification(BoundSpecification object)
>+ {
>+ return createBoundSpecificationAdapter();
>+ }
>+ @Override
>+ public Adapter defaultCase(EObject object)
>+ {
>+ return createEObjectAdapter();
>+ }
>+ };
> 
>-	/**
>-	 * The switch that delegates to the <code>createXXX</code> methods.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected UmlCommonSwitch<Adapter> modelSwitch = new UmlCommonSwitch<Adapter>() {
>+ /**
>+ * Creates an adapter for the <code>target</code>.
>+ * 
>+ * 
>+ * @param target the object to adapt.
>+ * @return the adapter for the <code>target</code>.
>+ * @generated
>+ */
>+ @Override
>+ public Adapter createAdapter(Notifier target)
>+ {
>+ return modelSwitch.doSwitch((EObject)target);
>+ }
> 
>-		@Override
>-		public Adapter caseQualifiedName(QualifiedName object) {
>-			return createQualifiedNameAdapter();
>-		}
> 
>-		@Override
>-		public Adapter caseTypeRule(TypeRule object) {
>-			return createTypeRuleAdapter();
>-		}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName Qualified Name}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName
>+ * @generated
>+ */
>+ public Adapter createQualifiedNameAdapter()
>+ {
>+ return null;
>+ }
> 
>-		@Override
>-		public Adapter caseMultiplicityRule(MultiplicityRule object) {
>-			return createMultiplicityRuleAdapter();
>-		}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule Type Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>+ * @generated
>+ */
>+ public Adapter createTypeRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-		@Override
>-		public Adapter caseBoundSpecification(BoundSpecification object) {
>-			return createBoundSpecificationAdapter();
>-		}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule Multiplicity Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule
>+ * @generated
>+ */
>+ public Adapter createMultiplicityRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-		@Override
>-		public Adapter defaultCase(EObject object) {
>-			return createEObjectAdapter();
>-		}
>-	};
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification Bound Specification}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification
>+ * @generated
>+ */
>+ public Adapter createBoundSpecificationAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates an adapter for the <code>target</code>.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param target
>-	 * the object to adapt.
>-	 * @return the adapter for the <code>target</code>.
>-	 * @generated
>-	 */
>-	@Override
>-	public Adapter createAdapter(Notifier target) {
>-		return modelSwitch.doSwitch((EObject)target);
>-	}
>-
>-
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName Qualified Name}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName
>-	 * @generated
>-	 */
>-	public Adapter createQualifiedNameAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule Type Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>-	 * @generated
>-	 */
>-	public Adapter createTypeRuleAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule
>-	 * Multiplicity Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule
>-	 * @generated
>-	 */
>-	public Adapter createMultiplicityRuleAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification
>-	 * Bound Specification}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification
>-	 * @generated
>-	 */
>-	public Adapter createBoundSpecificationAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for the default case.
>-	 * 
>-	 * This default implementation returns null.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @generated
>-	 */
>-	public Adapter createEObjectAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for the default case.
>+ * 
>+ * This default implementation returns null.
>+ * 
>+ * @return the new adapter.
>+ * @generated
>+ */
>+ public Adapter createEObjectAdapter()
>+ {
>+ return null;
>+ }
> 
> } //UmlCommonAdapterFactory
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/Direction.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/Direction.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/Direction.java	(working copy)
>@@ -17,266 +17,265 @@
> * A representation of the literals of the enumeration 'Direction',
> * and utility methods for working with them.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getDirection()
> * @model
> * @generated
> */
>-public enum Direction implements Enumerator {
>-	/**
>-	 * The 'IN' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #IN_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	IN(0, "IN", "in"),
>+public enum Direction implements Enumerator
>+{
>+ /**
>+ * The 'IN' literal object.
>+ * 
>+ * 
>+ * @see #IN_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ IN(0, "IN", "in"),
> 
>-	/**
>-	 * The 'OUT' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #OUT_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	OUT(1, "OUT", "out"),
>+ /**
>+ * The 'OUT' literal object.
>+ * 
>+ * 
>+ * @see #OUT_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ OUT(1, "OUT", "out"),
> 
>-	/**
>-	 * The 'INOUT' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #INOUT_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	INOUT(2, "INOUT", "inout"),
>+ /**
>+ * The 'INOUT' literal object.
>+ * 
>+ * 
>+ * @see #INOUT_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ INOUT(2, "INOUT", "inout"),
> 
>-	/**
>-	 * The 'RETURN' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #RETURN_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	RETURN(3, "RETURN", "return");
>+ /**
>+ * The 'RETURN' literal object.
>+ * 
>+ * 
>+ * @see #RETURN_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ RETURN(3, "RETURN", "return");
> 
>-	/**
>-	 * The 'IN' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'IN' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #IN
>-	 * @model literal="in"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int IN_VALUE = 0;
>+ /**
>+ * The 'IN' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'IN' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #IN
>+ * @model literal="in"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int IN_VALUE = 0;
> 
>-	/**
>-	 * The 'OUT' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'OUT' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #OUT
>-	 * @model literal="out"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int OUT_VALUE = 1;
>+ /**
>+ * The 'OUT' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'OUT' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #OUT
>+ * @model literal="out"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int OUT_VALUE = 1;
> 
>-	/**
>-	 * The 'INOUT' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'INOUT' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #INOUT
>-	 * @model literal="inout"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int INOUT_VALUE = 2;
>+ /**
>+ * The 'INOUT' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'INOUT' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #INOUT
>+ * @model literal="inout"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int INOUT_VALUE = 2;
> 
>-	/**
>-	 * The 'RETURN' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'RETURN' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #RETURN
>-	 * @model literal="return"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int RETURN_VALUE = 3;
>+ /**
>+ * The 'RETURN' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'RETURN' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #RETURN
>+ * @model literal="return"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int RETURN_VALUE = 3;
> 
>-	/**
>-	 * An array of all the 'Direction' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static final Direction[] VALUES_ARRAY = new Direction[]{ IN, OUT, INOUT, RETURN, };
>+ /**
>+ * An array of all the 'Direction' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static final Direction[] VALUES_ARRAY =
>+ new Direction[]
>+ {
>+ IN,
>+ OUT,
>+ INOUT,
>+ RETURN,
>+ };
> 
>-	/**
>-	 * A public read-only list of all the 'Direction' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static final List<Direction> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+ /**
>+ * A public read-only list of all the 'Direction' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final List<Direction> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
>-	/**
>-	 * Returns the 'Direction' literal with the specified literal value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static Direction get(String literal) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			Direction result = VALUES_ARRAY[i];
>-			if(result.toString().equals(literal)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Direction' literal with the specified literal value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static Direction get(String literal)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ Direction result = VALUES_ARRAY[i];
>+ if (result.toString().equals(literal))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Direction' literal with the specified name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static Direction getByName(String name) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			Direction result = VALUES_ARRAY[i];
>-			if(result.getName().equals(name)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Direction' literal with the specified name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static Direction getByName(String name)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ Direction result = VALUES_ARRAY[i];
>+ if (result.getName().equals(name))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Direction' literal with the specified integer value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static Direction get(int value) {
>-		switch(value) {
>-		case IN_VALUE:
>-			return IN;
>-		case OUT_VALUE:
>-			return OUT;
>-		case INOUT_VALUE:
>-			return INOUT;
>-		case RETURN_VALUE:
>-			return RETURN;
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Direction' literal with the specified integer value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static Direction get(int value)
>+ {
>+ switch (value)
>+ {
>+ case IN_VALUE: return IN;
>+ case OUT_VALUE: return OUT;
>+ case INOUT_VALUE: return INOUT;
>+ case RETURN_VALUE: return RETURN;
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final int value;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String name;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String literal;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
> 
>-	/**
>-	 * Only this class can construct instances.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private Direction(int value, String name, String literal) {
>-		this.value = value;
>-		this.name = name;
>-		this.literal = literal;
>-	}
>+ /**
>+ * Only this class can construct instances.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private Direction(int value, String name, String literal)
>+ {
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public int getValue() {
>-		return value;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getName() {
>-		return name;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getLiteral() {
>-		return literal;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
> 
>-	/**
>-	 * Returns the literal value of the enumerator, which is its string representation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		return literal;
>-	}
>-
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+ 
> } //Direction
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/UmlCommonPackage.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/UmlCommonPackage.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/UmlCommonPackage.java	(working copy)
>@@ -17,514 +17,458 @@
> * The Package for the model.
> * It contains accessors for the meta objects to represent
> * <ul>
>- * <li>each class,</li>
>- * <li>each feature of each class,</li>
>- * <li>each enum,</li>
>- * <li>and each data type</li>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonFactory
> * @model kind="package"
> * @generated
> */
>-public interface UmlCommonPackage extends EPackage {
>-
>-	/**
>-	 * The package name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNAME = "umlCommon";
>+public interface UmlCommonPackage extends EPackage
>+{
>+ /**
>+ * The package name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNAME = "umlCommon";
> 
>-	/**
>-	 * The package namespace URI.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNS_URI = "http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon";
>+ /**
>+ * The package namespace URI.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_URI = "http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon";
> 
>-	/**
>-	 * The package namespace name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNS_PREFIX = "umlCommon";
>+ /**
>+ * The package namespace name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_PREFIX = "umlCommon";
> 
>-	/**
>-	 * The singleton instance of the package.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	UmlCommonPackage eINSTANCE = org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl.init();
>+ /**
>+ * The singleton instance of the package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ UmlCommonPackage eINSTANCE = org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl.init();
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl Qualified Name}' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getQualifiedName()
>-	 * @generated
>-	 */
>-	int QUALIFIED_NAME = 0;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl Qualified Name}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getQualifiedName()
>+ * @generated
>+ */
>+ int QUALIFIED_NAME = 0;
> 
>-	/**
>-	 * The feature id for the 'Path' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int QUALIFIED_NAME__PATH = 0;
>+ /**
>+ * The feature id for the 'Path' reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int QUALIFIED_NAME__PATH = 0;
> 
>-	/**
>-	 * The feature id for the 'Remaining' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int QUALIFIED_NAME__REMAINING = 1;
>+ /**
>+ * The feature id for the 'Remaining' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int QUALIFIED_NAME__REMAINING = 1;
> 
>-	/**
>-	 * The number of structural features of the 'Qualified Name' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int QUALIFIED_NAME_FEATURE_COUNT = 2;
>+ /**
>+ * The number of structural features of the 'Qualified Name' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int QUALIFIED_NAME_FEATURE_COUNT = 2;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl Type Rule}' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getTypeRule()
>-	 * @generated
>-	 */
>-	int TYPE_RULE = 1;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl Type Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getTypeRule()
>+ * @generated
>+ */
>+ int TYPE_RULE = 1;
> 
>-	/**
>-	 * The feature id for the 'Path' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_RULE__PATH = 0;
>+ /**
>+ * The feature id for the 'Path' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TYPE_RULE__PATH = 0;
> 
>-	/**
>-	 * The feature id for the 'Type' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_RULE__TYPE = 1;
>+ /**
>+ * The feature id for the 'Type' reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TYPE_RULE__TYPE = 1;
> 
>-	/**
>-	 * The number of structural features of the 'Type Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_RULE_FEATURE_COUNT = 2;
>+ /**
>+ * The number of structural features of the 'Type Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TYPE_RULE_FEATURE_COUNT = 2;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl Multiplicity Rule}'
>-	 * class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getMultiplicityRule()
>-	 * @generated
>-	 */
>-	int MULTIPLICITY_RULE = 2;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl Multiplicity Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getMultiplicityRule()
>+ * @generated
>+ */
>+ int MULTIPLICITY_RULE = 2;
> 
>-	/**
>-	 * The feature id for the 'Bounds' containment reference list.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int MULTIPLICITY_RULE__BOUNDS = 0;
>+ /**
>+ * The feature id for the 'Bounds' containment reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MULTIPLICITY_RULE__BOUNDS = 0;
> 
>-	/**
>-	 * The number of structural features of the 'Multiplicity Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int MULTIPLICITY_RULE_FEATURE_COUNT = 1;
>+ /**
>+ * The number of structural features of the 'Multiplicity Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MULTIPLICITY_RULE_FEATURE_COUNT = 1;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl Bound Specification}'
>-	 * class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getBoundSpecification()
>-	 * @generated
>-	 */
>-	int BOUND_SPECIFICATION = 3;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl Bound Specification}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getBoundSpecification()
>+ * @generated
>+ */
>+ int BOUND_SPECIFICATION = 3;
> 
>-	/**
>-	 * The feature id for the 'Value' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int BOUND_SPECIFICATION__VALUE = 0;
>+ /**
>+ * The feature id for the 'Value' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int BOUND_SPECIFICATION__VALUE = 0;
> 
>-	/**
>-	 * The number of structural features of the 'Bound Specification' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int BOUND_SPECIFICATION_FEATURE_COUNT = 1;
>+ /**
>+ * The number of structural features of the 'Bound Specification' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int BOUND_SPECIFICATION_FEATURE_COUNT = 1;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind Visibility Kind}' enum.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getVisibilityKind()
>-	 * @generated
>-	 */
>-	int VISIBILITY_KIND = 4;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind Visibility Kind}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getVisibilityKind()
>+ * @generated
>+ */
>+ int VISIBILITY_KIND = 4;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction Direction}' enum.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getDirection()
>-	 * @generated
>-	 */
>-	int DIRECTION = 5;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction Direction}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getDirection()
>+ * @generated
>+ */
>+ int DIRECTION = 5;
> 
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Qualified Name'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName
>-	 * @generated
>-	 */
>-	EClass getQualifiedName();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName Qualified Name}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Qualified Name'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName
>+ * @generated
>+ */
>+ EClass getQualifiedName();
> 
>-	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath Path}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the reference 'Path'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath()
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 */
>-	EReference getQualifiedName_Path();
>+ /**
>+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath Path}'.
>+ * 
>+ * 
>+ * @return the meta object for the reference 'Path'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath()
>+ * @see #getQualifiedName()
>+ * @generated
>+ */
>+ EReference getQualifiedName_Path();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining
>-	 * Remaining}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Remaining'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining()
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 */
>-	EReference getQualifiedName_Remaining();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining Remaining}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Remaining'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining()
>+ * @see #getQualifiedName()
>+ * @generated
>+ */
>+ EReference getQualifiedName_Remaining();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule Type Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Type Rule'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>-	 * @generated
>-	 */
>-	EClass getTypeRule();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule Type Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Type Rule'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule
>+ * @generated
>+ */
>+ EClass getTypeRule();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath Path}
>-	 * '.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Path'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath()
>-	 * @see #getTypeRule()
>-	 * @generated
>-	 */
>-	EReference getTypeRule_Path();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath Path}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Path'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath()
>+ * @see #getTypeRule()
>+ * @generated
>+ */
>+ EReference getTypeRule_Path();
> 
>-	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType Type}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the reference 'Type'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType()
>-	 * @see #getTypeRule()
>-	 * @generated
>-	 */
>-	EReference getTypeRule_Type();
>+ /**
>+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType Type}'.
>+ * 
>+ * 
>+ * @return the meta object for the reference 'Type'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType()
>+ * @see #getTypeRule()
>+ * @generated
>+ */
>+ EReference getTypeRule_Type();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule Multiplicity Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Multiplicity Rule'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule
>-	 * @generated
>-	 */
>-	EClass getMultiplicityRule();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule Multiplicity Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Multiplicity Rule'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule
>+ * @generated
>+ */
>+ EClass getMultiplicityRule();
> 
>-	/**
>-	 * Returns the meta object for the containment reference list '
>-	 * {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule#getBounds Bounds}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference list 'Bounds'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule#getBounds()
>-	 * @see #getMultiplicityRule()
>-	 * @generated
>-	 */
>-	EReference getMultiplicityRule_Bounds();
>+ /**
>+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule#getBounds Bounds}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference list 'Bounds'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule#getBounds()
>+ * @see #getMultiplicityRule()
>+ * @generated
>+ */
>+ EReference getMultiplicityRule_Bounds();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification Bound Specification}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Bound Specification'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification
>-	 * @generated
>-	 */
>-	EClass getBoundSpecification();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification Bound Specification}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Bound Specification'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification
>+ * @generated
>+ */
>+ EClass getBoundSpecification();
> 
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue Value}
>-	 * '.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Value'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue()
>-	 * @see #getBoundSpecification()
>-	 * @generated
>-	 */
>-	EAttribute getBoundSpecification_Value();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue Value}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Value'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue()
>+ * @see #getBoundSpecification()
>+ * @generated
>+ */
>+ EAttribute getBoundSpecification_Value();
> 
>-	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind Visibility Kind}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for enum 'Visibility Kind'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-	 * @generated
>-	 */
>-	EEnum getVisibilityKind();
>+ /**
>+ * Returns the meta object for enum '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind Visibility Kind}'.
>+ * 
>+ * 
>+ * @return the meta object for enum 'Visibility Kind'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @generated
>+ */
>+ EEnum getVisibilityKind();
> 
>-	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction Direction}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for enum 'Direction'.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>-	 * @generated
>-	 */
>-	EEnum getDirection();
>+ /**
>+ * Returns the meta object for enum '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction Direction}'.
>+ * 
>+ * 
>+ * @return the meta object for enum 'Direction'.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>+ * @generated
>+ */
>+ EEnum getDirection();
> 
>-	/**
>-	 * Returns the factory that creates the instances of the model.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the factory that creates the instances of the model.
>-	 * @generated
>-	 */
>-	UmlCommonFactory getUmlCommonFactory();
>+ /**
>+ * Returns the factory that creates the instances of the model.
>+ * 
>+ * 
>+ * @return the factory that creates the instances of the model.
>+ * @generated
>+ */
>+ UmlCommonFactory getUmlCommonFactory();
> 
>-	/**
>-	 * 
>-	 * Defines literals for the meta objects that represent
>-	 * <ul>
>-	 * <li>each class,</li>
>-	 * <li>each feature of each class,</li>
>-	 * <li>each enum,</li>
>-	 * <li>and each data type</li>
>-	 * </ul>
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	interface Literals {
>+ /**
>+ * 
>+ * Defines literals for the meta objects that represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @generated
>+ */
>+ interface Literals
>+ {
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl Qualified Name}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getQualifiedName()
>+ * @generated
>+ */
>+ EClass QUALIFIED_NAME = eINSTANCE.getQualifiedName();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl Qualified Name}'
>-		 * class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getQualifiedName()
>-		 * @generated
>-		 */
>-		EClass QUALIFIED_NAME = eINSTANCE.getQualifiedName();
>+ /**
>+ * The meta object literal for the 'Path' reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference QUALIFIED_NAME__PATH = eINSTANCE.getQualifiedName_Path();
> 
>-		/**
>-		 * The meta object literal for the 'Path' reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference QUALIFIED_NAME__PATH = eINSTANCE.getQualifiedName_Path();
>+ /**
>+ * The meta object literal for the 'Remaining' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference QUALIFIED_NAME__REMAINING = eINSTANCE.getQualifiedName_Remaining();
> 
>-		/**
>-		 * The meta object literal for the 'Remaining' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference QUALIFIED_NAME__REMAINING = eINSTANCE.getQualifiedName_Remaining();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl Type Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getTypeRule()
>+ * @generated
>+ */
>+ EClass TYPE_RULE = eINSTANCE.getTypeRule();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl Type Rule}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getTypeRule()
>-		 * @generated
>-		 */
>-		EClass TYPE_RULE = eINSTANCE.getTypeRule();
>+ /**
>+ * The meta object literal for the 'Path' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TYPE_RULE__PATH = eINSTANCE.getTypeRule_Path();
> 
>-		/**
>-		 * The meta object literal for the 'Path' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference TYPE_RULE__PATH = eINSTANCE.getTypeRule_Path();
>+ /**
>+ * The meta object literal for the 'Type' reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TYPE_RULE__TYPE = eINSTANCE.getTypeRule_Type();
> 
>-		/**
>-		 * The meta object literal for the 'Type' reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference TYPE_RULE__TYPE = eINSTANCE.getTypeRule_Type();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl Multiplicity Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getMultiplicityRule()
>+ * @generated
>+ */
>+ EClass MULTIPLICITY_RULE = eINSTANCE.getMultiplicityRule();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl
>-		 * Multiplicity Rule}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getMultiplicityRule()
>-		 * @generated
>-		 */
>-		EClass MULTIPLICITY_RULE = eINSTANCE.getMultiplicityRule();
>+ /**
>+ * The meta object literal for the 'Bounds' containment reference list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference MULTIPLICITY_RULE__BOUNDS = eINSTANCE.getMultiplicityRule_Bounds();
> 
>-		/**
>-		 * The meta object literal for the 'Bounds' containment reference list feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference MULTIPLICITY_RULE__BOUNDS = eINSTANCE.getMultiplicityRule_Bounds();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl Bound Specification}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getBoundSpecification()
>+ * @generated
>+ */
>+ EClass BOUND_SPECIFICATION = eINSTANCE.getBoundSpecification();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl
>-		 * Bound Specification}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getBoundSpecification()
>-		 * @generated
>-		 */
>-		EClass BOUND_SPECIFICATION = eINSTANCE.getBoundSpecification();
>+ /**
>+ * The meta object literal for the 'Value' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute BOUND_SPECIFICATION__VALUE = eINSTANCE.getBoundSpecification_Value();
> 
>-		/**
>-		 * The meta object literal for the 'Value' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute BOUND_SPECIFICATION__VALUE = eINSTANCE.getBoundSpecification_Value();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind Visibility Kind}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getVisibilityKind()
>+ * @generated
>+ */
>+ EEnum VISIBILITY_KIND = eINSTANCE.getVisibilityKind();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind Visibility Kind}' enum.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getVisibilityKind()
>-		 * @generated
>-		 */
>-		EEnum VISIBILITY_KIND = eINSTANCE.getVisibilityKind();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction Direction}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getDirection()
>+ * @generated
>+ */
>+ EEnum DIRECTION = eINSTANCE.getDirection();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction Direction}' enum.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>-		 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonPackageImpl#getDirection()
>-		 * @generated
>-		 */
>-		EEnum DIRECTION = eINSTANCE.getDirection();
>-
>-	}
>+ }
> 
> } //UmlCommonPackage
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/BoundSpecificationImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/BoundSpecificationImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/BoundSpecificationImpl.java	(working copy)
>@@ -7,9 +7,12 @@
> package org.eclipse.papyrus.common.editor.xtext.umlCommon.impl;
> 
> import org.eclipse.emf.common.notify.Notification;
>+
> import org.eclipse.emf.ecore.EClass;
>+
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
> 
>@@ -20,158 +23,159 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl#getValue Value}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.BoundSpecificationImpl#getValue Value}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class BoundSpecificationImpl extends MinimalEObjectImpl.Container implements BoundSpecification {
>+public class BoundSpecificationImpl extends MinimalEObjectImpl.Container implements BoundSpecification
>+{
>+ /**
>+ * The default value of the '{@link #getValue() Value}' attribute.
>+ * 
>+ * 
>+ * @see #getValue()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String VALUE_EDEFAULT = null;
> 
>-	/**
>-	 * The default value of the '{@link #getValue() Value}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getValue()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String VALUE_EDEFAULT = null;
>+ /**
>+ * The cached value of the '{@link #getValue() Value}' attribute.
>+ * 
>+ * 
>+ * @see #getValue()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String value = VALUE_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getValue() Value}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getValue()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected String value = VALUE_EDEFAULT;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected BoundSpecificationImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected BoundSpecificationImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlCommonPackage.Literals.BOUND_SPECIFICATION;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlCommonPackage.Literals.BOUND_SPECIFICATION;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getValue()
>+ {
>+ return value;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getValue() {
>-		return value;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setValue(String newValue)
>+ {
>+ String oldValue = value;
>+ value = newValue;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.BOUND_SPECIFICATION__VALUE, oldValue, value));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setValue(String newValue) {
>-		String oldValue = value;
>-		value = newValue;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.BOUND_SPECIFICATION__VALUE, oldValue, value));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>+ return getValue();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>-			return getValue();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>+ setValue((String)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>-			setValue((String)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>+ setValue(VALUE_EDEFAULT);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>-			setValue(VALUE_EDEFAULT);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.BOUND_SPECIFICATION__VALUE:
>-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy()) return super.toString();
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		if(eIsProxy())
>-			return super.toString();
>-
>-		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (value: ");
>-		result.append(value);
>-		result.append(')');
>-		return result.toString();
>-	}
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (value: ");
>+ result.append(value);
>+ result.append(')');
>+ return result.toString();
>+ }
> 
> } //BoundSpecificationImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/MultiplicityRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/MultiplicityRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/MultiplicityRuleImpl.java	(working copy)
>@@ -9,12 +9,17 @@
> import java.util.Collection;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
>+
> import org.eclipse.emf.common.util.EList;
>+
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.InternalEObject;
>+
> import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+
> import org.eclipse.emf.ecore.util.EObjectContainmentEList;
> import org.eclipse.emf.ecore.util.InternalEList;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
>@@ -26,136 +31,141 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl#getBounds Bounds}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.MultiplicityRuleImpl#getBounds Bounds}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class MultiplicityRuleImpl extends MinimalEObjectImpl.Container implements MultiplicityRule {
>+public class MultiplicityRuleImpl extends MinimalEObjectImpl.Container implements MultiplicityRule
>+{
>+ /**
>+ * The cached value of the '{@link #getBounds() Bounds}' containment reference list.
>+ * 
>+ * 
>+ * @see #getBounds()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<BoundSpecification> bounds;
> 
>-	/**
>-	 * The cached value of the '{@link #getBounds() Bounds}' containment reference list.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getBounds()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected EList<BoundSpecification> bounds;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected MultiplicityRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected MultiplicityRuleImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlCommonPackage.Literals.MULTIPLICITY_RULE;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlCommonPackage.Literals.MULTIPLICITY_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<BoundSpecification> getBounds()
>+ {
>+ if (bounds == null)
>+ {
>+ bounds = new EObjectContainmentEList<BoundSpecification>(BoundSpecification.class, this, UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS);
>+ }
>+ return bounds;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EList<BoundSpecification> getBounds() {
>-		if(bounds == null) {
>-			bounds = new EObjectContainmentEList<BoundSpecification>(BoundSpecification.class, this, UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS);
>-		}
>-		return bounds;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>+ return ((InternalEList<?>)getBounds()).basicRemove(otherEnd, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>-		switch(featureID) {
>-		case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>-			return ((InternalEList<?>)getBounds()).basicRemove(otherEnd, msgs);
>-		}
>-		return super.eInverseRemove(otherEnd, featureID, msgs);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>+ return getBounds();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>-			return getBounds();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>+ getBounds().clear();
>+ getBounds().addAll((Collection<? extends BoundSpecification>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@SuppressWarnings("unchecked")
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>-			getBounds().clear();
>-			getBounds().addAll((Collection<? extends BoundSpecification>)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>+ getBounds().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>-			getBounds().clear();
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>-			return bounds != null && !bounds.isEmpty();
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.MULTIPLICITY_RULE__BOUNDS:
>+ return bounds != null && !bounds.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
> } //MultiplicityRuleImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/TypeRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/TypeRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/TypeRuleImpl.java	(working copy)
>@@ -8,13 +8,17 @@
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>+
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.InternalEObject;
>+
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
>+
> import org.eclipse.uml2.uml.Type;
> 
> /**
>@@ -24,235 +28,238 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl#getPath Path}</li>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl#getType Type}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl#getPath Path}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.TypeRuleImpl#getType Type}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class TypeRuleImpl extends MinimalEObjectImpl.Container implements TypeRule {
>+public class TypeRuleImpl extends MinimalEObjectImpl.Container implements TypeRule
>+{
>+ /**
>+ * The cached value of the '{@link #getPath() Path}' containment reference.
>+ * 
>+ * 
>+ * @see #getPath()
>+ * @generated
>+ * @ordered
>+ */
>+ protected QualifiedName path;
> 
>-	/**
>-	 * The cached value of the '{@link #getPath() Path}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getPath()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected QualifiedName path;
>+ /**
>+ * The cached value of the '{@link #getType() Type}' reference.
>+ * 
>+ * 
>+ * @see #getType()
>+ * @generated
>+ * @ordered
>+ */
>+ protected Type type;
> 
>-	/**
>-	 * The cached value of the '{@link #getType() Type}' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getType()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected Type type;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected TypeRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected TypeRuleImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlCommonPackage.Literals.TYPE_RULE;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlCommonPackage.Literals.TYPE_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public QualifiedName getPath()
>+ {
>+ return path;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public QualifiedName getPath() {
>-		return path;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetPath(QualifiedName newPath, NotificationChain msgs)
>+ {
>+ QualifiedName oldPath = path;
>+ path = newPath;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlCommonPackage.TYPE_RULE__PATH, oldPath, newPath);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetPath(QualifiedName newPath, NotificationChain msgs) {
>-		QualifiedName oldPath = path;
>-		path = newPath;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlCommonPackage.TYPE_RULE__PATH, oldPath, newPath);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setPath(QualifiedName newPath)
>+ {
>+ if (newPath != path)
>+ {
>+ NotificationChain msgs = null;
>+ if (path != null)
>+ msgs = ((InternalEObject)path).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.TYPE_RULE__PATH, null, msgs);
>+ if (newPath != null)
>+ msgs = ((InternalEObject)newPath).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.TYPE_RULE__PATH, null, msgs);
>+ msgs = basicSetPath(newPath, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.TYPE_RULE__PATH, newPath, newPath));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setPath(QualifiedName newPath) {
>-		if(newPath != path) {
>-			NotificationChain msgs = null;
>-			if(path != null)
>-				msgs = ((InternalEObject)path).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.TYPE_RULE__PATH, null, msgs);
>-			if(newPath != null)
>-				msgs = ((InternalEObject)newPath).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.TYPE_RULE__PATH, null, msgs);
>-			msgs = basicSetPath(newPath, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.TYPE_RULE__PATH, newPath, newPath));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Type getType()
>+ {
>+ if (type != null && type.eIsProxy())
>+ {
>+ InternalEObject oldType = (InternalEObject)type;
>+ type = (Type)eResolveProxy(oldType);
>+ if (type != oldType)
>+ {
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlCommonPackage.TYPE_RULE__TYPE, oldType, type));
>+ }
>+ }
>+ return type;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Type getType() {
>-		if(type != null && type.eIsProxy()) {
>-			InternalEObject oldType = (InternalEObject)type;
>-			type = (Type)eResolveProxy(oldType);
>-			if(type != oldType) {
>-				if(eNotificationRequired())
>-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlCommonPackage.TYPE_RULE__TYPE, oldType, type));
>-			}
>-		}
>-		return type;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Type basicGetType()
>+ {
>+ return type;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Type basicGetType() {
>-		return type;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setType(Type newType)
>+ {
>+ Type oldType = type;
>+ type = newType;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.TYPE_RULE__TYPE, oldType, type));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setType(Type newType) {
>-		Type oldType = type;
>-		type = newType;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.TYPE_RULE__TYPE, oldType, type));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.TYPE_RULE__PATH:
>+ return basicSetPath(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>-		switch(featureID) {
>-		case UmlCommonPackage.TYPE_RULE__PATH:
>-			return basicSetPath(null, msgs);
>-		}
>-		return super.eInverseRemove(otherEnd, featureID, msgs);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.TYPE_RULE__PATH:
>+ return getPath();
>+ case UmlCommonPackage.TYPE_RULE__TYPE:
>+ if (resolve) return getType();
>+ return basicGetType();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlCommonPackage.TYPE_RULE__PATH:
>-			return getPath();
>-		case UmlCommonPackage.TYPE_RULE__TYPE:
>-			if(resolve)
>-				return getType();
>-			return basicGetType();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.TYPE_RULE__PATH:
>+ setPath((QualifiedName)newValue);
>+ return;
>+ case UmlCommonPackage.TYPE_RULE__TYPE:
>+ setType((Type)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlCommonPackage.TYPE_RULE__PATH:
>-			setPath((QualifiedName)newValue);
>-			return;
>-		case UmlCommonPackage.TYPE_RULE__TYPE:
>-			setType((Type)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.TYPE_RULE__PATH:
>+ setPath((QualifiedName)null);
>+ return;
>+ case UmlCommonPackage.TYPE_RULE__TYPE:
>+ setType((Type)null);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.TYPE_RULE__PATH:
>-			setPath((QualifiedName)null);
>-			return;
>-		case UmlCommonPackage.TYPE_RULE__TYPE:
>-			setType((Type)null);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.TYPE_RULE__PATH:
>-			return path != null;
>-		case UmlCommonPackage.TYPE_RULE__TYPE:
>-			return type != null;
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.TYPE_RULE__PATH:
>+ return path != null;
>+ case UmlCommonPackage.TYPE_RULE__TYPE:
>+ return type != null;
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
> } //TypeRuleImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/UmlCommonFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/UmlCommonFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/UmlCommonFactoryImpl.java	(working copy)
>@@ -10,224 +10,220 @@
> import org.eclipse.emf.ecore.EDataType;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EPackage;
>+
> import org.eclipse.emf.ecore.impl.EFactoryImpl;
>+
> import org.eclipse.emf.ecore.plugin.EcorePlugin;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonFactory;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
>-import org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind;
>+
>+import org.eclipse.papyrus.common.editor.xtext.umlCommon.*;
> 
> /**
> * 
> * An implementation of the model Factory.
> * 
>- * 
> * @generated
> */
>-public class UmlCommonFactoryImpl extends EFactoryImpl implements UmlCommonFactory {
>+public class UmlCommonFactoryImpl extends EFactoryImpl implements UmlCommonFactory
>+{
>+ /**
>+ * Creates the default factory implementation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static UmlCommonFactory init()
>+ {
>+ try
>+ {
>+ UmlCommonFactory theUmlCommonFactory = (UmlCommonFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon"); 
>+ if (theUmlCommonFactory != null)
>+ {
>+ return theUmlCommonFactory;
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ EcorePlugin.INSTANCE.log(exception);
>+ }
>+ return new UmlCommonFactoryImpl();
>+ }
> 
>-	/**
>-	 * Creates the default factory implementation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static UmlCommonFactory init() {
>-		try {
>-			UmlCommonFactory theUmlCommonFactory = (UmlCommonFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/common/editor/xtext/UmlCommon");
>-			if(theUmlCommonFactory != null) {
>-				return theUmlCommonFactory;
>-			}
>-		} catch (Exception exception) {
>-			EcorePlugin.INSTANCE.log(exception);
>-		}
>-		return new UmlCommonFactoryImpl();
>-	}
>+ /**
>+ * Creates an instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonFactoryImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * Creates an instance of the factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonFactoryImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public EObject create(EClass eClass)
>+ {
>+ switch (eClass.getClassifierID())
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME: return createQualifiedName();
>+ case UmlCommonPackage.TYPE_RULE: return createTypeRule();
>+ case UmlCommonPackage.MULTIPLICITY_RULE: return createMultiplicityRule();
>+ case UmlCommonPackage.BOUND_SPECIFICATION: return createBoundSpecification();
>+ default:
>+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public EObject create(EClass eClass) {
>-		switch(eClass.getClassifierID()) {
>-		case UmlCommonPackage.QUALIFIED_NAME:
>-			return createQualifiedName();
>-		case UmlCommonPackage.TYPE_RULE:
>-			return createTypeRule();
>-		case UmlCommonPackage.MULTIPLICITY_RULE:
>-			return createMultiplicityRule();
>-		case UmlCommonPackage.BOUND_SPECIFICATION:
>-			return createBoundSpecification();
>-		default:
>-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object createFromString(EDataType eDataType, String initialValue)
>+ {
>+ switch (eDataType.getClassifierID())
>+ {
>+ case UmlCommonPackage.VISIBILITY_KIND:
>+ return createVisibilityKindFromString(eDataType, initialValue);
>+ case UmlCommonPackage.DIRECTION:
>+ return createDirectionFromString(eDataType, initialValue);
>+ default:
>+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object createFromString(EDataType eDataType, String initialValue) {
>-		switch(eDataType.getClassifierID()) {
>-		case UmlCommonPackage.VISIBILITY_KIND:
>-			return createVisibilityKindFromString(eDataType, initialValue);
>-		case UmlCommonPackage.DIRECTION:
>-			return createDirectionFromString(eDataType, initialValue);
>-		default:
>-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String convertToString(EDataType eDataType, Object instanceValue)
>+ {
>+ switch (eDataType.getClassifierID())
>+ {
>+ case UmlCommonPackage.VISIBILITY_KIND:
>+ return convertVisibilityKindToString(eDataType, instanceValue);
>+ case UmlCommonPackage.DIRECTION:
>+ return convertDirectionToString(eDataType, instanceValue);
>+ default:
>+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String convertToString(EDataType eDataType, Object instanceValue) {
>-		switch(eDataType.getClassifierID()) {
>-		case UmlCommonPackage.VISIBILITY_KIND:
>-			return convertVisibilityKindToString(eDataType, instanceValue);
>-		case UmlCommonPackage.DIRECTION:
>-			return convertDirectionToString(eDataType, instanceValue);
>-		default:
>-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public QualifiedName createQualifiedName()
>+ {
>+ QualifiedNameImpl qualifiedName = new QualifiedNameImpl();
>+ return qualifiedName;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public QualifiedName createQualifiedName() {
>-		QualifiedNameImpl qualifiedName = new QualifiedNameImpl();
>-		return qualifiedName;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TypeRule createTypeRule()
>+ {
>+ TypeRuleImpl typeRule = new TypeRuleImpl();
>+ return typeRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public TypeRule createTypeRule() {
>-		TypeRuleImpl typeRule = new TypeRuleImpl();
>-		return typeRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public MultiplicityRule createMultiplicityRule()
>+ {
>+ MultiplicityRuleImpl multiplicityRule = new MultiplicityRuleImpl();
>+ return multiplicityRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public MultiplicityRule createMultiplicityRule() {
>-		MultiplicityRuleImpl multiplicityRule = new MultiplicityRuleImpl();
>-		return multiplicityRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public BoundSpecification createBoundSpecification()
>+ {
>+ BoundSpecificationImpl boundSpecification = new BoundSpecificationImpl();
>+ return boundSpecification;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public BoundSpecification createBoundSpecification() {
>-		BoundSpecificationImpl boundSpecification = new BoundSpecificationImpl();
>-		return boundSpecification;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue)
>+ {
>+ VisibilityKind result = VisibilityKind.get(initialValue);
>+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+ return result;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue) {
>-		VisibilityKind result = VisibilityKind.get(initialValue);
>-		if(result == null)
>-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>-		return result;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String convertVisibilityKindToString(EDataType eDataType, Object instanceValue)
>+ {
>+ return instanceValue == null ? null : instanceValue.toString();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String convertVisibilityKindToString(EDataType eDataType, Object instanceValue) {
>-		return instanceValue == null ? null : instanceValue.toString();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Direction createDirectionFromString(EDataType eDataType, String initialValue)
>+ {
>+ Direction result = Direction.get(initialValue);
>+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+ return result;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Direction createDirectionFromString(EDataType eDataType, String initialValue) {
>-		Direction result = Direction.get(initialValue);
>-		if(result == null)
>-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>-		return result;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String convertDirectionToString(EDataType eDataType, Object instanceValue)
>+ {
>+ return instanceValue == null ? null : instanceValue.toString();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String convertDirectionToString(EDataType eDataType, Object instanceValue) {
>-		return instanceValue == null ? null : instanceValue.toString();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonPackage getUmlCommonPackage()
>+ {
>+ return (UmlCommonPackage)getEPackage();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonPackage getUmlCommonPackage() {
>-		return (UmlCommonPackage)getEPackage();
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @deprecated
>-	 * @generated
>-	 */
>-	@Deprecated
>-	public static UmlCommonPackage getPackage() {
>-		return UmlCommonPackage.eINSTANCE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @deprecated
>+ * @generated
>+ */
>+ @Deprecated
>+ public static UmlCommonPackage getPackage()
>+ {
>+ return UmlCommonPackage.eINSTANCE;
>+ }
> 
> } //UmlCommonFactoryImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/QualifiedNameImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/QualifiedNameImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/QualifiedNameImpl.java	(working copy)
>@@ -8,12 +8,16 @@
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>+
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.InternalEObject;
>+
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
>+
> import org.eclipse.uml2.uml.Namespace;
> 
> /**
>@@ -23,235 +27,238 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl#getPath Path}</li>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl#getRemaining Remaining}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl#getPath Path}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.QualifiedNameImpl#getRemaining Remaining}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements QualifiedName {
>+public class QualifiedNameImpl extends MinimalEObjectImpl.Container implements QualifiedName
>+{
>+ /**
>+ * The cached value of the '{@link #getPath() Path}' reference.
>+ * 
>+ * 
>+ * @see #getPath()
>+ * @generated
>+ * @ordered
>+ */
>+ protected Namespace path;
> 
>-	/**
>-	 * The cached value of the '{@link #getPath() Path}' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getPath()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected Namespace path;
>+ /**
>+ * The cached value of the '{@link #getRemaining() Remaining}' containment reference.
>+ * 
>+ * 
>+ * @see #getRemaining()
>+ * @generated
>+ * @ordered
>+ */
>+ protected QualifiedName remaining;
> 
>-	/**
>-	 * The cached value of the '{@link #getRemaining() Remaining}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getRemaining()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected QualifiedName remaining;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected QualifiedNameImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected QualifiedNameImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlCommonPackage.Literals.QUALIFIED_NAME;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlCommonPackage.Literals.QUALIFIED_NAME;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Namespace getPath()
>+ {
>+ if (path != null && path.eIsProxy())
>+ {
>+ InternalEObject oldPath = (InternalEObject)path;
>+ path = (Namespace)eResolveProxy(oldPath);
>+ if (path != oldPath)
>+ {
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlCommonPackage.QUALIFIED_NAME__PATH, oldPath, path));
>+ }
>+ }
>+ return path;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Namespace getPath() {
>-		if(path != null && path.eIsProxy()) {
>-			InternalEObject oldPath = (InternalEObject)path;
>-			path = (Namespace)eResolveProxy(oldPath);
>-			if(path != oldPath) {
>-				if(eNotificationRequired())
>-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlCommonPackage.QUALIFIED_NAME__PATH, oldPath, path));
>-			}
>-		}
>-		return path;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Namespace basicGetPath()
>+ {
>+ return path;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Namespace basicGetPath() {
>-		return path;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setPath(Namespace newPath)
>+ {
>+ Namespace oldPath = path;
>+ path = newPath;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.QUALIFIED_NAME__PATH, oldPath, path));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setPath(Namespace newPath) {
>-		Namespace oldPath = path;
>-		path = newPath;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.QUALIFIED_NAME__PATH, oldPath, path));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public QualifiedName getRemaining()
>+ {
>+ return remaining;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public QualifiedName getRemaining() {
>-		return remaining;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetRemaining(QualifiedName newRemaining, NotificationChain msgs)
>+ {
>+ QualifiedName oldRemaining = remaining;
>+ remaining = newRemaining;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlCommonPackage.QUALIFIED_NAME__REMAINING, oldRemaining, newRemaining);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetRemaining(QualifiedName newRemaining, NotificationChain msgs) {
>-		QualifiedName oldRemaining = remaining;
>-		remaining = newRemaining;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlCommonPackage.QUALIFIED_NAME__REMAINING, oldRemaining, newRemaining);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setRemaining(QualifiedName newRemaining)
>+ {
>+ if (newRemaining != remaining)
>+ {
>+ NotificationChain msgs = null;
>+ if (remaining != null)
>+ msgs = ((InternalEObject)remaining).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.QUALIFIED_NAME__REMAINING, null, msgs);
>+ if (newRemaining != null)
>+ msgs = ((InternalEObject)newRemaining).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.QUALIFIED_NAME__REMAINING, null, msgs);
>+ msgs = basicSetRemaining(newRemaining, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.QUALIFIED_NAME__REMAINING, newRemaining, newRemaining));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setRemaining(QualifiedName newRemaining) {
>-		if(newRemaining != remaining) {
>-			NotificationChain msgs = null;
>-			if(remaining != null)
>-				msgs = ((InternalEObject)remaining).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.QUALIFIED_NAME__REMAINING, null, msgs);
>-			if(newRemaining != null)
>-				msgs = ((InternalEObject)newRemaining).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlCommonPackage.QUALIFIED_NAME__REMAINING, null, msgs);
>-			msgs = basicSetRemaining(newRemaining, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlCommonPackage.QUALIFIED_NAME__REMAINING, newRemaining, newRemaining));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>+ return basicSetRemaining(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>-		switch(featureID) {
>-		case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>-			return basicSetRemaining(null, msgs);
>-		}
>-		return super.eInverseRemove(otherEnd, featureID, msgs);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME__PATH:
>+ if (resolve) return getPath();
>+ return basicGetPath();
>+ case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>+ return getRemaining();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlCommonPackage.QUALIFIED_NAME__PATH:
>-			if(resolve)
>-				return getPath();
>-			return basicGetPath();
>-		case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>-			return getRemaining();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME__PATH:
>+ setPath((Namespace)newValue);
>+ return;
>+ case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>+ setRemaining((QualifiedName)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlCommonPackage.QUALIFIED_NAME__PATH:
>-			setPath((Namespace)newValue);
>-			return;
>-		case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>-			setRemaining((QualifiedName)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME__PATH:
>+ setPath((Namespace)null);
>+ return;
>+ case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>+ setRemaining((QualifiedName)null);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.QUALIFIED_NAME__PATH:
>-			setPath((Namespace)null);
>-			return;
>-		case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>-			setRemaining((QualifiedName)null);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlCommonPackage.QUALIFIED_NAME__PATH:
>-			return path != null;
>-		case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>-			return remaining != null;
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlCommonPackage.QUALIFIED_NAME__PATH:
>+ return path != null;
>+ case UmlCommonPackage.QUALIFIED_NAME__REMAINING:
>+ return remaining != null;
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
> } //QualifiedNameImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/UmlCommonPackageImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/UmlCommonPackageImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/impl/UmlCommonPackageImpl.java	(working copy)
>@@ -11,7 +11,9 @@
> import org.eclipse.emf.ecore.EEnum;
> import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EReference;
>+
> import org.eclipse.emf.ecore.impl.EPackageImpl;
>+
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule;
>@@ -20,365 +22,357 @@
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonFactory;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage;
> import org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind;
>+
> import org.eclipse.uml2.uml.UMLPackage;
> 
> /**
> * 
> * An implementation of the model Package.
> * 
>- * 
> * @generated
> */
>-public class UmlCommonPackageImpl extends EPackageImpl implements UmlCommonPackage {
>+public class UmlCommonPackageImpl extends EPackageImpl implements UmlCommonPackage
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass qualifiedNameEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass qualifiedNameEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass typeRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass typeRuleEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass multiplicityRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass multiplicityRuleEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass boundSpecificationEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass boundSpecificationEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EEnum visibilityKindEEnum = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EEnum visibilityKindEEnum = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EEnum directionEEnum = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EEnum directionEEnum = null;
>+ /**
>+ * Creates an instance of the model Package, registered with
>+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+ * package URI value.
>+ * 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.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.ecore.EPackage.Registry
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#eNS_URI
>+ * @see #init()
>+ * @generated
>+ */
>+ private UmlCommonPackageImpl()
>+ {
>+ super(eNS_URI, UmlCommonFactory.eINSTANCE);
>+ }
> 
>-	/**
>-	 * Creates an instance of the model Package, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
>-	 * package
>-	 * package URI value.
>-	 * 
>-	 * 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.  
>-	 * 
>-	 * @see org.eclipse.emf.ecore.EPackage.Registry
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#eNS_URI
>-	 * @see #init()
>-	 * @generated
>-	 */
>-	private UmlCommonPackageImpl() {
>-		super(eNS_URI, UmlCommonFactory.eINSTANCE);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static boolean isInited = false;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static boolean isInited = false;
>+ /**
>+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+ * 
>+ * This method is used to initialize {@link UmlCommonPackage#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
>+ * @see #eNS_URI
>+ * @see #createPackageContents()
>+ * @see #initializePackageContents()
>+ * @generated
>+ */
>+ public static UmlCommonPackage init()
>+ {
>+ if (isInited) return (UmlCommonPackage)EPackage.Registry.INSTANCE.getEPackage(UmlCommonPackage.eNS_URI);
> 
>-	/**
>-	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>-	 * 
>-	 * 
>-	 * This method is used to initialize {@link UmlCommonPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.
>-	 * Instead, they should simply access that field to obtain the package.  
>-	 * 
>-	 * @see #eNS_URI
>-	 * @see #createPackageContents()
>-	 * @see #initializePackageContents()
>-	 * @generated
>-	 */
>-	public static UmlCommonPackage init() {
>-		if(isInited)
>-			return (UmlCommonPackage)EPackage.Registry.INSTANCE.getEPackage(UmlCommonPackage.eNS_URI);
>+ // Obtain or create and register package
>+ UmlCommonPackageImpl theUmlCommonPackage = (UmlCommonPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlCommonPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlCommonPackageImpl());
> 
>-		// Obtain or create and register package
>-		UmlCommonPackageImpl theUmlCommonPackage = (UmlCommonPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlCommonPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlCommonPackageImpl());
>+ isInited = true;
> 
>-		isInited = true;
>+ // Initialize simple dependencies
>+ UMLPackage.eINSTANCE.eClass();
> 
>-		// Initialize simple dependencies
>-		UMLPackage.eINSTANCE.eClass();
>+ // Create package meta-data objects
>+ theUmlCommonPackage.createPackageContents();
> 
>-		// Create package meta-data objects
>-		theUmlCommonPackage.createPackageContents();
>+ // Initialize created meta-data
>+ theUmlCommonPackage.initializePackageContents();
> 
>-		// Initialize created meta-data
>-		theUmlCommonPackage.initializePackageContents();
>+ // Mark meta-data to indicate it can't be changed
>+ theUmlCommonPackage.freeze();
> 
>-		// Mark meta-data to indicate it can't be changed
>-		theUmlCommonPackage.freeze();
>+ 
>+ // Update the registry and return the package
>+ EPackage.Registry.INSTANCE.put(UmlCommonPackage.eNS_URI, theUmlCommonPackage);
>+ return theUmlCommonPackage;
>+ }
> 
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getQualifiedName()
>+ {
>+ return qualifiedNameEClass;
>+ }
> 
>-		// Update the registry and return the package
>-		EPackage.Registry.INSTANCE.put(UmlCommonPackage.eNS_URI, theUmlCommonPackage);
>-		return theUmlCommonPackage;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getQualifiedName_Path()
>+ {
>+ return (EReference)qualifiedNameEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getQualifiedName() {
>-		return qualifiedNameEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getQualifiedName_Remaining()
>+ {
>+ return (EReference)qualifiedNameEClass.getEStructuralFeatures().get(1);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getQualifiedName_Path() {
>-		return (EReference)qualifiedNameEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getTypeRule()
>+ {
>+ return typeRuleEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getQualifiedName_Remaining() {
>-		return (EReference)qualifiedNameEClass.getEStructuralFeatures().get(1);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTypeRule_Path()
>+ {
>+ return (EReference)typeRuleEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getTypeRule() {
>-		return typeRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTypeRule_Type()
>+ {
>+ return (EReference)typeRuleEClass.getEStructuralFeatures().get(1);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getTypeRule_Path() {
>-		return (EReference)typeRuleEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getMultiplicityRule()
>+ {
>+ return multiplicityRuleEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getTypeRule_Type() {
>-		return (EReference)typeRuleEClass.getEStructuralFeatures().get(1);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getMultiplicityRule_Bounds()
>+ {
>+ return (EReference)multiplicityRuleEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getMultiplicityRule() {
>-		return multiplicityRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getBoundSpecification()
>+ {
>+ return boundSpecificationEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getMultiplicityRule_Bounds() {
>-		return (EReference)multiplicityRuleEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getBoundSpecification_Value()
>+ {
>+ return (EAttribute)boundSpecificationEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getBoundSpecification() {
>-		return boundSpecificationEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EEnum getVisibilityKind()
>+ {
>+ return visibilityKindEEnum;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getBoundSpecification_Value() {
>-		return (EAttribute)boundSpecificationEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EEnum getDirection()
>+ {
>+ return directionEEnum;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EEnum getVisibilityKind() {
>-		return visibilityKindEEnum;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlCommonFactory getUmlCommonFactory()
>+ {
>+ return (UmlCommonFactory)getEFactoryInstance();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EEnum getDirection() {
>-		return directionEEnum;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private boolean isCreated = false;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlCommonFactory getUmlCommonFactory() {
>-		return (UmlCommonFactory)getEFactoryInstance();
>-	}
>+ /**
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void createPackageContents()
>+ {
>+ if (isCreated) return;
>+ isCreated = true;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private boolean isCreated = false;
>+ // Create classes and their features
>+ qualifiedNameEClass = createEClass(QUALIFIED_NAME);
>+ createEReference(qualifiedNameEClass, QUALIFIED_NAME__PATH);
>+ createEReference(qualifiedNameEClass, QUALIFIED_NAME__REMAINING);
> 
>-	/**
>-	 * Creates the meta-model objects for the package. This method is
>-	 * guarded to have no affect on any invocation but its first.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void createPackageContents() {
>-		if(isCreated)
>-			return;
>-		isCreated = true;
>+ typeRuleEClass = createEClass(TYPE_RULE);
>+ createEReference(typeRuleEClass, TYPE_RULE__PATH);
>+ createEReference(typeRuleEClass, TYPE_RULE__TYPE);
> 
>-		// Create classes and their features
>-		qualifiedNameEClass = createEClass(QUALIFIED_NAME);
>-		createEReference(qualifiedNameEClass, QUALIFIED_NAME__PATH);
>-		createEReference(qualifiedNameEClass, QUALIFIED_NAME__REMAINING);
>+ multiplicityRuleEClass = createEClass(MULTIPLICITY_RULE);
>+ createEReference(multiplicityRuleEClass, MULTIPLICITY_RULE__BOUNDS);
> 
>-		typeRuleEClass = createEClass(TYPE_RULE);
>-		createEReference(typeRuleEClass, TYPE_RULE__PATH);
>-		createEReference(typeRuleEClass, TYPE_RULE__TYPE);
>+ boundSpecificationEClass = createEClass(BOUND_SPECIFICATION);
>+ createEAttribute(boundSpecificationEClass, BOUND_SPECIFICATION__VALUE);
> 
>-		multiplicityRuleEClass = createEClass(MULTIPLICITY_RULE);
>-		createEReference(multiplicityRuleEClass, MULTIPLICITY_RULE__BOUNDS);
>+ // Create enums
>+ visibilityKindEEnum = createEEnum(VISIBILITY_KIND);
>+ directionEEnum = createEEnum(DIRECTION);
>+ }
> 
>-		boundSpecificationEClass = createEClass(BOUND_SPECIFICATION);
>-		createEAttribute(boundSpecificationEClass, BOUND_SPECIFICATION__VALUE);
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private boolean isInitialized = false;
> 
>-		// Create enums
>-		visibilityKindEEnum = createEEnum(VISIBILITY_KIND);
>-		directionEEnum = createEEnum(DIRECTION);
>-	}
>+ /**
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void initializePackageContents()
>+ {
>+ if (isInitialized) return;
>+ isInitialized = true;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private boolean isInitialized = false;
>+ // Initialize package
>+ setName(eNAME);
>+ setNsPrefix(eNS_PREFIX);
>+ setNsURI(eNS_URI);
> 
>-	/**
>-	 * Complete the initialization of the package and its meta-model. This
>-	 * method is guarded to have no affect on any invocation but its first.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void initializePackageContents() {
>-		if(isInitialized)
>-			return;
>-		isInitialized = true;
>+ // Obtain other dependent packages
>+ UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
> 
>-		// Initialize package
>-		setName(eNAME);
>-		setNsPrefix(eNS_PREFIX);
>-		setNsURI(eNS_URI);
>+ // Create type parameters
> 
>-		// Obtain other dependent packages
>-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
>+ // Set bounds for type parameters
> 
>-		// Create type parameters
>+ // Add supertypes to classes
> 
>-		// Set bounds for type parameters
>+ // Initialize classes and features; add operations and parameters
>+ 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);
> 
>-		// Add supertypes to classes
>+ initEClass(typeRuleEClass, TypeRule.class, "TypeRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEReference(getTypeRule_Path(), this.getQualifiedName(), null, "path", null, 0, 1, TypeRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getTypeRule_Type(), theUMLPackage.getType(), null, "type", null, 0, 1, TypeRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		// Initialize classes and features; add operations and parameters
>-		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);
>+ initEClass(multiplicityRuleEClass, MultiplicityRule.class, "MultiplicityRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEReference(getMultiplicityRule_Bounds(), this.getBoundSpecification(), null, "bounds", null, 0, -1, MultiplicityRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		initEClass(typeRuleEClass, TypeRule.class, "TypeRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEReference(getTypeRule_Path(), this.getQualifiedName(), null, "path", null, 0, 1, TypeRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEReference(getTypeRule_Type(), theUMLPackage.getType(), null, "type", null, 0, 1, TypeRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEClass(boundSpecificationEClass, BoundSpecification.class, "BoundSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getBoundSpecification_Value(), ecorePackage.getEString(), "value", null, 0, 1, BoundSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		initEClass(multiplicityRuleEClass, MultiplicityRule.class, "MultiplicityRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEReference(getMultiplicityRule_Bounds(), this.getBoundSpecification(), null, "bounds", null, 0, -1, MultiplicityRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ // Initialize enums and add enum literals
>+ initEEnum(visibilityKindEEnum, VisibilityKind.class, "VisibilityKind");
>+ addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PUBLIC);
>+ addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PRIVATE);
>+ addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PROTECTED);
>+ addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PACKAGE);
> 
>-		initEClass(boundSpecificationEClass, BoundSpecification.class, "BoundSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEAttribute(getBoundSpecification_Value(), ecorePackage.getEString(), "value", null, 0, 1, BoundSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEEnum(directionEEnum, Direction.class, "Direction");
>+ addEEnumLiteral(directionEEnum, Direction.IN);
>+ addEEnumLiteral(directionEEnum, Direction.OUT);
>+ addEEnumLiteral(directionEEnum, Direction.INOUT);
>+ addEEnumLiteral(directionEEnum, Direction.RETURN);
> 
>-		// Initialize enums and add enum literals
>-		initEEnum(visibilityKindEEnum, VisibilityKind.class, "VisibilityKind");
>-		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PUBLIC);
>-		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PRIVATE);
>-		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PROTECTED);
>-		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PACKAGE);
>-
>-		initEEnum(directionEEnum, Direction.class, "Direction");
>-		addEEnumLiteral(directionEEnum, Direction.IN);
>-		addEEnumLiteral(directionEEnum, Direction.OUT);
>-		addEEnumLiteral(directionEEnum, Direction.INOUT);
>-		addEEnumLiteral(directionEEnum, Direction.RETURN);
>-
>-		// Create resource
>-		createResource(eNS_URI);
>-	}
>+ // Create resource
>+ createResource(eNS_URI);
>+ }
> 
> } //UmlCommonPackageImpl
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/BoundSpecification.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/BoundSpecification.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/BoundSpecification.java	(working copy)
>@@ -12,46 +12,44 @@
> * 
> * A representation of the model object 'Bound Specification'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue Value}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue Value}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getBoundSpecification()
> * @model
> * @generated
> */
>-public interface BoundSpecification extends EObject {
>+public interface BoundSpecification extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Value' attribute.
>+ * 
>+ * 
>+ * If the meaning of the 'Value' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Value' attribute.
>+ * @see #setValue(String)
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getBoundSpecification_Value()
>+ * @model
>+ * @generated
>+ */
>+ String getValue();
> 
>-	/**
>-	 * Returns the value of the 'Value' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Value' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Value' attribute.
>-	 * @see #setValue(String)
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getBoundSpecification_Value()
>-	 * @model
>-	 * @generated
>-	 */
>-	String getValue();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue Value}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Value' attribute.
>-	 * @see #getValue()
>-	 * @generated
>-	 */
>-	void setValue(String value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification#getValue Value}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Value' attribute.
>+ * @see #getValue()
>+ * @generated
>+ */
>+ void setValue(String value);
> 
> } // BoundSpecification
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/VisibilityKind.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/VisibilityKind.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/VisibilityKind.java	(working copy)
>@@ -17,266 +17,265 @@
> * A representation of the literals of the enumeration 'Visibility Kind',
> * and utility methods for working with them.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getVisibilityKind()
> * @model
> * @generated
> */
>-public enum VisibilityKind implements Enumerator {
>-	/**
>-	 * The 'Public' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PUBLIC_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	PUBLIC(0, "public", "+"),
>+public enum VisibilityKind implements Enumerator
>+{
>+ /**
>+ * The 'Public' literal object.
>+ * 
>+ * 
>+ * @see #PUBLIC_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ PUBLIC(0, "public", "+"),
> 
>-	/**
>-	 * The 'Private' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PRIVATE_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	PRIVATE(1, "private", "-"),
>+ /**
>+ * The 'Private' literal object.
>+ * 
>+ * 
>+ * @see #PRIVATE_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ PRIVATE(1, "private", "-"),
> 
>-	/**
>-	 * The 'Protected' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PROTECTED_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	PROTECTED(2, "protected", "#"),
>+ /**
>+ * The 'Protected' literal object.
>+ * 
>+ * 
>+ * @see #PROTECTED_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ PROTECTED(2, "protected", "#"),
> 
>-	/**
>-	 * The 'Package' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PACKAGE_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	PACKAGE(3, "package", "~");
>+ /**
>+ * The 'Package' literal object.
>+ * 
>+ * 
>+ * @see #PACKAGE_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ PACKAGE(3, "package", "~");
> 
>-	/**
>-	 * The 'Public' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'Public' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PUBLIC
>-	 * @model name="public" literal="+"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int PUBLIC_VALUE = 0;
>+ /**
>+ * The 'Public' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'Public' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #PUBLIC
>+ * @model name="public" literal="+"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int PUBLIC_VALUE = 0;
> 
>-	/**
>-	 * The 'Private' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'Private' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PRIVATE
>-	 * @model name="private" literal="-"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int PRIVATE_VALUE = 1;
>+ /**
>+ * The 'Private' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'Private' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #PRIVATE
>+ * @model name="private" literal="-"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int PRIVATE_VALUE = 1;
> 
>-	/**
>-	 * The 'Protected' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'Protected' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PROTECTED
>-	 * @model name="protected" literal="#"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int PROTECTED_VALUE = 2;
>+ /**
>+ * The 'Protected' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'Protected' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #PROTECTED
>+ * @model name="protected" literal="#"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int PROTECTED_VALUE = 2;
> 
>-	/**
>-	 * The 'Package' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'Package' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #PACKAGE
>-	 * @model name="package" literal="~"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int PACKAGE_VALUE = 3;
>+ /**
>+ * The 'Package' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'Package' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #PACKAGE
>+ * @model name="package" literal="~"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int PACKAGE_VALUE = 3;
> 
>-	/**
>-	 * An array of all the 'Visibility Kind' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static final VisibilityKind[] VALUES_ARRAY = new VisibilityKind[]{ PUBLIC, PRIVATE, PROTECTED, PACKAGE, };
>+ /**
>+ * An array of all the 'Visibility Kind' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static final VisibilityKind[] VALUES_ARRAY =
>+ new VisibilityKind[]
>+ {
>+ PUBLIC,
>+ PRIVATE,
>+ PROTECTED,
>+ PACKAGE,
>+ };
> 
>-	/**
>-	 * A public read-only list of all the 'Visibility Kind' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static final List<VisibilityKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+ /**
>+ * A public read-only list of all the 'Visibility Kind' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final List<VisibilityKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
>-	/**
>-	 * Returns the 'Visibility Kind' literal with the specified literal value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static VisibilityKind get(String literal) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			VisibilityKind result = VALUES_ARRAY[i];
>-			if(result.toString().equals(literal)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Visibility Kind' literal with the specified literal value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static VisibilityKind get(String literal)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ VisibilityKind result = VALUES_ARRAY[i];
>+ if (result.toString().equals(literal))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Visibility Kind' literal with the specified name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static VisibilityKind getByName(String name) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			VisibilityKind result = VALUES_ARRAY[i];
>-			if(result.getName().equals(name)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Visibility Kind' literal with the specified name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static VisibilityKind getByName(String name)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ VisibilityKind result = VALUES_ARRAY[i];
>+ if (result.getName().equals(name))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Visibility Kind' literal with the specified integer value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static VisibilityKind get(int value) {
>-		switch(value) {
>-		case PUBLIC_VALUE:
>-			return PUBLIC;
>-		case PRIVATE_VALUE:
>-			return PRIVATE;
>-		case PROTECTED_VALUE:
>-			return PROTECTED;
>-		case PACKAGE_VALUE:
>-			return PACKAGE;
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Visibility Kind' literal with the specified integer value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static VisibilityKind get(int value)
>+ {
>+ switch (value)
>+ {
>+ case PUBLIC_VALUE: return PUBLIC;
>+ case PRIVATE_VALUE: return PRIVATE;
>+ case PROTECTED_VALUE: return PROTECTED;
>+ case PACKAGE_VALUE: return PACKAGE;
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final int value;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String name;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String literal;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
> 
>-	/**
>-	 * Only this class can construct instances.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private VisibilityKind(int value, String name, String literal) {
>-		this.value = value;
>-		this.name = name;
>-		this.literal = literal;
>-	}
>+ /**
>+ * Only this class can construct instances.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private VisibilityKind(int value, String name, String literal)
>+ {
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public int getValue() {
>-		return value;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getName() {
>-		return name;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getLiteral() {
>-		return literal;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
> 
>-	/**
>-	 * Returns the literal value of the enumerator, which is its string representation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		return literal;
>-	}
>-
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+ 
> } //VisibilityKind
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/TypeRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/TypeRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/TypeRule.java	(working copy)
>@@ -7,81 +7,78 @@
> package org.eclipse.papyrus.common.editor.xtext.umlCommon;
> 
> import org.eclipse.emf.ecore.EObject;
>+
> import org.eclipse.uml2.uml.Type;
> 
> /**
> * 
> * A representation of the model object 'Type Rule'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath Path}</li>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType Type}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath Path}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType Type}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getTypeRule()
> * @model
> * @generated
> */
>-public interface TypeRule extends EObject {
>+public interface TypeRule extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Path' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Path' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Path' containment reference.
>+ * @see #setPath(QualifiedName)
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getTypeRule_Path()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ QualifiedName getPath();
> 
>-	/**
>-	 * Returns the value of the 'Path' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Path' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Path' containment reference.
>-	 * @see #setPath(QualifiedName)
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getTypeRule_Path()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	QualifiedName getPath();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath Path}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Path' containment reference.
>+ * @see #getPath()
>+ * @generated
>+ */
>+ void setPath(QualifiedName value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getPath Path}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Path' containment reference.
>-	 * @see #getPath()
>-	 * @generated
>-	 */
>-	void setPath(QualifiedName value);
>+ /**
>+ * Returns the value of the 'Type' reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Type' reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Type' reference.
>+ * @see #setType(Type)
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getTypeRule_Type()
>+ * @model
>+ * @generated
>+ */
>+ Type getType();
> 
>-	/**
>-	 * Returns the value of the 'Type' reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Type' reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Type' reference.
>-	 * @see #setType(Type)
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getTypeRule_Type()
>-	 * @model
>-	 * @generated
>-	 */
>-	Type getType();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType Type}' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Type' reference.
>-	 * @see #getType()
>-	 * @generated
>-	 */
>-	void setType(Type value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.TypeRule#getType Type}' reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Type' reference.
>+ * @see #getType()
>+ * @generated
>+ */
>+ void setType(Type value);
> 
> } // TypeRule
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/QualifiedName.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/QualifiedName.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/QualifiedName.java	(working copy)
>@@ -7,82 +7,78 @@
> package org.eclipse.papyrus.common.editor.xtext.umlCommon;
> 
> import org.eclipse.emf.ecore.EObject;
>+
> import org.eclipse.uml2.uml.Namespace;
> 
> /**
> * 
> * A representation of the model object 'Qualified Name'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath Path}</li>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining Remaining}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath Path}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining Remaining}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getQualifiedName()
> * @model
> * @generated
> */
>-public interface QualifiedName extends EObject {
>+public interface QualifiedName extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Path' reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Path' reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Path' reference.
>+ * @see #setPath(Namespace)
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getQualifiedName_Path()
>+ * @model
>+ * @generated
>+ */
>+ Namespace getPath();
> 
>-	/**
>-	 * Returns the value of the 'Path' reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Path' reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Path' reference.
>-	 * @see #setPath(Namespace)
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getQualifiedName_Path()
>-	 * @model
>-	 * @generated
>-	 */
>-	Namespace getPath();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath Path}' reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Path' reference.
>+ * @see #getPath()
>+ * @generated
>+ */
>+ void setPath(Namespace value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getPath Path}' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Path' reference.
>-	 * @see #getPath()
>-	 * @generated
>-	 */
>-	void setPath(Namespace value);
>+ /**
>+ * Returns the value of the 'Remaining' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Remaining' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Remaining' containment reference.
>+ * @see #setRemaining(QualifiedName)
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getQualifiedName_Remaining()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ QualifiedName getRemaining();
> 
>-	/**
>-	 * Returns the value of the 'Remaining' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Remaining' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Remaining' containment reference.
>-	 * @see #setRemaining(QualifiedName)
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getQualifiedName_Remaining()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	QualifiedName getRemaining();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining Remaining}' containment
>-	 * reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Remaining' containment reference.
>-	 * @see #getRemaining()
>-	 * @generated
>-	 */
>-	void setRemaining(QualifiedName value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.QualifiedName#getRemaining Remaining}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Remaining' containment reference.
>+ * @see #getRemaining()
>+ * @generated
>+ */
>+ void setRemaining(QualifiedName value);
> 
> } // QualifiedName
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/UmlCommonFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/UmlCommonFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/UmlCommonFactory.java	(working copy)
>@@ -13,69 +13,62 @@
> * The Factory for the model.
> * It provides a create method for each non-abstract class of the model.
> * 
>- * 
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage
> * @generated
> */
>-public interface UmlCommonFactory extends EFactory {
>+public interface UmlCommonFactory extends EFactory
>+{
>+ /**
>+ * The singleton instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ UmlCommonFactory eINSTANCE = org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonFactoryImpl.init();
> 
>-	/**
>-	 * The singleton instance of the factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	UmlCommonFactory eINSTANCE = org.eclipse.papyrus.common.editor.xtext.umlCommon.impl.UmlCommonFactoryImpl.init();
>+ /**
>+ * Returns a new object of class 'Qualified Name'.
>+ * 
>+ * 
>+ * @return a new object of class 'Qualified Name'.
>+ * @generated
>+ */
>+ QualifiedName createQualifiedName();
> 
>-	/**
>-	 * Returns a new object of class 'Qualified Name'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Qualified Name'.
>-	 * @generated
>-	 */
>-	QualifiedName createQualifiedName();
>+ /**
>+ * Returns a new object of class 'Type Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Type Rule'.
>+ * @generated
>+ */
>+ TypeRule createTypeRule();
> 
>-	/**
>-	 * Returns a new object of class 'Type Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Type Rule'.
>-	 * @generated
>-	 */
>-	TypeRule createTypeRule();
>+ /**
>+ * Returns a new object of class 'Multiplicity Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Multiplicity Rule'.
>+ * @generated
>+ */
>+ MultiplicityRule createMultiplicityRule();
> 
>-	/**
>-	 * Returns a new object of class 'Multiplicity Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Multiplicity Rule'.
>-	 * @generated
>-	 */
>-	MultiplicityRule createMultiplicityRule();
>+ /**
>+ * Returns a new object of class 'Bound Specification'.
>+ * 
>+ * 
>+ * @return a new object of class 'Bound Specification'.
>+ * @generated
>+ */
>+ BoundSpecification createBoundSpecification();
> 
>-	/**
>-	 * Returns a new object of class 'Bound Specification'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Bound Specification'.
>-	 * @generated
>-	 */
>-	BoundSpecification createBoundSpecification();
>-
>-	/**
>-	 * Returns the package supported by this factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the package supported by this factory.
>-	 * @generated
>-	 */
>-	UmlCommonPackage getUmlCommonPackage();
>+ /**
>+ * Returns the package supported by this factory.
>+ * 
>+ * 
>+ * @return the package supported by this factory.
>+ * @generated
>+ */
>+ UmlCommonPackage getUmlCommonPackage();
> 
> } //UmlCommonFactory
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/MultiplicityRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/MultiplicityRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/umlCommon/MultiplicityRule.java	(working copy)
>@@ -7,40 +7,41 @@
> package org.eclipse.papyrus.common.editor.xtext.umlCommon;
> 
> import org.eclipse.emf.common.util.EList;
>+
> import org.eclipse.emf.ecore.EObject;
> 
> /**
> * 
> * A representation of the model object 'Multiplicity Rule'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule#getBounds Bounds}</li>
>+ * <li>{@link org.eclipse.papyrus.common.editor.xtext.umlCommon.MultiplicityRule#getBounds Bounds}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getMultiplicityRule()
> * @model
> * @generated
> */
>-public interface MultiplicityRule extends EObject {
>-
>-	/**
>-	 * Returns the value of the 'Bounds' containment reference list.
>-	 * The list contents are of type {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Bounds' containment reference list isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Bounds' containment reference list.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getMultiplicityRule_Bounds()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	EList<BoundSpecification> getBounds();
>+public interface MultiplicityRule extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Bounds' containment reference list.
>+ * The list contents are of type {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.BoundSpecification}.
>+ * 
>+ * 
>+ * If the meaning of the 'Bounds' containment reference list isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Bounds' containment reference list.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage#getMultiplicityRule_Bounds()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ EList<BoundSpecification> getBounds();
> 
> } // MultiplicityRule
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.xmi	(working copy)
>@@ -198,6 +198,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -223,6 +224,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/validation/AbstractUmlCommonJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/validation/AbstractUmlCommonJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/validation/AbstractUmlCommonJavaValidator.java	(working copy)
>@@ -1,18 +1,5 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.common.editor.xtext.validation;
>-
>+ 
> import java.util.ArrayList;
> import java.util.List;
> 
>@@ -20,13 +7,13 @@
> import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
> import org.eclipse.xtext.validation.ComposedChecks;
> 
>-@ComposedChecks(validators = { org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class })
>+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlCommonJavaValidator extends AbstractDeclarativeValidator {
> 
> 	@Override
> 	protected List<EPackage> getEPackages() {
>-		List<EPackage> result = new ArrayList<EPackage>();
>-		result.add(org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage.eINSTANCE);
>+	 List<EPackage> result = new ArrayList<EPackage>();
>+	 result.add(org.eclipse.papyrus.common.editor.xtext.umlCommon.UmlCommonPackage.eINSTANCE);
> 		return result;
> 	}
> 
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/AbstractUmlCommonRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/AbstractUmlCommonRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/AbstractUmlCommonRuntimeModule.java	(working copy)
>@@ -14,7 +14,7 @@
> /**
> * Manual modifications go to {org.eclipse.papyrus.common.editor.xtext.UmlCommonRuntimeModule}
> */
>-@SuppressWarnings("all")
>+ @SuppressWarnings("all")
> public abstract class AbstractUmlCommonRuntimeModule extends DefaultRuntimeModule {
> 
> 	protected Properties properties = null;
>@@ -24,16 +24,16 @@
> 		properties = tryBindProperties(binder, "org/eclipse/papyrus/common/editor/xtext/UmlCommon.properties");
> 		super.configure(binder);
> 	}
>-
>+	
> 	public void configureLanguageName(Binder binder) {
> 		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.common.editor.xtext.UmlCommon");
> 	}
>-
>+	
> 	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("umlcommon");
> 	}
>-
>+	
> 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
> 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
> 		return org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess.class;
>@@ -45,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.common.editor.xtext.parser.antlr.UmlCommonParser.class;
> 	}
> 
>@@ -80,8 +80,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
>-	@org.eclipse.xtext.service.SingletonBinding(eager = true)
>-	public Class<? extends org.eclipse.papyrus.common.editor.xtext.validation.UmlCommonJavaValidator> bindUmlCommonJavaValidator() {
>+	@org.eclipse.xtext.service.SingletonBinding(eager=true)	public Class<? extends org.eclipse.papyrus.common.editor.xtext.validation.UmlCommonJavaValidator> bindUmlCommonJavaValidator() {
> 		return org.eclipse.papyrus.common.editor.xtext.validation.UmlCommonJavaValidator.class;
> 	}
> 
>@@ -92,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -100,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>@@ -122,7 +126,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/parseTreeConstruction/UmlCommonParsetreeConstructor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/parseTreeConstruction/UmlCommonParsetreeConstructor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/parseTreeConstruction/UmlCommonParsetreeConstructor.java	(working copy)
>@@ -1,634 +1,576 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.common.editor.xtext.parseTreeConstruction;
> 
>-import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
>-import org.eclipse.xtext.Assignment;
>-import org.eclipse.xtext.Group;
>-import org.eclipse.xtext.Keyword;
>+import org.eclipse.emf.ecore.*;
>+import org.eclipse.xtext.*;
> import org.eclipse.xtext.parsetree.reconstr.IEObjectConsumer;
> import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
> 
>+import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
>+
> import com.google.inject.Inject;
> 
> @SuppressWarnings("all")
> public class UmlCommonParsetreeConstructor extends AbstractParseTreeConstructor {
>-
>+		
> 	@Inject
> 	private UmlCommonGrammarAccess grammarAccess;
>-
>+	
> 	@Override
> 	protected AbstractToken getRootToken(IEObjectConsumer inst) {
>-		return new ThisRootNode(inst);
>+		return new ThisRootNode(inst);	
> 	}
>-
>-	protected class ThisRootNode extends RootToken {
>-
>-		public ThisRootNode(IEObjectConsumer inst) {
>-			super(inst);
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			case 1:
>-				return new TypeRule_Group(this, this, 1, inst);
>-			case 2:
>-				return new MultiplicityRule_Group(this, this, 2, inst);
>-			case 3:
>-				return new BoundSpecification_ValueAssignment(this, this, 3, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+	
>+protected class ThisRootNode extends RootToken {
>+	public ThisRootNode(IEObjectConsumer inst) {
>+		super(inst);
> 	}
>-
>-
>-	/************
>-	 * begin Rule QualifiedName ****************
>-	 * 
>-	 * QualifiedName:
>-	 * path=[uml::Namespace] "::" remaining=QualifiedName?;
>-	 * 
>-	 **/
>-
>-	// path=[uml::Namespace] "::" remaining=QualifiedName?
>-	protected class QualifiedName_Group extends GroupToken {
>-
>-		public QualifiedName_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getGroup();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_RemainingAssignment_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+	
>+	@Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			case 1: return new TypeRule_Group(this, this, 1, inst);
>+			case 2: return new MultiplicityRule_Group(this, this, 2, inst);
>+			case 3: return new BoundSpecification_ValueAssignment(this, this, 3, inst);
>+			default: return null;
>+		}	
>+	}	
>+}
>+	
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getQualifiedNameRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>+/************ begin Rule QualifiedName ****************
>+ *
>+ * QualifiedName:
>+ * 	path=[uml::Namespace] "::" remaining=QualifiedName?;
>+ *
>+ **/
> 
>+// path=[uml::Namespace] "::" remaining=QualifiedName?
>+protected class QualifiedName_Group extends GroupToken {
>+	
>+	public QualifiedName_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// path=[uml::Namespace]
>-	protected class QualifiedName_PathAssignment_0 extends AssignmentToken {
>-
>-		public QualifiedName_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getPathAssignment_0();
>-		}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_RemainingAssignment_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("path", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0().getType().getClassifier())) {
>-					type = AssignmentType.CROSS_REFERENCE;
>-					element = grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0();
>-					return obj;
>-				}
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getQualifiedNameRule().getType().getClassifier())
> 			return null;
>-		}
>-
>+		return eObjectConsumer;
> 	}
> 
>-	// "::"
>-	protected class QualifiedName_ColonColonKeyword_1 extends KeywordToken {
>-
>-		public QualifiedName_ColonColonKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>+// path=[uml::Namespace]
>+protected class QualifiedName_PathAssignment_0 extends AssignmentToken {
>+	
>+	public QualifiedName_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// remaining=QualifiedName?
>-	protected class QualifiedName_RemainingAssignment_2 extends AssignmentToken {
>-
>-		public QualifiedName_RemainingAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getPathAssignment_0();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("remaining", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("remaining");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("path",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0().getType().getClassifier())) {
>+				type = AssignmentType.CROSS_REFERENCE;
>+				element = grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(); 
>+				return obj;
> 			}
> 		}
>+		return null;
> 	}
> 
>-
>-	/************ end Rule QualifiedName ****************/
>+}
> 
>+// "::"
>+protected class QualifiedName_ColonColonKeyword_1 extends KeywordToken {
>+	
>+	public QualifiedName_ColonColonKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1();
>+	}
> 
>-	/************
>-	 * begin Rule TypeRule ****************
>-	 * 
>-	 * TypeRule:
>-	 * path=QualifiedName? type=[uml::Type];
>-	 * 
>-	 **/
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	// path=QualifiedName? type=[uml::Type]
>-	protected class TypeRule_Group extends GroupToken {
>+}
> 
>-		public TypeRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// remaining=QualifiedName?
>+protected class QualifiedName_RemainingAssignment_2 extends AssignmentToken {
>+	
>+	public QualifiedName_RemainingAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getGroup();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_TypeAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("remaining",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("remaining");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getTypeRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+		return null;
> 	}
> 
>-	// path=QualifiedName?
>-	protected class TypeRule_PathAssignment_0 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public TypeRule_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getPathAssignment_0();
>-		}
>+/************ end Rule QualifiedName ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("path", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+/************ begin Rule TypeRule ****************
>+ *
>+ * TypeRule:
>+ * 	path=QualifiedName? type=[uml::Type];
>+ *
>+ **/
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex, index, consumed);
>-			}
>-		}
>+// path=QualifiedName? type=[uml::Type]
>+protected class TypeRule_Group extends GroupToken {
>+	
>+	public TypeRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// type=[uml::Type]
>-	protected class TypeRule_TypeAssignment_1 extends AssignmentToken {
>-
>-		public TypeRule_TypeAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getTypeAssignment_1();
>-		}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index - 1, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_TypeAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("type", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0().getType().getClassifier())) {
>-					type = AssignmentType.CROSS_REFERENCE;
>-					element = grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0();
>-					return obj;
>-				}
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getTypeRuleRule().getType().getClassifier())
> 			return null;
>-		}
>-
>+		return eObjectConsumer;
> 	}
> 
>-
>-	/************ end Rule TypeRule ****************/
>-
>-
>-	/************
>-	 * begin Rule MultiplicityRule ****************
>-	 * 
>-	 * MultiplicityRule:
>-	 * "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>-	 * 
>-	 **/
>-
>-	// "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>-	protected class MultiplicityRule_Group extends GroupToken {
>+}
> 
>-		public MultiplicityRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// path=QualifiedName?
>+protected class TypeRule_PathAssignment_0 extends AssignmentToken {
>+	
>+	public TypeRule_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getPathAssignment_0();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getGroup();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_RightSquareBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("path",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getMultiplicityRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+		return null;
> 	}
> 
>-	// "["
>-	protected class MultiplicityRule_LeftSquareBracketKeyword_0 extends KeywordToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex , index, consumed);
>+		}	
>+	}	
>+}
> 
>-		public MultiplicityRule_LeftSquareBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// type=[uml::Type]
>+protected class TypeRule_TypeAssignment_1 extends AssignmentToken {
>+	
>+	public TypeRule_TypeAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getTypeAssignment_1();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index - 1, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("type",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0().getType().getClassifier())) {
>+				type = AssignmentType.CROSS_REFERENCE;
>+				element = grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0(); 
>+				return obj;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// bounds+=BoundSpecification
>-	protected class MultiplicityRule_BoundsAssignment_1 extends AssignmentToken {
>+}
> 
>-		public MultiplicityRule_BoundsAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1();
>-		}
>+/************ end Rule TypeRule ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("bounds", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+/************ begin Rule MultiplicityRule ****************
>+ *
>+ * MultiplicityRule:
>+ * 	"[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>+ *
>+ **/
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_LeftSquareBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+// "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>+protected class MultiplicityRule_Group extends GroupToken {
>+	
>+	public MultiplicityRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getGroup();
> 	}
> 
>-	// (".." bounds+=BoundSpecification)?
>-	protected class MultiplicityRule_Group_2 extends GroupToken {
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_RightSquareBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		public MultiplicityRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getMultiplicityRuleRule().getType().getClassifier())
>+			return null;
>+		return eObjectConsumer;
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getGroup_2();
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_BoundsAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// "["
>+protected class MultiplicityRule_LeftSquareBracketKeyword_0 extends KeywordToken {
>+	
>+	public MultiplicityRule_LeftSquareBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0();
>+	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
> 	}
> 
>-	// ".."
>-	protected class MultiplicityRule_FullStopFullStopKeyword_2_0 extends KeywordToken {
>+}
> 
>-		public MultiplicityRule_FullStopFullStopKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// bounds+=BoundSpecification
>+protected class MultiplicityRule_BoundsAssignment_1 extends AssignmentToken {
>+	
>+	public MultiplicityRule_BoundsAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("bounds",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// bounds+=BoundSpecification
>-	protected class MultiplicityRule_BoundsAssignment_2_1 extends AssignmentToken {
>-
>-		public MultiplicityRule_BoundsAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new MultiplicityRule_LeftSquareBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1();
>-		}
>+// (".." bounds+=BoundSpecification)?
>+protected class MultiplicityRule_Group_2 extends GroupToken {
>+	
>+	public MultiplicityRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getGroup_2();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_BoundsAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("bounds", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_FullStopFullStopKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+// ".."
>+protected class MultiplicityRule_FullStopFullStopKeyword_2_0 extends KeywordToken {
>+	
>+	public MultiplicityRule_FullStopFullStopKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0();
> 	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	// "]"
>-	protected class MultiplicityRule_RightSquareBracketKeyword_3 extends KeywordToken {
>+}
> 
>-		public MultiplicityRule_RightSquareBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// bounds+=BoundSpecification
>+protected class MultiplicityRule_BoundsAssignment_2_1 extends AssignmentToken {
>+	
>+	public MultiplicityRule_BoundsAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("bounds",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>+		return null;
>+	}
> 
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new MultiplicityRule_FullStopFullStopKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
>+
>+
>+// "]"
>+protected class MultiplicityRule_RightSquareBracketKeyword_3 extends KeywordToken {
>+	
>+	public MultiplicityRule_RightSquareBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3();
> 	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	/************ end Rule MultiplicityRule ****************/
>+}
> 
> 
>-	/************
>-	 * begin Rule BoundSpecification ****************
>-	 * 
>-	 * BoundSpecification:
>-	 * value=UnlimitedLiteral;
>-	 * 
>-	 **/
>+/************ end Rule MultiplicityRule ****************/
> 
>-	// value=UnlimitedLiteral
>-	protected class BoundSpecification_ValueAssignment extends AssignmentToken {
> 
>-		public BoundSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+/************ begin Rule BoundSpecification ****************
>+ *
>+ * BoundSpecification:
>+ * 	value=UnlimitedLiteral;
>+ *
>+ **/
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getBoundSpecificationAccess().getValueAssignment();
>-		}
>+// value=UnlimitedLiteral
>+protected class BoundSpecification_ValueAssignment extends AssignmentToken {
>+	
>+	public BoundSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getBoundSpecificationAccess().getValueAssignment();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getBoundSpecificationRule().getType().getClassifier())
>-				return null;
>-			if((value = eObjectConsumer.getConsumable("value", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>-			if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), value, null)) {
>-				type = AssignmentType.TERMINAL_RULE_CALL;
>-				element = grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0();
>-				return obj;
>-			}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getBoundSpecificationRule().getType().getClassifier())
> 			return null;
>+		if((value = eObjectConsumer.getConsumable("value",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), value, null)) {
>+			type = AssignmentType.TERMINAL_RULE_CALL;
>+			element = grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0();
>+			return obj;
> 		}
>-
>+		return null;
> 	}
> 
>-	/************ end Rule BoundSpecification ****************/
>+}
>+
>+/************ end Rule BoundSpecification ****************/
> 
> }
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -19,9 +19,9 @@
> org.antlr.runtime,
> org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
> org.eclipse.uml2.uml;bundle-version="3.1.1",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0",
> org.eclipse.jface,
>- org.eclipse.ui.ide
>+ org.eclipse.ui.ide,
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j,
> org.eclipse.core.runtime
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
>@@ -36,4 +36,3 @@
> org.eclipse.papyrus.common.editor.xtext.umlCommon.util,
> org.eclipse.papyrus.common.editor.xtext.validation
> Bundle-Localization: plugin
>-
>Index: src/org/eclipse/papyrus/common/editor/xtext/GenerateUmlCommon.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/common/editor/xtext/GenerateUmlCommon.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/common/editor/xtext/GenerateUmlCommon.mwe2	(working copy)
>@@ -84,8 +84,7 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// quickfix API 
>Index: src/org/eclipse/papyrus/common/editor/xtext/validation/UmlCommonJavaValidator.java
>===================================================================
>--- src/org/eclipse/papyrus/common/editor/xtext/validation/UmlCommonJavaValidator.java	(revision 4043)
>+++ src/org/eclipse/papyrus/common/editor/xtext/validation/UmlCommonJavaValidator.java	(working copy)
>@@ -58,7 +58,7 @@
> 				lowerValue = rule.getBounds().get(0).getValue().equals("*") ? -1 : Integer.valueOf(rule.getBounds().get(0).getValue()); //$NON-NLS-1$
> 				upperValue = rule.getBounds().get(1).getValue().equals("*") ? -1 : Integer.valueOf(rule.getBounds().get(1).getValue()); //$NON-NLS-1$
> 				if((lowerValue == -1 && upperValue != -1) || (lowerValue > upperValue && upperValue != -1)) {
>-					error(errorMessage, rule, UmlCommonPackage.BOUND_SPECIFICATION__VALUE);
>+					error(errorMessage, UmlCommonPackage.eINSTANCE.getBoundSpecification_Value());
> 					valid_MultiplicityRule = false;
> 				} else {
> 					valid_MultiplicityRule = true;
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>#P org.eclipse.papyrus.common.editor.xtext.ui
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -139,7 +139,6 @@
> 
> 
> 
>-
> 	
> 	<extension
> 		point="org.eclipse.ui.handlers">
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/internal/UmlCommonActivator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/internal/UmlCommonActivator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/internal/UmlCommonActivator.java	(working copy)
>@@ -3,69 +3,80 @@
> */
> package org.eclipse.papyrus.common.editor.xtext.ui.internal;
> 
>-import java.util.HashMap;
>-import java.util.Map;
>+import static com.google.inject.util.Modules.override;
>+import static com.google.inject.Guice.createInjector;
> 
> import org.apache.log4j.Logger;
>+
> import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.osgi.framework.BundleContext;
> 
>-import com.google.inject.Guice;
> import com.google.inject.Injector;
> import com.google.inject.Module;
>-import com.google.inject.util.Modules;
>+
>+import java.util.Map;
>+import java.util.HashMap;
> 
> /**
>- * Generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlCommonActivator extends AbstractUIPlugin {
> 
>-	private Map<String, Injector> injectors = new HashMap<String, Injector>();
>-
>+	private Map<String,Injector> injectors = new HashMap<String,Injector>();
> 	private static UmlCommonActivator INSTANCE;
> 
> 	public Injector getInjector(String languageName) {
> 		return injectors.get(languageName);
> 	}
>-
>+	
> 	@Override
> 	public void start(BundleContext context) throws Exception {
> 		super.start(context);
> 		INSTANCE = this;
> 		try {
>-
>-			injectors.put("org.eclipse.papyrus.common.editor.xtext.UmlCommon", Guice.createInjector(Modules.override(Modules.override(getRuntimeModule("org.eclipse.papyrus.common.editor.xtext.UmlCommon")).with(getUiModule("org.eclipse.papyrus.common.editor.xtext.UmlCommon"))).with(getSharedStateModule())));
>-
>+			registerInjectorFor("org.eclipse.papyrus.common.editor.xtext.UmlCommon");
>+			
> 		} catch (Exception e) {
> 			Logger.getLogger(getClass()).error(e.getMessage(), e);
> 			throw e;
> 		}
> 	}
>-
>+	
>+	protected void registerInjectorFor(String language) throws Exception {
>+		injectors.put(language, createInjector(
>+		 override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language))));
>+	}
>+	
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		injectors.clear();
>+		INSTANCE = null;
>+		super.stop(context);
>+	}
>+	
> 	public static UmlCommonActivator getInstance() {
> 		return INSTANCE;
> 	}
>-
>+	
> 	protected Module getRuntimeModule(String grammar) {
>-
>-		if("org.eclipse.papyrus.common.editor.xtext.UmlCommon".equals(grammar)) {
>-			return new org.eclipse.papyrus.common.editor.xtext.UmlCommonRuntimeModule();
>+		if ("org.eclipse.papyrus.common.editor.xtext.UmlCommon".equals(grammar)) {
>+		 return new org.eclipse.papyrus.common.editor.xtext.UmlCommonRuntimeModule();
> 		}
>-
>+		
> 		throw new IllegalArgumentException(grammar);
> 	}
>-
>+	
> 	protected Module getUiModule(String grammar) {
>-
>-		if("org.eclipse.papyrus.common.editor.xtext.UmlCommon".equals(grammar)) {
>-			return new org.eclipse.papyrus.common.editor.xtext.ui.UmlCommonUiModule(this);
>+		if ("org.eclipse.papyrus.common.editor.xtext.UmlCommon".equals(grammar)) {
>+		 return new org.eclipse.papyrus.common.editor.xtext.ui.UmlCommonUiModule(this);
> 		}
>-
>+		
> 		throw new IllegalArgumentException(grammar);
> 	}
>-
>+	
> 	protected Module getSharedStateModule() {
> 		return new org.eclipse.xtext.ui.shared.SharedStateModule();
> 	}
>-
>+	
> }
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/AbstractUmlCommonProposalProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/AbstractUmlCommonProposalProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/AbstractUmlCommonProposalProvider.java	(working copy)
>@@ -1,72 +1,59 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.common.editor.xtext.ui.contentassist;
> 
> import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.xtext.Assignment;
>-import org.eclipse.xtext.CrossReference;
>-import org.eclipse.xtext.RuleCall;
>+import org.eclipse.xtext.*;
> import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
>-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
> import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
>+import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
> 
> /**
> * Represents a generated, default implementation of interface {@link IProposalProvider}.
>- * Methods are dynamically dispatched on the first parameter, i.e., you can override them
>- * with a more concrete subtype.
>+ * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
>+ * with a more concrete subtype. 
> */
> @SuppressWarnings("all")
> public class AbstractUmlCommonProposalProvider extends TerminalsProposalProvider {
>-
>+		
> 	public void completeQualifiedName_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeQualifiedName_Remaining(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeTypeRule_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeTypeRule_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeMultiplicityRule_Bounds(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
> 	public void completeBoundSpecification_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
> 	}
>-
>+ 
> 	public void complete_QualifiedName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_TypeRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_VisibilityKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_MultiplicityRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_BoundSpecification(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_UnlimitedLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>-
> 	public void complete_Direction(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
> 		// subclasses may override
> 	}
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g	(working copy)
>@@ -284,7 +284,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.tokens	(working copy)
>@@ -1,6 +1,7 @@
> RULE_ID=4
> RULE_STRING=7
> RULE_UNLIMITEDLITERAL=5
>+T__12=12
> RULE_ANY_OTHER=11
> RULE_INT=6
> RULE_WS=10
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommonParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommonParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommonParser.java	(working copy)
>@@ -1,619 +1,626 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal;
>+package org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal; 
> 
>-import org.antlr.runtime.BitSet;
>-import org.antlr.runtime.RecognitionException;
>-import org.antlr.runtime.TokenStream;
>-import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
>-import org.eclipse.xtext.Grammar;
>+import java.io.InputStream;
>+import org.eclipse.xtext.*;
>+import org.eclipse.xtext.parser.*;
>+import org.eclipse.xtext.parser.impl.*;
>+import org.eclipse.xtext.parsetree.*;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
>-
>-@SuppressWarnings("all")
>-public class InternalUmlCommonParser extends AbstractInternalContentAssistParser {
>-
>-	public static final String[] tokenNames = new String[]{ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'::'" };
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlCommonParser(TokenStream input) {
>-		super(input);
>-	}
>-
>-
>-	public String[] getTokenNames() {
>-		return tokenNames;
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g";
>-	}
>-
>-
>-
>-	private UmlCommonGrammarAccess grammarAccess;
>-
>-	public void setGrammarAccess(UmlCommonGrammarAccess grammarAccess) {
>-		this.grammarAccess = grammarAccess;
>-	}
>-
>-	@Override
>-	protected Grammar getGrammar() {
>-		return grammarAccess.getGrammar();
>-	}
>-
>-	@Override
>-	protected String getValueForTokenName(String tokenName) {
>-		return tokenName;
>-	}
>-
>-
>-
>-
>-	// $ANTLR start entryRuleQualifiedName
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:61:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
>-	public final void entryRuleQualifiedName() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:62:1: ( ruleQualifiedName EOF )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:63:1: ruleQualifiedName EOF
>-			{
>-				before(grammarAccess.getQualifiedNameRule());
>-				pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName61);
>-				ruleQualifiedName();
>-				_fsp--;
>-
>-				after(grammarAccess.getQualifiedNameRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName68);
>-
>-			}
>-
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
>-
>-	// $ANTLR end entryRuleQualifiedName
>-
>-
>-	// $ANTLR start ruleQualifiedName
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:70:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
>-	public final void ruleQualifiedName() throws RecognitionException {
>-
>-		int stackSize = keepStackSize();
>-
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:74:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:75:1: ( ( rule__QualifiedName__Group__0 ) )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:75:1: ( ( rule__QualifiedName__Group__0 ) )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:76:1: ( rule__QualifiedName__Group__0 )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getGroup());
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:77:1: ( rule__QualifiedName__Group__0 )
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:77:2: rule__QualifiedName__Group__0
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName94);
>-						rule__QualifiedName__Group__0();
>-						_fsp--;
>-
>-
>-					}
>-
>-					after(grammarAccess.getQualifiedNameAccess().getGroup());
>-
>-				}
>-
>-
>-			}
>+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
>+import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-	// $ANTLR end ruleQualifiedName
>+@SuppressWarnings("all")
>+public class InternalUmlCommonParser extends AbstractInternalContentAssistParser {
>+ public static final String[] tokenNames = new String[] {
>+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'::'"
>+ };
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__12=12;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>+ // delegates
>+ // delegators
> 
>-	// $ANTLR start entryRuleBoundSpecification
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:93:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
>-	public final void entryRuleBoundSpecification() throws RecognitionException {
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:94:1: ( ruleBoundSpecification EOF )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:95:1: ruleBoundSpecification EOF
>-			{
>-				before(grammarAccess.getBoundSpecificationRule());
>-				pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification125);
>-				ruleBoundSpecification();
>-				_fsp--;
> 
>-				after(grammarAccess.getBoundSpecificationRule());
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleBoundSpecification132);
>+ public InternalUmlCommonParser(TokenStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCommonParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
>+ }
>+ 
> 
>-			}
>+ public String[] getTokenNames() { return InternalUmlCommonParser.tokenNames; }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g"; }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end entryRuleBoundSpecification
>+ 
>+ 	private UmlCommonGrammarAccess grammarAccess;
>+ 	
>+ public void setGrammarAccess(UmlCommonGrammarAccess grammarAccess) {
>+ 	this.grammarAccess = grammarAccess;
>+ }
>+ 
>+ @Override
>+ protected Grammar getGrammar() {
>+ 	return grammarAccess.getGrammar();
>+ }
>+ 
>+ @Override
>+ protected String getValueForTokenName(String tokenName) {
>+ 	return tokenName;
>+ }
> 
> 
>-	// $ANTLR start ruleBoundSpecification
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:102:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
>-	public final void ruleBoundSpecification() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:106:2: ( ( ( rule__BoundSpecification__ValueAssignment ) ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:107:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:107:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:108:1: ( rule__BoundSpecification__ValueAssignment )
>-				{
>-					before(grammarAccess.getBoundSpecificationAccess().getValueAssignment());
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:109:1: ( rule__BoundSpecification__ValueAssignment )
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:109:2: rule__BoundSpecification__ValueAssignment
>-					{
>-						pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification158);
>-						rule__BoundSpecification__ValueAssignment();
>-						_fsp--;
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:61:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
>+ public final void entryRuleQualifiedName() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:62:1: ( ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:63:1: ruleQualifiedName EOF
>+ {
>+ before(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName61);
>+ ruleQualifiedName();
> 
>+ state._fsp--;
> 
>-					}
>+ after(grammarAccess.getQualifiedNameRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName68); 
> 
>-					after(grammarAccess.getBoundSpecificationAccess().getValueAssignment());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleQualifiedName"
> 
> 
>-			}
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:70:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
>+ public final void ruleQualifiedName() throws RecognitionException {
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:74:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:75:1: ( ( rule__QualifiedName__Group__0 ) )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:75:1: ( ( rule__QualifiedName__Group__0 ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:76:1: ( rule__QualifiedName__Group__0 )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getGroup()); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:77:1: ( rule__QualifiedName__Group__0 )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:77:2: rule__QualifiedName__Group__0
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName94);
>+ rule__QualifiedName__Group__0();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end ruleBoundSpecification
>+ }
> 
>+ after(grammarAccess.getQualifiedNameAccess().getGroup()); 
> 
>-	// $ANTLR start rule__QualifiedName__Group__0
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:129:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
>-	public final void rule__QualifiedName__Group__0() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:133:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:134:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0198);
>-				rule__QualifiedName__Group__0__Impl();
>-				_fsp--;
>+ }
> 
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0201);
>-				rule__QualifiedName__Group__1();
>-				_fsp--;
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleQualifiedName"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:93:1: entryRuleBoundSpecification : ruleBoundSpecification EOF ;
>+ public final void entryRuleBoundSpecification() throws RecognitionException {
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:94:1: ( ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:95:1: ruleBoundSpecification EOF
>+ {
>+ before(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification125);
>+ ruleBoundSpecification();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__QualifiedName__Group__0
>+ after(grammarAccess.getBoundSpecificationRule()); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification132); 
> 
>+ }
> 
>-	// $ANTLR start rule__QualifiedName__Group__0__Impl
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:141:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
>-	public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:145:1: ( ( ( rule__QualifiedName__PathAssignment_0 ) ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:146:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:146:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:147:1: ( rule__QualifiedName__PathAssignment_0 )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0());
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:148:1: ( rule__QualifiedName__PathAssignment_0 )
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:148:2: rule__QualifiedName__PathAssignment_0
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl228);
>-						rule__QualifiedName__PathAssignment_0();
>-						_fsp--;
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:102:1: ruleBoundSpecification : ( ( rule__BoundSpecification__ValueAssignment ) ) ;
>+ public final void ruleBoundSpecification() throws RecognitionException {
> 
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:106:2: ( ( ( rule__BoundSpecification__ValueAssignment ) ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:107:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:107:1: ( ( rule__BoundSpecification__ValueAssignment ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:108:1: ( rule__BoundSpecification__ValueAssignment )
>+ {
>+ before(grammarAccess.getBoundSpecificationAccess().getValueAssignment()); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:109:1: ( rule__BoundSpecification__ValueAssignment )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:109:2: rule__BoundSpecification__ValueAssignment
>+ {
>+ pushFollow(FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification158);
>+ rule__BoundSpecification__ValueAssignment();
> 
>-					}
>+ state._fsp--;
> 
>-					after(grammarAccess.getQualifiedNameAccess().getPathAssignment_0());
> 
>-				}
>+ }
> 
>+ after(grammarAccess.getBoundSpecificationAccess().getValueAssignment()); 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__QualifiedName__Group__0__Impl
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "ruleBoundSpecification"
> 
>-	// $ANTLR start rule__QualifiedName__Group__1
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:158:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
>-	public final void rule__QualifiedName__Group__1() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__QualifiedName__Group__0"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:129:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
>+ public final void rule__QualifiedName__Group__0() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:162:1: ( rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:163:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1258);
>-				rule__QualifiedName__Group__1__Impl();
>-				_fsp--;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:133:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:134:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0198);
>+ rule__QualifiedName__Group__0__Impl();
> 
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1261);
>-				rule__QualifiedName__Group__2();
>-				_fsp--;
>+ state._fsp--;
> 
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0201);
>+ rule__QualifiedName__Group__1();
> 
>-			}
>+ state._fsp--;
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR end rule__QualifiedName__Group__1
>+ 	restoreStackSize(stackSize);
> 
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__0"
> 
>-	// $ANTLR start rule__QualifiedName__Group__1__Impl
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:170:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
>-	public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ // $ANTLR start "rule__QualifiedName__Group__0__Impl"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:141:1: rule__QualifiedName__Group__0__Impl : ( ( rule__QualifiedName__PathAssignment_0 ) ) ;
>+ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:174:1: ( ( '::' ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:175:1: ( '::' )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:175:1: ( '::' )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:176:1: '::'
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>-					match(input, 12, FOLLOW_12_in_rule__QualifiedName__Group__1__Impl289);
>-					after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:145:1: ( ( ( rule__QualifiedName__PathAssignment_0 ) ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:146:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:146:1: ( ( rule__QualifiedName__PathAssignment_0 ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:147:1: ( rule__QualifiedName__PathAssignment_0 )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:148:1: ( rule__QualifiedName__PathAssignment_0 )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:148:2: rule__QualifiedName__PathAssignment_0
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl228);
>+ rule__QualifiedName__PathAssignment_0();
> 
>-				}
>+ state._fsp--;
> 
> 
>-			}
>+ }
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ after(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
> 
>-			restoreStackSize(stackSize);
>+ }
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__Group__1__Impl
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	// $ANTLR start rule__QualifiedName__Group__2
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:189:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
>-	public final void rule__QualifiedName__Group__2() throws RecognitionException {
>+ 	restoreStackSize(stackSize);
> 
>-		int stackSize = keepStackSize();
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__0__Impl"
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:193:1: ( rule__QualifiedName__Group__2__Impl )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:194:2: rule__QualifiedName__Group__2__Impl
>-			{
>-				pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2320);
>-				rule__QualifiedName__Group__2__Impl();
>-				_fsp--;
> 
>+ // $ANTLR start "rule__QualifiedName__Group__1"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:158:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 ;
>+ public final void rule__QualifiedName__Group__1() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:162:1: ( rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2 )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:163:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1258);
>+ rule__QualifiedName__Group__1__Impl();
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ state._fsp--;
> 
>-			restoreStackSize(stackSize);
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1261);
>+ rule__QualifiedName__Group__2();
> 
>-		}
>-		return;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end rule__QualifiedName__Group__2
> 
>+ }
> 
>-	// $ANTLR start rule__QualifiedName__Group__2__Impl
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:200:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
>-	public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-		int stackSize = keepStackSize();
>+ 	restoreStackSize(stackSize);
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:204:1: ( ( ( rule__QualifiedName__RemainingAssignment_2 )? ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:205:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:205:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:206:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2());
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:207:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>-					int alt1 = 2;
>-					int LA1_0 = input.LA(1);
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__1"
> 
>-					if((LA1_0 == RULE_ID)) {
>-						alt1 = 1;
>-					}
>-					switch(alt1) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:207:2: rule__QualifiedName__RemainingAssignment_2
>-					{
>-						pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl347);
>-						rule__QualifiedName__RemainingAssignment_2();
>-						_fsp--;
> 
>+ // $ANTLR start "rule__QualifiedName__Group__1__Impl"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:170:1: rule__QualifiedName__Group__1__Impl : ( '::' ) ;
>+ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
> 
>-					}
>-						break;
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:174:1: ( ( '::' ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:175:1: ( '::' )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:175:1: ( '::' )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:176:1: '::'
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
>+ match(input,12,FOLLOW_12_in_rule__QualifiedName__Group__1__Impl289); 
>+ after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
> 
>-					}
>+ }
> 
>-					after(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2());
> 
>-				}
>+ }
> 
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-			}
>+ 	restoreStackSize(stackSize);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__1__Impl"
> 
>-			restoreStackSize(stackSize);
> 
>-		}
>-		return;
>-	}
>+ // $ANTLR start "rule__QualifiedName__Group__2"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:189:1: rule__QualifiedName__Group__2 : rule__QualifiedName__Group__2__Impl ;
>+ public final void rule__QualifiedName__Group__2() throws RecognitionException {
> 
>-	// $ANTLR end rule__QualifiedName__Group__2__Impl
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:193:1: ( rule__QualifiedName__Group__2__Impl )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:194:2: rule__QualifiedName__Group__2__Impl
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2320);
>+ rule__QualifiedName__Group__2__Impl();
> 
>+ state._fsp--;
> 
>-	// $ANTLR start rule__QualifiedName__PathAssignment_0
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:227:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
>-	public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:231:1: ( ( ( RULE_ID ) ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:232:1: ( ( RULE_ID ) )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:232:1: ( ( RULE_ID ) )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:233:1: ( RULE_ID )
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0());
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:234:1: ( RULE_ID )
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:235:1: RULE_ID
>-					{
>-						before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1());
>-						match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_0396);
>-						after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1());
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-					}
>+ 	restoreStackSize(stackSize);
> 
>-					after(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0());
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__2"
> 
>-				}
> 
>+ // $ANTLR start "rule__QualifiedName__Group__2__Impl"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:200:1: rule__QualifiedName__Group__2__Impl : ( ( rule__QualifiedName__RemainingAssignment_2 )? ) ;
>+ public final void rule__QualifiedName__Group__2__Impl() throws RecognitionException {
> 
>-			}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:204:1: ( ( ( rule__QualifiedName__RemainingAssignment_2 )? ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:205:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:205:1: ( ( rule__QualifiedName__RemainingAssignment_2 )? )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:206:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:207:1: ( rule__QualifiedName__RemainingAssignment_2 )?
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
>+ if ( (LA1_0==RULE_ID) ) {
>+ alt1=1;
>+ }
>+ switch (alt1) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:207:2: rule__QualifiedName__RemainingAssignment_2
>+ {
>+ pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl347);
>+ rule__QualifiedName__RemainingAssignment_2();
> 
>-			restoreStackSize(stackSize);
>+ state._fsp--;
> 
>-		}
>-		return;
>-	}
> 
>-	// $ANTLR end rule__QualifiedName__PathAssignment_0
>+ }
>+ break;
> 
>+ }
> 
>-	// $ANTLR start rule__QualifiedName__RemainingAssignment_2
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:246:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
>-	public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
>+ after(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
> 
>-		int stackSize = keepStackSize();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:250:1: ( ( ruleQualifiedName ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:251:1: ( ruleQualifiedName )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:251:1: ( ruleQualifiedName )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:252:1: ruleQualifiedName
>-				{
>-					before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0());
>-					pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_2431);
>-					ruleQualifiedName();
>-					_fsp--;
> 
>-					after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__Group__2__Impl"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "rule__QualifiedName__PathAssignment_0"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:227:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
>+ public final void rule__QualifiedName__PathAssignment_0() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:231:1: ( ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:232:1: ( ( RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:232:1: ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:233:1: ( RULE_ID )
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:234:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:235:1: RULE_ID
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
>+ match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_0396); 
>+ after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
> 
>-	// $ANTLR end rule__QualifiedName__RemainingAssignment_2
>+ }
> 
>+ after(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 
>-	// $ANTLR start rule__BoundSpecification__ValueAssignment
>-	// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:265:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
>-	public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
>+ }
> 
>-		int stackSize = keepStackSize();
> 
>-		try {
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:269:1: ( ( RULE_UNLIMITEDLITERAL ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:270:1: ( RULE_UNLIMITEDLITERAL )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:270:1: ( RULE_UNLIMITEDLITERAL )
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:271:1: RULE_UNLIMITEDLITERAL
>-				{
>-					before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0());
>-					match(input, RULE_UNLIMITEDLITERAL, FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment466);
>-					after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0());
>+ }
> 
>-				}
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>+ 	restoreStackSize(stackSize);
> 
>-			}
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__PathAssignment_0"
> 
>-		} catch (RecognitionException re) {
>-			reportError(re);
>-			recover(input, re);
>-		} finally {
> 
>-			restoreStackSize(stackSize);
>+ // $ANTLR start "rule__QualifiedName__RemainingAssignment_2"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:246:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
>+ public final void rule__QualifiedName__RemainingAssignment_2() throws RecognitionException {
> 
>-		}
>-		return;
>-	}
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:250:1: ( ( ruleQualifiedName ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:251:1: ( ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:251:1: ( ruleQualifiedName )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:252:1: ruleQualifiedName
>+ {
>+ before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_2431);
>+ ruleQualifiedName();
> 
>-	// $ANTLR end rule__BoundSpecification__ValueAssignment
>+ state._fsp--;
> 
>+ after(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 
>+ }
> 
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName61 = new BitSet(new long[]{ 0x0000000000000000L });
>+ }
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName68 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName94 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification125 = new BitSet(new long[]{ 0x0000000000000000L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__QualifiedName__RemainingAssignment_2"
> 
>-	public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification132 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification158 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // $ANTLR start "rule__BoundSpecification__ValueAssignment"
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:265:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
>+ public final void rule__BoundSpecification__ValueAssignment() throws RecognitionException {
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0198 = new BitSet(new long[]{ 0x0000000000001000L });
>+ 		int stackSize = keepStackSize();
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:269:1: ( ( RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:270:1: ( RULE_UNLIMITEDLITERAL )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:270:1: ( RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:271:1: RULE_UNLIMITEDLITERAL
>+ {
>+ before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
>+ match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment466); 
>+ after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0201 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl228 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1258 = new BitSet(new long[]{ 0x0000000000000012L });
>+ }
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1261 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ catch (RecognitionException re) {
>+ reportError(re);
>+ recover(input,re);
>+ }
>+ finally {
> 
>-	public static final BitSet FOLLOW_12_in_rule__QualifiedName__Group__1__Impl289 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 	restoreStackSize(stackSize);
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2320 = new BitSet(new long[]{ 0x0000000000000002L });
>+ }
>+ return ;
>+ }
>+ // $ANTLR end "rule__BoundSpecification__ValueAssignment"
> 
>-	public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl347 = new BitSet(new long[]{ 0x0000000000000002L });
>+ // Delegated rules
> 
>-	public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_0396 = new BitSet(new long[]{ 0x0000000000000002L });
> 
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_2431 = new BitSet(new long[]{ 0x0000000000000002L });
>+ 
> 
>-	public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment466 = new BitSet(new long[]{ 0x0000000000000002L });
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName61 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName68 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName94 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification125 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification132 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__BoundSpecification__ValueAssignment_in_ruleBoundSpecification158 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__0198 = new BitSet(new long[]{0x0000000000001000L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__0201 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl228 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__1258 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__1261 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_12_in_rule__QualifiedName__Group__1__Impl289 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__2320 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl347 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_0396 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_2431 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment466 = new BitSet(new long[]{0x0000000000000002L});
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommonLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommonLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommonLexer.java	(working copy)
>@@ -1,773 +1,855 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.common.editor.xtext.ui.contentassist.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;
>-import org.antlr.runtime.EarlyExitException;
>-import org.antlr.runtime.MismatchedSetException;
>-import org.antlr.runtime.NoViableAltException;
>-import org.antlr.runtime.RecognitionException;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
> 
>-@SuppressWarnings("all")
>-public class InternalUmlCommonLexer extends Lexer {
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int T12 = 12;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int Tokens = 13;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlCommonLexer() {
>-		;
>-	}
>-
>-	public InternalUmlCommonLexer(CharStream input) {
>-		super(input);
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g";
>-	}
> 
>-	// $ANTLR start T12
>-	public final void mT12() throws RecognitionException {
>-		try {
>-			int _type = T12;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:10:5: ( '::' )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:10:7: '::'
>-			{
>-				match("::");
>+import org.antlr.runtime.*;
>+import java.util.Stack;
>+import java.util.List;
>+import java.util.ArrayList;
> 
>-
>-			}
>-
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+@SuppressWarnings("all")
>+public class InternalUmlCommonLexer extends Lexer {
>+ public static final int RULE_ID=4;
>+ public static final int RULE_STRING=7;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__12=12;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
> 
>-	// $ANTLR end T12
>+ // delegates
>+ // delegators
> 
>-	// $ANTLR start RULE_UNLIMITEDLITERAL
>-	public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>-		try {
>-			int _type = RULE_UNLIMITEDLITERAL;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-				int alt2 = 2;
>-				int LA2_0 = input.LA(1);
>+ public InternalUmlCommonLexer() {;} 
>+ public InternalUmlCommonLexer(CharStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlCommonLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
> 
>-				if(((LA2_0 >= '0' && LA2_0 <= '9'))) {
>-					alt2 = 1;
>-				} else if((LA2_0 == '*')) {
>-					alt2 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("281:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g"; }
> 
>-					throw nvae;
>-				}
>-				switch(alt2) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:26: '0' .. '9' ( '0' .. '9' )*
>-				{
>-					matchRange('0', '9');
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:35: ( '0' .. '9' )*
>-					loop1: do {
>-						int alt1 = 2;
>-						int LA1_0 = input.LA(1);
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
>+ try {
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:11:7: ( '::' )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:11:9: '::'
>+ {
>+ match("::"); 
> 
>-						if(((LA1_0 >= '0' && LA1_0 <= '9'))) {
>-							alt1 = 1;
>-						}
> 
>+ }
> 
>-						switch(alt1) {
>-						case 1:
>-							// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:36: '0' .. '9'
>-						{
>-							matchRange('0', '9');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__12"
> 
>-						}
>-							break;
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
>+ public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>+ try {
>+ int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-						default:
>-							break loop1;
>-						}
>-					} while(true);
>+ if ( ((LA2_0>='0' && LA2_0<='9')) ) {
>+ alt2=1;
>+ }
>+ else if ( (LA2_0=='*') ) {
>+ alt2=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>+ throw nvae;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:26: '0' .. '9' ( '0' .. '9' )*
>+ {
>+ matchRange('0','9'); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:35: ( '0' .. '9' )*
>+ loop1:
>+ do {
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:47: '*'
>-				{
>-					match('*');
>+ if ( ((LA1_0>='0' && LA1_0<='9')) ) {
>+ alt1=1;
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ switch (alt1) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:36: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>+ 	 }
>+ 	 break;
> 
>-			}
>+ 	default :
>+ 	 break loop1;
>+ }
>+ } while (true);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_UNLIMITEDLITERAL
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:281:47: '*'
>+ {
>+ match('*'); 
> 
>-	// $ANTLR start RULE_ID
>-	public final void mRULE_ID() throws RecognitionException {
>-		try {
>-			int _type = RULE_ID;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:11: ( '^' )?
>-				int alt3 = 2;
>-				int LA3_0 = input.LA(1);
>+ }
>+ break;
> 
>-				if((LA3_0 == '^')) {
>-					alt3 = 1;
>-				}
>-				switch(alt3) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:11: '^'
>-				{
>-					match('^');
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ }
> 
>-				if((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {
>-					input.consume();
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>-				} else {
>-					MismatchedSetException mse = new MismatchedSetException(null, input);
>-					recover(mse);
>-					throw mse;
>-				}
>+ // $ANTLR start "RULE_ID"
>+ public final void mRULE_ID() throws RecognitionException {
>+ try {
>+ int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:11: ( '^' )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-				loop4: do {
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
>+ if ( (LA3_0=='^') ) {
>+ alt3=1;
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:11: '^'
>+ {
>+ match('^'); 
> 
>-					if(((LA4_0 >= '0' && LA4_0 <= '9') || (LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
>-						alt4 = 1;
>-					}
>+ }
>+ break;
> 
>+ }
> 
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.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();
>+ if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
>+ input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
>+ else {
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:283:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-					}
>-						break;
>+ if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
>+ alt4=1;
>+ }
> 
>-					default:
>-						break loop4;
>-					}
>-				} while(true);
> 
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.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 {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_ID
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR start RULE_INT
>-	public final void mRULE_INT() throws RecognitionException {
>-		try {
>-			int _type = RULE_INT;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:10: ( ( '0' .. '9' )+ )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:12: ( '0' .. '9' )+
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:12: ( '0' .. '9' )+
>-				int cnt5 = 0;
>-				loop5: do {
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
>-					if(((LA5_0 >= '0' && LA5_0 <= '9'))) {
>-						alt5 = 1;
>-					}
> 
>+ }
> 
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:13: '0' .. '9'
>-					{
>-						matchRange('0', '9');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ID"
> 
>-					}
>-						break;
>+ // $ANTLR start "RULE_INT"
>+ public final void mRULE_INT() throws RecognitionException {
>+ try {
>+ int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:12: ( '0' .. '9' )+
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:12: ( '0' .. '9' )+
>+ int cnt5=0;
>+ loop5:
>+ do {
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-					default:
>-						if(cnt5 >= 1)
>-							break loop5;
>-						EarlyExitException eee = new EarlyExitException(5, input);
>-						throw eee;
>-					}
>-					cnt5++;
>-				} while(true);
>+ if ( ((LA5_0>='0' && LA5_0<='9')) ) {
>+ alt5=1;
>+ }
> 
> 
>-			}
>+ switch (alt5) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:285:13: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR end RULE_INT
>+ 	default :
>+ 	 if ( cnt5 >= 1 ) break loop5;
>+ EarlyExitException eee =
>+ new EarlyExitException(5, input);
>+ throw eee;
>+ }
>+ cnt5++;
>+ } while (true);
> 
>-	// $ANTLR start RULE_STRING
>-	public final void mRULE_STRING() throws RecognitionException {
>-		try {
>-			int _type = RULE_STRING;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-				int alt8 = 2;
>-				int LA8_0 = input.LA(1);
> 
>-				if((LA8_0 == '\"')) {
>-					alt8 = 1;
>-				} else if((LA8_0 == '\'')) {
>-					alt8 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("287:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ }
> 
>-					throw nvae;
>-				}
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>-				{
>-					match('\"');
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>-					loop6: do {
>-						int alt6 = 3;
>-						int LA6_0 = input.LA(1);
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_INT"
> 
>-						if((LA6_0 == '\\')) {
>-							alt6 = 1;
>-						} else if(((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '[') || (LA6_0 >= ']' && LA6_0 <= '\uFFFE'))) {
>-							alt6 = 2;
>-						}
>+ // $ANTLR start "RULE_STRING"
>+ public final void mRULE_STRING() throws RecognitionException {
>+ try {
>+ int _type = RULE_STRING;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>+ if ( (LA8_0=='\"') ) {
>+ alt8=1;
>+ }
>+ else if ( (LA8_0=='\'') ) {
>+ alt8=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>-						switch(alt6) {
>-						case 1:
>-							// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:21: '\\\\' ( '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();
>+ throw nvae;
>+ }
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ {
>+ match('\"'); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ loop6:
>+ do {
>+ int alt6=3;
>+ int LA6_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( (LA6_0=='\\') ) {
>+ alt6=1;
>+ }
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
>+ alt6=2;
>+ }
> 
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:62: ~ ( ( '\\\\' | '\"' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ switch (alt6) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-						}
>-							break;
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:66: ~ ( ( '\\\\' | '\"' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-						default:
>-							break loop6;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					match('\"');
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>-				{
>-					match('\'');
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>-					loop7: do {
>-						int alt7 = 3;
>-						int LA7_0 = input.LA(1);
>+ 	 }
>+ 	 break;
> 
>-						if((LA7_0 == '\\')) {
>-							alt7 = 1;
>-						} else if(((LA7_0 >= '\u0000' && LA7_0 <= '&') || (LA7_0 >= '(' && LA7_0 <= '[') || (LA7_0 >= ']' && LA7_0 <= '\uFFFE'))) {
>-							alt7 = 2;
>-						}
>+ 	default :
>+ 	 break loop6;
>+ }
>+ } while (true);
> 
>+ match('\"'); 
> 
>-						switch(alt7) {
>-						case 1:
>-							// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:88: '\\\\' ( '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();
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ {
>+ match('\''); 
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ loop7:
>+ do {
>+ int alt7=3;
>+ int LA7_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( (LA7_0=='\\') ) {
>+ alt7=1;
>+ }
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
>+ alt7=2;
>+ }
> 
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:129: ~ ( ( '\\\\' | '\\'' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ switch (alt7) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-						}
>-							break;
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:287:137: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-						default:
>-							break loop7;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					match('\'');
> 
>-				}
>-					break;
>+ 	 }
>+ 	 break;
> 
>-				}
>+ 	default :
>+ 	 break loop7;
>+ }
>+ } while (true);
> 
>+ match('\''); 
> 
>-			}
>+ }
>+ break;
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end RULE_STRING
> 
>-	// $ANTLR start RULE_ML_COMMENT
>-	public final void mRULE_ML_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_ML_COMMENT;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:19: '/*' ( options {greedy=false; } : . )* '*/'
>-			{
>-				match("/*");
>+ }
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:24: ( options {greedy=false; } : . )*
>-				loop9: do {
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_STRING"
> 
>-					if((LA9_0 == '*')) {
>-						int LA9_1 = input.LA(2);
>+ // $ANTLR start "RULE_ML_COMMENT"
>+ public final void mRULE_ML_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ {
>+ match("/*"); 
> 
>-						if((LA9_1 == '/')) {
>-							alt9 = 2;
>-						} else if(((LA9_1 >= '\u0000' && LA9_1 <= '.') || (LA9_1 >= '0' && LA9_1 <= '\uFFFE'))) {
>-							alt9 = 1;
>-						}
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:24: ( options {greedy=false; } : . )*
>+ loop9:
>+ do {
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>+ if ( (LA9_0=='*') ) {
>+ int LA9_1 = input.LA(2);
> 
>-					} else if(((LA9_0 >= '\u0000' && LA9_0 <= ')') || (LA9_0 >= '+' && LA9_0 <= '\uFFFE'))) {
>-						alt9 = 1;
>-					}
>+ if ( (LA9_1=='/') ) {
>+ alt9=2;
>+ }
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
> 
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:52: .
>-					{
>-						matchAny();
>+ }
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop9;
>-					}
>-				} while(true);
>+ switch (alt9) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:289:52: .
>+ 	 {
>+ 	 matchAny(); 
> 
>-				match("*/");
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop9;
>+ }
>+ } while (true);
> 
>-			}
>+ match("*/"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_ML_COMMENT
>+ }
> 
>-	// $ANTLR start RULE_SL_COMMENT
>-	public final void mRULE_SL_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_SL_COMMENT;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>-			{
>-				match("//");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:24: (~ ( ( '\\n' | '\\r' ) ) )*
>-				loop10: do {
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ // $ANTLR start "RULE_SL_COMMENT"
>+ public final void mRULE_SL_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ {
>+ match("//"); 
> 
>-					if(((LA10_0 >= '\u0000' && LA10_0 <= '\t') || (LA10_0 >= '\u000B' && LA10_0 <= '\f') || (LA10_0 >= '\u000E' && LA10_0 <= '\uFFFE'))) {
>-						alt10 = 1;
>-					}
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ loop10:
>+ do {
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
>+ alt10=1;
>+ }
> 
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291: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) <= '\uFFFE')) {
>-							input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ switch (alt10) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291: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)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop10;
>-					}
>-				} while(true);
>+ 	 }
>+ 	 break;
> 
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:40: ( ( '\\r' )? '\\n' )?
>-				int alt12 = 2;
>-				int LA12_0 = input.LA(1);
>+ 	default :
>+ 	 break loop10;
>+ }
>+ } while (true);
> 
>-				if((LA12_0 == '\n' || LA12_0 == '\r')) {
>-					alt12 = 1;
>-				}
>-				switch(alt12) {
>-				case 1:
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:41: ( '\\r' )? '\\n'
>-				{
>-					// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:41: ( '\\r' )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:40: ( ( '\\r' )? '\\n' )?
>+ int alt12=2;
>+ int LA12_0 = input.LA(1);
> 
>-					if((LA11_0 == '\r')) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:41: '\\r'
>-					{
>-						match('\r');
>+ if ( (LA12_0=='\n'||LA12_0=='\r') ) {
>+ alt12=1;
>+ }
>+ switch (alt12) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:41: ( '\\r' )? '\\n'
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:41: ( '\\r' )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-					}
>-						break;
>+ if ( (LA11_0=='\r') ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:291:41: '\\r'
>+ {
>+ match('\r'); 
> 
>-					}
>+ }
>+ break;
> 
>-					match('\n');
>+ }
> 
>-				}
>-					break;
>+ match('\n'); 
> 
>-				}
>+ }
>+ break;
> 
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end RULE_SL_COMMENT
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>-	// $ANTLR start RULE_WS
>-	public final void mRULE_WS() throws RecognitionException {
>-		try {
>-			int _type = RULE_WS;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:293:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:293:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-			{
>-				// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:293:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-				int cnt13 = 0;
>-				loop13: do {
>-					int alt13 = 2;
>-					int LA13_0 = input.LA(1);
>+ // $ANTLR start "RULE_WS"
>+ public final void mRULE_WS() throws RecognitionException {
>+ try {
>+ int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:293:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:293:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:293:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int cnt13=0;
>+ loop13:
>+ do {
>+ int alt13=2;
>+ int LA13_0 = input.LA(1);
> 
>-					if(((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) {
>-						alt13 = 1;
>-					}
>+ if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
>+ alt13=1;
>+ }
> 
> 
>-					switch(alt13) {
>-					case 1:
>-						// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:
>-					{
>-						if((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
>-							input.consume();
>+ switch (alt13) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:
>+ 	 {
>+ 	 if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
>+ 	 input.consume();
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-					}
>-						break;
>+ 	 }
>+ 	 break;
> 
>-					default:
>-						if(cnt13 >= 1)
>-							break loop13;
>-						EarlyExitException eee = new EarlyExitException(13, input);
>-						throw eee;
>-					}
>-					cnt13++;
>-				} while(true);
>+ 	default :
>+ 	 if ( cnt13 >= 1 ) break loop13;
>+ EarlyExitException eee =
>+ new EarlyExitException(13, input);
>+ throw eee;
>+ }
>+ cnt13++;
>+ } while (true);
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_WS"
> 
>-	// $ANTLR end RULE_WS
>+ // $ANTLR start "RULE_ANY_OTHER"
>+ public final void mRULE_ANY_OTHER() throws RecognitionException {
>+ try {
>+ int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:295:16: ( . )
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:295:18: .
>+ {
>+ matchAny(); 
> 
>-	// $ANTLR start RULE_ANY_OTHER
>-	public final void mRULE_ANY_OTHER() throws RecognitionException {
>-		try {
>-			int _type = RULE_ANY_OTHER;
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:295:16: ( . )
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:295:18: .
>-			{
>-				matchAny();
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ public void mTokens() throws RecognitionException {
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:8: ( T__12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ int alt14=9;
>+ alt14 = dfa14.predict(input);
>+ switch (alt14) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:10: T__12
>+ {
>+ mT__12(); 
> 
>-	// $ANTLR end RULE_ANY_OTHER
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:16: RULE_UNLIMITEDLITERAL
>+ {
>+ mRULE_UNLIMITEDLITERAL(); 
> 
>-	public void mTokens() throws RecognitionException {
>-		// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:8: ( T12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>-		int alt14 = 9;
>-		alt14 = dfa14.predict(input);
>-		switch(alt14) {
>-		case 1:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:10: T12
>-		{
>-			mT12();
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:38: RULE_ID
>+ {
>+ mRULE_ID(); 
> 
>-		}
>-			break;
>-		case 2:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:14: RULE_UNLIMITEDLITERAL
>-		{
>-			mRULE_UNLIMITEDLITERAL();
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:46: RULE_INT
>+ {
>+ mRULE_INT(); 
> 
>-		}
>-			break;
>-		case 3:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:36: RULE_ID
>-		{
>-			mRULE_ID();
>+ }
>+ break;
>+ case 5 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:55: RULE_STRING
>+ {
>+ mRULE_STRING(); 
> 
>-		}
>-			break;
>-		case 4:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:44: RULE_INT
>-		{
>-			mRULE_INT();
>+ }
>+ break;
>+ case 6 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:67: RULE_ML_COMMENT
>+ {
>+ mRULE_ML_COMMENT(); 
> 
>-		}
>-			break;
>-		case 5:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:53: RULE_STRING
>-		{
>-			mRULE_STRING();
>+ }
>+ break;
>+ case 7 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:83: RULE_SL_COMMENT
>+ {
>+ mRULE_SL_COMMENT(); 
> 
>-		}
>-			break;
>-		case 6:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:65: RULE_ML_COMMENT
>-		{
>-			mRULE_ML_COMMENT();
>+ }
>+ break;
>+ case 8 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:99: RULE_WS
>+ {
>+ mRULE_WS(); 
> 
>-		}
>-			break;
>-		case 7:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:81: RULE_SL_COMMENT
>-		{
>-			mRULE_SL_COMMENT();
>+ }
>+ break;
>+ case 9 :
>+ // ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:107: RULE_ANY_OTHER
>+ {
>+ mRULE_ANY_OTHER(); 
> 
>-		}
>-			break;
>-		case 8:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:97: RULE_WS
>-		{
>-			mRULE_WS();
>+ }
>+ break;
> 
>-		}
>-			break;
>-		case 9:
>-			// ../org.eclipse.papyrus.common.editor.xtext.ui/src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/internal/InternalUmlCommon.g:1:105: RULE_ANY_OTHER
>-		{
>-			mRULE_ANY_OTHER();
>+ }
> 
>-		}
>-			break;
>+ }
> 
>-		}
> 
>-	}
>+ protected DFA14 dfa14 = new DFA14(this);
>+ static final String DFA14_eotS =
>+ "\1\uffff\1\12\1\15\1\uffff\1\12\1\uffff\3\12\3\uffff\1\15\6\uffff";
>+ static final String DFA14_eofS =
>+ "\23\uffff";
>+ static final String DFA14_minS =
>+ "\1\0\1\72\1\60\1\uffff\1\101\1\uffff\2\0\1\52\3\uffff\1\60\6\uffff";
>+ static final String DFA14_maxS =
>+ "\1\uffff\1\72\1\71\1\uffff\1\172\1\uffff\2\uffff\1\57\3\uffff\1"+
>+ "\71\6\uffff";
>+ static final String DFA14_acceptS =
>+ "\3\uffff\1\2\1\uffff\1\3\3\uffff\1\10\1\11\1\1\1\uffff\1\2\1\3"+
>+ "\1\5\1\6\1\7\1\10";
>+ static final String DFA14_specialS =
>+ "\1\1\5\uffff\1\2\1\0\13\uffff}>";
>+ static final String[] DFA14_transitionS = {
>+ "\11\12\2\11\2\12\1\11\22\12\1\11\1\12\1\6\4\12\1\7\2\12\1\3"+
>+ "\4\12\1\10\12\2\1\1\6\12\32\5\3\12\1\4\1\5\1\12\32\5\uff85\12",
>+ "\1\13",
>+ "\12\14",
>+ "",
>+ "\32\16\4\uffff\1\16\1\uffff\32\16",
>+ "",
>+ "\0\17",
>+ "\0\17",
>+ "\1\20\4\uffff\1\21",
>+ "",
>+ "",
>+ "",
>+ "\12\14",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ ""
>+ };
> 
>+ static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ static final short[][] DFA14_transition;
> 
>-	protected DFA14 dfa14 = new DFA14(this);
>+ static {
>+ int numStates = DFA14_transitionS.length;
>+ DFA14_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>+ }
>+ }
> 
>-	static final String DFA14_eotS = "\1\uffff\1\12\1\15\1\uffff\1\12\1\uffff\3\12\3\uffff\1\15\6\uffff";
>+ class DFA14 extends DFA {
> 
>-	static final String DFA14_eofS = "\23\uffff";
>+ public DFA14(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 14;
>+ this.eot = DFA14_eot;
>+ this.eof = DFA14_eof;
>+ this.min = DFA14_min;
>+ this.max = DFA14_max;
>+ this.accept = DFA14_accept;
>+ this.special = DFA14_special;
>+ this.transition = DFA14_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_7 = input.LA(1);
> 
>-	static final String DFA14_minS = "\1\0\1\72\1\60\1\uffff\1\101\1\uffff\2\0\1\52\3\uffff\1\60\6\uffff";
>+ s = -1;
>+ if ( ((LA14_7>='\u0000' && LA14_7<='\uFFFF')) ) {s = 15;}
> 
>-	static final String DFA14_maxS = "\1\ufffe\1\72\1\71\1\uffff\1\172\1\uffff\2\ufffe\1\57\3\uffff\1" + "\71\6\uffff";
>+ else s = 10;
> 
>-	static final String DFA14_acceptS = "\3\uffff\1\2\1\uffff\1\3\3\uffff\1\10\1\11\1\1\1\uffff\1\2\1\3\1" + "\5\1\7\1\6\1\10";
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_0 = input.LA(1);
> 
>-	static final String DFA14_specialS = "\23\uffff}>";
>+ s = -1;
>+ if ( (LA14_0==':') ) {s = 1;}
> 
>-	static final String[] DFA14_transitionS = { "\11\12\2\11\2\12\1\11\22\12\1\11\1\12\1\6\4\12\1\7\2\12\1\3" + "\4\12\1\10\12\2\1\1\6\12\32\5\3\12\1\4\1\5\1\12\32\5\uff84\12", "\1\13", "\12\14", "", "\32\16\4\uffff\1\16\1\uffff\32\16", "", "\uffff\17", "\uffff\17", "\1\21\4\uffff\1\20", "", "", "", "\12\14", "", "", "", "", "", "" };
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 2;}
> 
>-	static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ else if ( (LA14_0=='*') ) {s = 3;}
> 
>-	static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ else if ( (LA14_0=='^') ) {s = 4;}
> 
>-	static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')) ) {s = 5;}
> 
>-	static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ else if ( (LA14_0=='\"') ) {s = 6;}
> 
>-	static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ else if ( (LA14_0=='\'') ) {s = 7;}
> 
>-	static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ else if ( (LA14_0=='/') ) {s = 8;}
> 
>-	static final short[][] DFA14_transition;
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 9;}
> 
>-	static {
>-		int numStates = DFA14_transitionS.length;
>-		DFA14_transition = new short[numStates][];
>-		for(int i = 0; i < numStates; i++) {
>-			DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>-		}
>-	}
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='#' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='.')||(LA14_0>=';' && LA14_0<='@')||(LA14_0>='[' && LA14_0<=']')||LA14_0=='`'||(LA14_0>='{' && LA14_0<='\uFFFF')) ) {s = 10;}
> 
>-	class DFA14 extends DFA {
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_6 = input.LA(1);
> 
>-		public DFA14(BaseRecognizer recognizer) {
>-			this.recognizer = recognizer;
>-			this.decisionNumber = 14;
>-			this.eot = DFA14_eot;
>-			this.eof = DFA14_eof;
>-			this.min = DFA14_min;
>-			this.max = DFA14_max;
>-			this.accept = DFA14_accept;
>-			this.special = DFA14_special;
>-			this.transition = DFA14_transition;
>-		}
>+ s = -1;
>+ if ( ((LA14_6>='\u0000' && LA14_6<='\uFFFF')) ) {s = 15;}
> 
>-		public String getDescription() {
>-			return "1:1: Tokens : ( T12 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>-		}
>-	}
>+ else s = 10;
> 
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
>+ 
> 
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/UmlCommonParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/UmlCommonParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/contentassist/antlr/UmlCommonParser.java	(working copy)
>@@ -1,14 +1,13 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr;
> 
> import java.util.Collection;
>-import java.util.HashMap;
> import java.util.Map;
>+import java.util.HashMap;
> 
> import org.antlr.runtime.RecognitionException;
>-import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> import org.eclipse.xtext.AbstractElement;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractContentAssistParser;
> import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
>@@ -16,25 +15,26 @@
> 
> import com.google.inject.Inject;
> 
>-public class UmlCommonParser extends AbstractContentAssistParser {
>+import org.eclipse.papyrus.common.editor.xtext.services.UmlCommonGrammarAccess;
> 
>+public class UmlCommonParser extends AbstractContentAssistParser {
>+	
> 	@Inject
> 	private UmlCommonGrammarAccess grammarAccess;
>-
>+	
> 	private Map<AbstractElement, String> nameMappings;
>-
>+	
> 	@Override
> 	protected org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser createParser() {
> 		org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser result = new org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser(null);
> 		result.setGrammarAccess(grammarAccess);
> 		return result;
> 	}
>-
>+	
> 	@Override
> 	protected String getRuleName(AbstractElement element) {
>-		if(nameMappings == null) {
>+		if (nameMappings == null) {
> 			nameMappings = new HashMap<AbstractElement, String>() {
>-
> 				private static final long serialVersionUID = 1L;
> 				{
> 					put(grammarAccess.getVisibilityKindAccess().getAlternatives(), "rule__VisibilityKind__Alternatives");
>@@ -55,27 +55,27 @@
> 		}
> 		return nameMappings.get(element);
> 	}
>-
>+	
> 	@Override
> 	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
> 		try {
>-			org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser typedParser = (org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser)parser;
>+			org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser typedParser = (org.eclipse.papyrus.common.editor.xtext.ui.contentassist.antlr.internal.InternalUmlCommonParser) parser;
> 			typedParser.entryRuleQualifiedName();
> 			return typedParser.getFollowElements();
>-		} catch (RecognitionException ex) {
>+		} catch(RecognitionException ex) {
> 			throw new RuntimeException(ex);
>-		}
>+		}		
> 	}
>-
>+	
> 	@Override
> 	protected String[] getInitialHiddenTokens() {
>-		return new String[]{ "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
>+		return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
> 	}
>-
>+	
> 	public UmlCommonGrammarAccess getGrammarAccess() {
> 		return this.grammarAccess;
> 	}
>-
>+	
> 	public void setGrammarAccess(UmlCommonGrammarAccess grammarAccess) {
> 		this.grammarAccess = grammarAccess;
> 	}
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/AbstractUmlCommonUiModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/AbstractUmlCommonUiModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/AbstractUmlCommonUiModule.java	(working copy)
>@@ -1,43 +1,34 @@
>+
> /*
> * generated by Xtext
> */
> package org.eclipse.papyrus.common.editor.xtext.ui;
> 
>-import org.eclipse.ui.plugin.AbstractUIPlugin;
> import org.eclipse.xtext.ui.DefaultUiModule;
>+import org.eclipse.ui.plugin.AbstractUIPlugin;
> 
> /**
> * Manual modifications go to {org.eclipse.papyrus.common.editor.xtext.ui.UmlCommonUiModule}
> */
> @SuppressWarnings("all")
> public abstract class AbstractUmlCommonUiModule extends DefaultUiModule {
>-
>+	
> 	public AbstractUmlCommonUiModule(AbstractUIPlugin plugin) {
> 		super(plugin);
> 	}
>-
>-
>+	
>+	
> 	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
> 	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
> 		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
>-		return org.eclipse.xtext.ui.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
> 		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.IDamagerRepairer> bindIDamagerRepairer() {
>-		return org.eclipse.xtext.ui.editor.FastDamagerRepairer.class;
>-	}
>-
>-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
> 	public void configureHighlightingLexer(com.google.inject.Binder binder) {
> 		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.common.editor.xtext.parser.antlr.internal.InternalUmlCommonLexer.class);
> 	}
>@@ -47,9 +38,14 @@
> 		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
>+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
>+		return org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator.Null.class;
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.builderState.ShadowingResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
>@@ -77,14 +73,14 @@
> 		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.common.editor.xtext.ui.labeling.UmlCommonDescriptionLabelProvider.class);
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.TransformerFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.transformer.ISemanticModelTransformer> bindISemanticModelTransformer() {
>-		return org.eclipse.papyrus.common.editor.xtext.ui.outline.UmlCommonTransformer.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
>+		return org.eclipse.papyrus.common.editor.xtext.ui.outline.UmlCommonOutlineTreeProvider.class;
> 	}
> 
>-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineNodeAdapterFactoryFragment
>-	public Class<? extends org.eclipse.xtext.ui.editor.outline.actions.IContentOutlineNodeAdapterFactory> bindIContentOutlineNodeAdapterFactory() {
>-		return org.eclipse.papyrus.common.editor.xtext.ui.outline.UmlCommonOutlineNodeAdapterFactory.class;
>+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
>+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
>+		return org.eclipse.papyrus.common.editor.xtext.ui.outline.UmlCommonOutlineTreeProvider.class;
> 	}
> 
> 	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
>Index: src-gen/org/eclipse/papyrus/common/editor/xtext/ui/UmlCommonExecutableExtensionFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/common/editor/xtext/ui/UmlCommonExecutableExtensionFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/common/editor/xtext/ui/UmlCommonExecutableExtensionFactory.java	(working copy)
>@@ -1,7 +1,6 @@
> /*
> * generated by Xtext
> */
>-
> package org.eclipse.papyrus.common.editor.xtext.ui;
> 
> import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
>@@ -10,7 +9,8 @@
> import com.google.inject.Injector;
> 
> /**
>- * @generated
>+ * This class was generated. Customizations should only happen in a newly
>+ * introduced subclass. 
> */
> public class UmlCommonExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
> 
>@@ -18,10 +18,10 @@
> 	protected Bundle getBundle() {
> 		return org.eclipse.papyrus.common.editor.xtext.ui.internal.UmlCommonActivator.getInstance().getBundle();
> 	}
>-
>+	
> 	@Override
> 	protected Injector getInjector() {
> 		return org.eclipse.papyrus.common.editor.xtext.ui.internal.UmlCommonActivator.getInstance().getInjector("org.eclipse.papyrus.common.editor.xtext.UmlCommon");
> 	}
>-
>+	
> }
>Index: src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonOutlineNodeAdapterFactory.java
>===================================================================
>--- src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonOutlineNodeAdapterFactory.java	(revision 4043)
>+++ src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonOutlineNodeAdapterFactory.java	(working copy)
>@@ -1,21 +0,0 @@
>-/*
>- * generated by Xtext
>- */
>-package org.eclipse.papyrus.common.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
>-
>-public class UmlCommonOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
>-
>-	private static final Class<?>[] types = {
>-	// provide list of classes to adapt to, e.g.:
>-	// Entity.class
>-	// Service.class
>-	};
>-
>-	@Override
>-	public Class<?>[] getAdapterList() {
>-		return types;
>-	}
>-
>-}
>Index: src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonTransformer.java
>===================================================================
>--- src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonTransformer.java	(revision 4043)
>+++ src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonTransformer.java	(working copy)
>@@ -1,14 +0,0 @@
>-/*
>- * generated by Xtext
>- */
>-package org.eclipse.papyrus.common.editor.xtext.ui.outline;
>-
>-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
>-
>-/**
>- * customization of the default outline structure
>- * 
>- */
>-public class UmlCommonTransformer extends AbstractDeclarativeSemanticModelTransformer {
>-
>-}
>Index: src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonOutlineTreeProvider.java
>===================================================================
>--- src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonOutlineTreeProvider.java	(revision 0)
>+++ src/org/eclipse/papyrus/common/editor/xtext/ui/outline/UmlCommonOutlineTreeProvider.java	(revision 0)
>@@ -0,0 +1,14 @@
>+/*
>+* generated by Xtext
>+*/
>+package org.eclipse.papyrus.common.editor.xtext.ui.outline;
>+
>+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
>+
>+/**
>+ * customization of the default outline structure
>+ * 
>+ */
>+public class UmlCommonOutlineTreeProvider extends DefaultOutlineTreeProvider {
>+	
>+}
>#P org.eclipse.papyrus.state.editor.xtext
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 4043)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -20,7 +20,7 @@
> org.antlr.runtime,
> org.eclipse.uml2.uml;bundle-version="3.1.0",
> org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
>- org.eclipse.xtext.gmf.glue;bundle-version="1.0.0"
>+ org.eclipse.xtext.gmf.glue;bundle-version="0.8.0"
> Import-Package: org.apache.log4j
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.papyrus.state.editor.xtext,
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/UmlStateStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/UmlStateStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/UmlStateStandaloneSetupGenerated.java	(working copy)
>@@ -39,6 +39,5 @@
> 
> 
> 
>-
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore	(working copy)
>@@ -5,34 +5,35 @@
> nsURI="http://www.eclipse.org/papyrus/state/editor/xtext/UmlState" nsPrefix="umlState">
> <eClassifiers xsi:type="ecore:EClass" name="StateRule">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="#//SubmachineRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//SubmachineRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="entry" eType="#//EntryRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="entry" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//EntryRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="do" eType="#//DoRule" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exit" eType="#//ExitRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="do" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//DoRule"
>+ containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="exit" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//ExitRule"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="SubmachineRule">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//QualifiedName"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//QualifiedName"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="ecore:EClass ../../../../../../../model/UML.ecore#//StateMachine"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/model/UML.ecore#//StateMachine"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="QualifiedName">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass ../../../../../../../model/UML.ecore#//Namespace"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="#//QualifiedName"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/model/UML.ecore#//Namespace"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="remaining" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//QualifiedName"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="EntryRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//BehaviorKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="behaviorName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="DoRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//BehaviorKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="behaviorName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ExitRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//BehaviorKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="behaviorName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="BehaviorKind">
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/services/UmlStateGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/services/UmlStateGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/services/UmlStateGrammarAccess.java	(working copy)
>@@ -394,8 +394,8 @@
> 	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaTerminals.getSTRINGRule();
> 	} 
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.xmi	(working copy)
>@@ -196,6 +196,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -221,6 +222,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/AbstractUmlStateRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/AbstractUmlStateRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/AbstractUmlStateRuntimeModule.java	(working copy)
>@@ -45,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.state.editor.xtext.parser.antlr.UmlStateParser.class;
> 	}
> 
>@@ -96,7 +96,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -104,6 +104,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/umlState/util/UmlStateSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/umlState/util/UmlStateSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/umlState/util/UmlStateSwitch.java	(working copy)
>@@ -6,10 +6,10 @@
> */
> package org.eclipse.papyrus.state.editor.xtext.umlState.util;
> 
>-import java.util.List;
>-
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
> 
> import org.eclipse.papyrus.state.editor.xtext.umlState.*;
> 
>@@ -26,7 +26,7 @@
> * @see org.eclipse.papyrus.state.editor.xtext.umlState.UmlStatePackage
> * @generated
> */
>-public class UmlStateSwitch<T>
>+public class UmlStateSwitch<T> extends Switch<T>
> {
> /**
> * The cached model package
>@@ -51,38 +51,17 @@
> }
> 
> /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>- * 
>- * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>- * @generated
>- */
>- public T doSwitch(EObject theEObject)
>- {
>- return doSwitch(theEObject.eClass(), theEObject);
>- }
>-
>- /**
>- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * Checks whether this is a switch for the given package.
> * 
> * 
>- * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
> * @generated
> */
>- protected T doSwitch(EClass theEClass, EObject theEObject)
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
> {
>- if (theEClass.eContainer() == modelPackage)
>- {
>- return doSwitch(theEClass.getClassifierID(), theEObject);
>- }
>- else
>- {
>- List<EClass> eSuperTypes = theEClass.getESuperTypes();
>- return
>- eSuperTypes.isEmpty() ?
>- defaultCase(theEObject) :
>- doSwitch(eSuperTypes.get(0), theEObject);
>- }
>+ return ePackage == modelPackage;
> }
> 
> /**
>@@ -92,6 +71,7 @@
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>+ @Override
> protected T doSwitch(int classifierID, EObject theEObject)
> {
> switch (classifierID)
>@@ -249,6 +229,7 @@
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
> */
>+ @Override
> public T defaultCase(EObject object)
> {
> return null;
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/UmlStateParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/UmlStateParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/UmlStateParser.java	(working copy)
>@@ -3,14 +3,9 @@
> */
> package org.eclipse.papyrus.state.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.papyrus.state.editor.xtext.services.UmlStateGrammarAccess;
> 
> public class UmlStateParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>@@ -19,25 +14,13 @@
> 	private UmlStateGrammarAccess grammarAccess;
> 	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal.InternalUmlStateParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(),re);
>-		}
> 	}
> 	
>+	@Override
> 	protected org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal.InternalUmlStateParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal.InternalUmlStateParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal.InternalUmlStateParser(stream, getGrammarAccess());
> 	}
> 	
> 	@Override 
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlStateLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlStateLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlStateLexer.java	(working copy)
>@@ -13,187 +13,211 @@
> @SuppressWarnings("all")
> public class InternalUmlStateLexer extends Lexer {
> public static final int RULE_ID=4;
>- public static final int RULE_ANY_OTHER=10;
>- public static final int EOF=-1;
>- public static final int RULE_SL_COMMENT=8;
>- public static final int Tokens=19;
>- public static final int RULE_ML_COMMENT=7;
> 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
>+ public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
>- public static final int T11=11;
>- public static final int T12=12;
>- public static final int T13=13;
>- public static final int T14=14;
> public static final int RULE_WS=9;
>- public static final int T15=15;
>- public static final int T16=16;
>- public static final int T17=17;
>- public static final int T18=18;
>+ public static final int RULE_SL_COMMENT=8;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=7;
>+
>+ // delegates
>+ // delegators
>+
> public InternalUmlStateLexer() {;} 
> public InternalUmlStateLexer(CharStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlStateLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
>+
> }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g"; }
> 
>- // $ANTLR start T11
>- public final void mT11() throws RecognitionException {
>+ // $ANTLR start "T__11"
>+ public final void mT__11() throws RecognitionException {
> try {
>- int _type = T11;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:10:5: ( ':' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:10:7: ':'
>+ int _type = T__11;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:11:7: ( ':' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:11:9: ':'
> {
> match(':'); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T11
>+ // $ANTLR end "T__11"
> 
>- // $ANTLR start T12
>- public final void mT12() throws RecognitionException {
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
> try {
>- int _type = T12;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:11:5: ( '::' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:11:7: '::'
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:12:7: ( '::' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:12:9: '::'
> {
> match("::"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T12
>+ // $ANTLR end "T__12"
> 
>- // $ANTLR start T13
>- public final void mT13() throws RecognitionException {
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
> try {
>- int _type = T13;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:12:5: ( 'entry' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:12:7: 'entry'
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:13:7: ( 'entry' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:13:9: 'entry'
> {
> match("entry"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T13
>+ // $ANTLR end "T__13"
> 
>- // $ANTLR start T14
>- public final void mT14() throws RecognitionException {
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
> try {
>- int _type = T14;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:13:5: ( 'do' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:13:7: 'do'
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:14:7: ( 'do' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:14:9: 'do'
> {
> match("do"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T14
>+ // $ANTLR end "T__14"
> 
>- // $ANTLR start T15
>- public final void mT15() throws RecognitionException {
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
> try {
>- int _type = T15;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:14:5: ( 'exit' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:14:7: 'exit'
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:15:7: ( 'exit' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:15:9: 'exit'
> {
> match("exit"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T15
>+ // $ANTLR end "T__15"
> 
>- // $ANTLR start T16
>- public final void mT16() throws RecognitionException {
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
> try {
>- int _type = T16;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:15:5: ( 'Activity' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:15:7: 'Activity'
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:16:7: ( 'Activity' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:16:9: 'Activity'
> {
> match("Activity"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T16
>+ // $ANTLR end "T__16"
> 
>- // $ANTLR start T17
>- public final void mT17() throws RecognitionException {
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
> try {
>- int _type = T17;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:16:5: ( 'StateMachine' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:16:7: 'StateMachine'
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:17:7: ( 'StateMachine' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:17:9: 'StateMachine'
> {
> match("StateMachine"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T17
>+ // $ANTLR end "T__17"
> 
>- // $ANTLR start T18
>- public final void mT18() throws RecognitionException {
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
> try {
>- int _type = T18;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:17:5: ( 'OpaqueBehavior' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:17:7: 'OpaqueBehavior'
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:18:7: ( 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:18:9: 'OpaqueBehavior'
> {
> match("OpaqueBehavior"); 
> 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end T18
>+ // $ANTLR end "T__18"
> 
>- // $ANTLR start RULE_ID
>+ // $ANTLR start "RULE_ID"
> public final void mRULE_ID() throws RecognitionException {
> try {
> int _type = RULE_ID;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:654:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:654:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:550:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:550:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:654:11: ( '^' )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:550:11: ( '^' )?
> int alt1=2;
> int LA1_0 = input.LA(1);
> 
>@@ -202,7 +226,7 @@
> }
> switch (alt1) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:654:11: '^'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:550:11: '^'
> {
> match('^'); 
> 
>@@ -216,12 +240,11 @@
> 
> }
> else {
>- MismatchedSetException mse =
>- new MismatchedSetException(null,input);
>- recover(mse); throw mse;
>- }
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:654:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:550:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
> loop2:
> do {
> int alt2=2;
>@@ -241,10 +264,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -258,21 +280,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ID
>+ // $ANTLR end "RULE_ID"
> 
>- // $ANTLR start RULE_INT
>+ // $ANTLR start "RULE_INT"
> public final void mRULE_INT() throws RecognitionException {
> try {
> int _type = RULE_INT;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:656:10: ( ( '0' .. '9' )+ )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:656:12: ( '0' .. '9' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:552:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:552:12: ( '0' .. '9' )+
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:656:12: ( '0' .. '9' )+
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:552:12: ( '0' .. '9' )+
> int cnt3=0;
> loop3:
> do {
>@@ -286,7 +310,7 @@
> 
> switch (alt3) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:656:13: '0' .. '9'
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:552:13: '0' .. '9'
> 	 {
> 	 matchRange('0','9'); 
> 
>@@ -305,21 +329,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_INT
>+ // $ANTLR end "RULE_INT"
> 
>- // $ANTLR start RULE_STRING
>+ // $ANTLR start "RULE_STRING"
> public final void mRULE_STRING() throws RecognitionException {
> try {
> int _type = RULE_STRING;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
> int alt6=2;
> int LA6_0 = input.LA(1);
> 
>@@ -331,16 +357,16 @@
> }
> else {
> NoViableAltException nvae =
>- new NoViableAltException("658:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
>+ new NoViableAltException("", 6, 0, input);
> 
> throw nvae;
> }
> switch (alt6) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
> {
> match('\"'); 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
> loop4:
> do {
> int alt4=3;
>@@ -349,41 +375,39 @@
> if ( (LA4_0=='\\') ) {
> alt4=1;
> }
>- else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
>+ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
> alt4=2;
> }
> 
> 
> switch (alt4) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:62: ~ ( ( '\\\\' | '\"' ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:66: ~ ( ( '\\\\' | '\"' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -399,10 +423,10 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
> {
> match('\''); 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
> loop5:
> do {
> int alt5=3;
>@@ -411,41 +435,39 @@
> if ( (LA5_0=='\\') ) {
> alt5=1;
> }
>- else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
>+ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
> alt5=2;
> }
> 
> 
> switch (alt5) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
> 	 {
> 	 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' ) {
>+ 	 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.LA(1)<='u') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:658:129: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:137: ~ ( ( '\\\\' | '\\'' ) )
> 	 {
>- 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -466,23 +488,25 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_STRING
>+ // $ANTLR end "RULE_STRING"
> 
>- // $ANTLR start RULE_ML_COMMENT
>+ // $ANTLR start "RULE_ML_COMMENT"
> public final void mRULE_ML_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_ML_COMMENT;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:660:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:660:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:556:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:556:19: '/*' ( options {greedy=false; } : . )* '*/'
> {
> match("/*"); 
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:660:24: ( options {greedy=false; } : . )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:556:24: ( options {greedy=false; } : . )*
> loop7:
> do {
> int alt7=2;
>@@ -494,20 +518,20 @@
> if ( (LA7_1=='/') ) {
> alt7=2;
> }
>- else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
>+ else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> }
>- else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
>+ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
> alt7=1;
> }
> 
> 
> switch (alt7) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:660:52: .
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:556:52: .
> 	 {
> 	 matchAny(); 
> 
>@@ -524,46 +548,47 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ML_COMMENT
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>- // $ANTLR start RULE_SL_COMMENT
>+ // $ANTLR start "RULE_SL_COMMENT"
> public final void mRULE_SL_COMMENT() throws RecognitionException {
> try {
> int _type = RULE_SL_COMMENT;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
> {
> match("//"); 
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:24: (~ ( ( '\\n' | '\\r' ) ) )*
> loop8:
> do {
> int alt8=2;
> int LA8_0 = input.LA(1);
> 
>- if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
>+ if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
> alt8=1;
> }
> 
> 
> switch (alt8) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:24: ~ ( ( '\\n' | '\\r' ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558: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)<='\uFFFE') ) {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
> 	 input.consume();
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -574,7 +599,7 @@
> }
> } while (true);
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:40: ( ( '\\r' )? '\\n' )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:40: ( ( '\\r' )? '\\n' )?
> int alt10=2;
> int LA10_0 = input.LA(1);
> 
>@@ -583,9 +608,9 @@
> }
> switch (alt10) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:41: ( '\\r' )? '\\n'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:41: ( '\\r' )? '\\n'
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:41: ( '\\r' )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:41: ( '\\r' )?
> int alt9=2;
> int LA9_0 = input.LA(1);
> 
>@@ -594,7 +619,7 @@
> }
> switch (alt9) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:662:41: '\\r'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:558:41: '\\r'
> {
> match('\r'); 
> 
>@@ -613,21 +638,23 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_SL_COMMENT
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>- // $ANTLR start RULE_WS
>+ // $ANTLR start "RULE_WS"
> public final void mRULE_WS() throws RecognitionException {
> try {
> int _type = RULE_WS;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:664:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:664:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:560:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:560:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:664:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:560:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
> int cnt11=0;
> loop11:
> do {
>@@ -648,10 +675,9 @@
> 
> 	 }
> 	 else {
>- 	 MismatchedSetException mse =
>- 	 new MismatchedSetException(null,input);
>- 	 recover(mse); throw mse;
>- 	 }
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
> 	 }
>@@ -669,493 +695,139 @@
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_WS
>+ // $ANTLR end "RULE_WS"
> 
>- // $ANTLR start RULE_ANY_OTHER
>+ // $ANTLR start "RULE_ANY_OTHER"
> public final void mRULE_ANY_OTHER() throws RecognitionException {
> try {
> int _type = RULE_ANY_OTHER;
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:666:16: ( . )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:666:18: .
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:562:16: ( . )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:562:18: .
> {
> matchAny(); 
> 
> }
> 
>- this.type = _type;
>+ state.type = _type;
>+ state.channel = _channel;
> }
> finally {
> }
> }
>- // $ANTLR end RULE_ANY_OTHER
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
> public void mTokens() throws RecognitionException {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
> int alt12=15;
>- int LA12_0 = input.LA(1);
>-
>- if ( (LA12_0==':') ) {
>- int LA12_1 = input.LA(2);
>-
>- if ( (LA12_1==':') ) {
>- alt12=2;
>- }
>- else {
>- alt12=1;}
>- }
>- else if ( (LA12_0=='e') ) {
>- switch ( input.LA(2) ) {
>- case 'x':
>- {
>- int LA12_17 = input.LA(3);
>-
>- if ( (LA12_17=='i') ) {
>- int LA12_29 = input.LA(4);
>-
>- if ( (LA12_29=='t') ) {
>- int LA12_35 = input.LA(5);
>-
>- if ( ((LA12_35>='0' && LA12_35<='9')||(LA12_35>='A' && LA12_35<='Z')||LA12_35=='_'||(LA12_35>='a' && LA12_35<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=5;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- break;
>- case 'n':
>- {
>- int LA12_18 = input.LA(3);
>-
>- if ( (LA12_18=='t') ) {
>- int LA12_30 = input.LA(4);
>-
>- if ( (LA12_30=='r') ) {
>- int LA12_36 = input.LA(5);
>-
>- if ( (LA12_36=='y') ) {
>- int LA12_41 = input.LA(6);
>-
>- if ( ((LA12_41>='0' && LA12_41<='9')||(LA12_41>='A' && LA12_41<='Z')||LA12_41=='_'||(LA12_41>='a' && LA12_41<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=3;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- break;
>- default:
>- alt12=9;}
>-
>- }
>- else if ( (LA12_0=='d') ) {
>- int LA12_3 = input.LA(2);
>-
>- if ( (LA12_3=='o') ) {
>- int LA12_20 = input.LA(3);
>-
>- if ( ((LA12_20>='0' && LA12_20<='9')||(LA12_20>='A' && LA12_20<='Z')||LA12_20=='_'||(LA12_20>='a' && LA12_20<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=4;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='A') ) {
>- int LA12_4 = input.LA(2);
>-
>- if ( (LA12_4=='c') ) {
>- int LA12_21 = input.LA(3);
>-
>- if ( (LA12_21=='t') ) {
>- int LA12_32 = input.LA(4);
>-
>- if ( (LA12_32=='i') ) {
>- int LA12_37 = input.LA(5);
>-
>- if ( (LA12_37=='v') ) {
>- int LA12_42 = input.LA(6);
>-
>- if ( (LA12_42=='i') ) {
>- int LA12_46 = input.LA(7);
>-
>- if ( (LA12_46=='t') ) {
>- int LA12_49 = input.LA(8);
>-
>- if ( (LA12_49=='y') ) {
>- int LA12_52 = input.LA(9);
>-
>- if ( ((LA12_52>='0' && LA12_52<='9')||(LA12_52>='A' && LA12_52<='Z')||LA12_52=='_'||(LA12_52>='a' && LA12_52<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=6;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='S') ) {
>- int LA12_5 = input.LA(2);
>-
>- if ( (LA12_5=='t') ) {
>- int LA12_22 = input.LA(3);
>-
>- if ( (LA12_22=='a') ) {
>- int LA12_33 = input.LA(4);
>-
>- if ( (LA12_33=='t') ) {
>- int LA12_38 = input.LA(5);
>-
>- if ( (LA12_38=='e') ) {
>- int LA12_43 = input.LA(6);
>-
>- if ( (LA12_43=='M') ) {
>- int LA12_47 = input.LA(7);
>-
>- if ( (LA12_47=='a') ) {
>- int LA12_50 = input.LA(8);
>-
>- if ( (LA12_50=='c') ) {
>- int LA12_53 = input.LA(9);
>-
>- if ( (LA12_53=='h') ) {
>- int LA12_56 = input.LA(10);
>-
>- if ( (LA12_56=='i') ) {
>- int LA12_58 = input.LA(11);
>-
>- if ( (LA12_58=='n') ) {
>- int LA12_60 = input.LA(12);
>-
>- if ( (LA12_60=='e') ) {
>- int LA12_62 = input.LA(13);
>-
>- if ( ((LA12_62>='0' && LA12_62<='9')||(LA12_62>='A' && LA12_62<='Z')||LA12_62=='_'||(LA12_62>='a' && LA12_62<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=7;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='O') ) {
>- int LA12_6 = input.LA(2);
>-
>- if ( (LA12_6=='p') ) {
>- int LA12_23 = input.LA(3);
>-
>- if ( (LA12_23=='a') ) {
>- int LA12_34 = input.LA(4);
>-
>- if ( (LA12_34=='q') ) {
>- int LA12_39 = input.LA(5);
>-
>- if ( (LA12_39=='u') ) {
>- int LA12_44 = input.LA(6);
>-
>- if ( (LA12_44=='e') ) {
>- int LA12_48 = input.LA(7);
>-
>- if ( (LA12_48=='B') ) {
>- int LA12_51 = input.LA(8);
>-
>- if ( (LA12_51=='e') ) {
>- int LA12_54 = input.LA(9);
>-
>- if ( (LA12_54=='h') ) {
>- int LA12_57 = input.LA(10);
>-
>- if ( (LA12_57=='a') ) {
>- int LA12_59 = input.LA(11);
>-
>- if ( (LA12_59=='v') ) {
>- int LA12_61 = input.LA(12);
>-
>- if ( (LA12_61=='i') ) {
>- int LA12_63 = input.LA(13);
>-
>- if ( (LA12_63=='o') ) {
>- int LA12_65 = input.LA(14);
>-
>- if ( (LA12_65=='r') ) {
>- int LA12_66 = input.LA(15);
>-
>- if ( ((LA12_66>='0' && LA12_66<='9')||(LA12_66>='A' && LA12_66<='Z')||LA12_66=='_'||(LA12_66>='a' && LA12_66<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=8;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else {
>- alt12=9;}
>- }
>- else if ( (LA12_0=='^') ) {
>- int LA12_7 = input.LA(2);
>-
>- if ( ((LA12_7>='A' && LA12_7<='Z')||LA12_7=='_'||(LA12_7>='a' && LA12_7<='z')) ) {
>- alt12=9;
>- }
>- else {
>- alt12=15;}
>- }
>- else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='c')||(LA12_0>='f' && LA12_0<='z')) ) {
>- alt12=9;
>- }
>- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
>- alt12=10;
>- }
>- else if ( (LA12_0=='\"') ) {
>- int LA12_10 = input.LA(2);
>-
>- if ( ((LA12_10>='\u0000' && LA12_10<='\uFFFE')) ) {
>- alt12=11;
>- }
>- else {
>- alt12=15;}
>- }
>- else if ( (LA12_0=='\'') ) {
>- int LA12_11 = input.LA(2);
>-
>- if ( ((LA12_11>='\u0000' && LA12_11<='\uFFFE')) ) {
>- alt12=11;
>- }
>- else {
>- alt12=15;}
>- }
>- else if ( (LA12_0=='/') ) {
>- switch ( input.LA(2) ) {
>- case '*':
>- {
>- alt12=12;
>- }
>- break;
>- case '/':
>- {
>- alt12=13;
>- }
>- break;
>- default:
>- alt12=15;}
>-
>- }
>- else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
>- alt12=14;
>- }
>- else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='.')||(LA12_0>=';' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
>- alt12=15;
>- }
>- else {
>- NoViableAltException nvae =
>- new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
>-
>- throw nvae;
>- }
>+ alt12 = dfa12.predict(input);
> switch (alt12) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:10: T11
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:10: T__11
> {
>- mT11(); 
>+ mT__11(); 
> 
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:14: T12
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:16: T__12
> {
>- mT12(); 
>+ mT__12(); 
> 
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:18: T13
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:22: T__13
> {
>- mT13(); 
>+ mT__13(); 
> 
> }
> break;
> case 4 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:22: T14
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:28: T__14
> {
>- mT14(); 
>+ mT__14(); 
> 
> }
> break;
> case 5 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:26: T15
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:34: T__15
> {
>- mT15(); 
>+ mT__15(); 
> 
> }
> break;
> case 6 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:30: T16
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:40: T__16
> {
>- mT16(); 
>+ mT__16(); 
> 
> }
> break;
> case 7 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:34: T17
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:46: T__17
> {
>- mT17(); 
>+ mT__17(); 
> 
> }
> break;
> case 8 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:38: T18
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:52: T__18
> {
>- mT18(); 
>+ mT__18(); 
> 
> }
> break;
> case 9 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:42: RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:58: RULE_ID
> {
> mRULE_ID(); 
> 
> }
> break;
> case 10 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:50: RULE_INT
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:66: RULE_INT
> {
> mRULE_INT(); 
> 
> }
> break;
> case 11 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:59: RULE_STRING
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:75: RULE_STRING
> {
> mRULE_STRING(); 
> 
> }
> break;
> case 12 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:71: RULE_ML_COMMENT
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:87: RULE_ML_COMMENT
> {
> mRULE_ML_COMMENT(); 
> 
> }
> break;
> case 13 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:87: RULE_SL_COMMENT
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:103: RULE_SL_COMMENT
> {
> mRULE_SL_COMMENT(); 
> 
> }
> break;
> case 14 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:103: RULE_WS
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:119: RULE_WS
> {
> mRULE_WS(); 
> 
> }
> break;
> case 15 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:111: RULE_ANY_OTHER
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:1:127: RULE_ANY_OTHER
> {
> mRULE_ANY_OTHER(); 
> 
>@@ -1167,6 +839,203 @@
> }
> 
> 
>+ protected DFA12 dfa12 = new DFA12(this);
>+ static final String DFA12_eotS =
>+ "\1\uffff\1\20\5\23\1\16\2\uffff\3\16\4\uffff\2\23\1\uffff\1\37"+
>+ "\3\23\5\uffff\2\23\1\uffff\4\23\1\51\3\23\1\55\1\uffff\3\23\1\uffff"+
>+ "\6\23\1\67\2\23\1\uffff\6\23\1\100\1\23\1\uffff\1\23\1\103\1\uffff";
>+ static final String DFA12_eofS =
>+ "\104\uffff";
>+ static final String DFA12_minS =
>+ "\1\0\1\72\1\156\1\157\1\143\1\164\1\160\1\101\2\uffff\2\0\1\52"+
>+ "\4\uffff\1\164\1\151\1\uffff\1\60\1\164\2\141\5\uffff\1\162\1\164"+
>+ "\1\uffff\1\151\1\164\1\161\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 DFA12_maxS =
>+ "\1\uffff\1\72\1\170\1\157\1\143\1\164\1\160\1\172\2\uffff\2\uffff"+
>+ "\1\57\4\uffff\1\164\1\151\1\uffff\1\172\1\164\2\141\5\uffff\1\162"+
>+ "\1\164\1\uffff\1\151\1\164\1\161\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 DFA12_acceptS =
>+ "\10\uffff\1\11\1\12\3\uffff\1\16\1\17\1\2\1\1\2\uffff\1\11\4\uffff"+
>+ "\1\12\1\13\1\14\1\15\1\16\2\uffff\1\4\11\uffff\1\5\3\uffff\1\3\11"+
>+ "\uffff\1\6\10\uffff\1\7\2\uffff\1\10";
>+ static final String DFA12_specialS =
>+ "\1\2\11\uffff\1\0\1\1\70\uffff}>";
>+ static final String[] DFA12_transitionS = {
>+ "\11\16\2\15\2\16\1\15\22\16\1\15\1\16\1\12\4\16\1\13\7\16\1"+
>+ "\14\12\11\1\1\6\16\1\4\15\10\1\6\3\10\1\5\7\10\3\16\1\7\1\10"+
>+ "\1\16\3\10\1\3\1\2\25\10\uff85\16",
>+ "\1\17",
>+ "\1\21\11\uffff\1\22",
>+ "\1\24",
>+ "\1\25",
>+ "\1\26",
>+ "\1\27",
>+ "\32\23\4\uffff\1\23\1\uffff\32\23",
>+ "",
>+ "",
>+ "\0\31",
>+ "\0\31",
>+ "\1\32\4\uffff\1\33",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\35",
>+ "\1\36",
>+ "",
>+ "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23",
>+ "\1\40",
>+ "\1\41",
>+ "\1\42",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\43",
>+ "\1\44",
>+ "",
>+ "\1\45",
>+ "\1\46",
>+ "\1\47",
>+ "\1\50",
>+ "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23",
>+ "\1\52",
>+ "\1\53",
>+ "\1\54",
>+ "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23",
>+ "",
>+ "\1\56",
>+ "\1\57",
>+ "\1\60",
>+ "",
>+ "\1\61",
>+ "\1\62",
>+ "\1\63",
>+ "\1\64",
>+ "\1\65",
>+ "\1\66",
>+ "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23",
>+ "\1\70",
>+ "\1\71",
>+ "",
>+ "\1\72",
>+ "\1\73",
>+ "\1\74",
>+ "\1\75",
>+ "\1\76",
>+ "\1\77",
>+ "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23",
>+ "\1\101",
>+ "",
>+ "\1\102",
>+ "\12\23\7\uffff\32\23\4\uffff\1\23\1\uffff\32\23",
>+ ""
>+ };
>+
>+ static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
>+ static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
>+ static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
>+ static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
>+ static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
>+ static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
>+ static final short[][] DFA12_transition;
>+
>+ static {
>+ int numStates = DFA12_transitionS.length;
>+ DFA12_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
>+ }
>+ }
>+
>+ class DFA12 extends DFA {
>+
>+ public DFA12(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 12;
>+ this.eot = DFA12_eot;
>+ this.eof = DFA12_eof;
>+ this.min = DFA12_min;
>+ this.max = DFA12_max;
>+ this.accept = DFA12_accept;
>+ this.special = DFA12_special;
>+ this.transition = DFA12_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA12_10 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_10>='\u0000' && LA12_10<='\uFFFF')) ) {s = 25;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA12_11 = input.LA(1);
>+
>+ s = -1;
>+ if ( ((LA12_11>='\u0000' && LA12_11<='\uFFFF')) ) {s = 25;}
>+
>+ else s = 14;
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA12_0 = input.LA(1);
>+
>+ s = -1;
>+ if ( (LA12_0==':') ) {s = 1;}
>+
>+ else if ( (LA12_0=='e') ) {s = 2;}
>+
>+ else if ( (LA12_0=='d') ) {s = 3;}
>+
>+ else if ( (LA12_0=='A') ) {s = 4;}
>+
>+ else if ( (LA12_0=='S') ) {s = 5;}
>+
>+ else if ( (LA12_0=='O') ) {s = 6;}
>+
>+ else if ( (LA12_0=='^') ) {s = 7;}
>+
>+ else if ( ((LA12_0>='B' && LA12_0<='N')||(LA12_0>='P' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='c')||(LA12_0>='f' && LA12_0<='z')) ) {s = 8;}
>+
>+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 9;}
>+
>+ else if ( (LA12_0=='\"') ) {s = 10;}
>+
>+ else if ( (LA12_0=='\'') ) {s = 11;}
>+
>+ else if ( (LA12_0=='/') ) {s = 12;}
>+
>+ else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 13;}
>+
>+ else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='.')||(LA12_0>=';' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 14;}
>+
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 12, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
> 
> 
> }
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g	(working copy)
>@@ -19,11 +19,9 @@
> @parser::header {
> package org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -31,7 +29,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.state.editor.xtext.services.UmlStateGrammarAccess;
> 
> }
>@@ -40,17 +37,10 @@
> 
> 	private UmlStateGrammarAccess grammarAccess;
> 	
>- public InternalUmlStateParser(TokenStream input, IAstFactory factory, UmlStateGrammarAccess grammarAccess) {
>+ public InternalUmlStateParser(TokenStream input, UmlStateGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -77,7 +67,7 @@
> // Entry rule entryRuleStateRule
> entryRuleStateRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getStateRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getStateRuleRule()); }
> 	 iv_ruleStateRule=ruleStateRule 
> 	 { $current=$iv_ruleStateRule.current; } 
> 	 EOF 
>@@ -85,60 +75,46 @@
> 
> // Rule StateRule
> ruleStateRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		lv_name_0_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getStateRuleAccess().getNameIDTerminalRuleCall_0_0(), "name"); 
>+			newLeafNode(lv_name_0_0, grammarAccess.getStateRuleAccess().getNameIDTerminalRuleCall_0_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"name",
>-	 		lv_name_0_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getStateRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"name",
>+ 		lv_name_0_0, 
>+ 		"ID");
> 	 }
> 
> )
>-)(	':' 
>+)(	otherlv_1=':' 
> {
>- createLeafNode(grammarAccess.getStateRuleAccess().getColonKeyword_1_0(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getStateRuleAccess().getColonKeyword_1_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0()); 
> 	 }
> 		lv_submachine_2_0=ruleSubmachineRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"submachine",
>-	 		lv_submachine_2_0, 
>-	 		"SubmachineRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"submachine",
>+ 		lv_submachine_2_0, 
>+ 		"SubmachineRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -156,31 +132,25 @@
> 					{ 
> 	 				 getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 0);
> 	 				}
>-					(
>+					({true}?=>(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0()); 
> 	 }
> 		lv_entry_4_0=ruleEntryRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"entry",
>-	 		lv_entry_4_0, 
>-	 		"EntryRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"entry",
>+ 		lv_entry_4_0, 
>+ 		"EntryRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)
>+))
> 					{ 
> 	 				 getUnorderedGroupHelper().returnFromSelection(grammarAccess.getStateRuleAccess().getUnorderedGroup_2());
> 	 				}
>@@ -192,31 +162,25 @@
> 					{ 
> 	 				 getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1);
> 	 				}
>-					(
>+					({true}?=>(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0()); 
> 	 }
> 		lv_do_5_0=ruleDoRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"do",
>-	 		lv_do_5_0, 
>-	 		"DoRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"do",
>+ 		lv_do_5_0, 
>+ 		"DoRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)
>+))
> 					{ 
> 	 				 getUnorderedGroupHelper().returnFromSelection(grammarAccess.getStateRuleAccess().getUnorderedGroup_2());
> 	 				}
>@@ -228,31 +192,25 @@
> 					{ 
> 	 				 getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2);
> 	 				}
>-					(
>+					({true}?=>(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0()); 
> 	 }
> 		lv_exit_6_0=ruleExitRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"exit",
>-	 		lv_exit_6_0, 
>-	 		"ExitRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"exit",
>+ 		lv_exit_6_0, 
>+ 		"ExitRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)
>+))
> 					{ 
> 	 				 getUnorderedGroupHelper().returnFromSelection(grammarAccess.getStateRuleAccess().getUnorderedGroup_2());
> 	 				}
>@@ -276,7 +234,7 @@
> // Entry rule entryRuleSubmachineRule
> entryRuleSubmachineRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getSubmachineRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getSubmachineRuleRule()); }
> 	 iv_ruleSubmachineRule=ruleSubmachineRule 
> 	 { $current=$iv_ruleSubmachineRule.current; } 
> 	 EOF 
>@@ -284,32 +242,24 @@
> 
> // Rule SubmachineRule
> ruleSubmachineRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 	 }
> 		lv_path_0_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getSubmachineRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getSubmachineRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"path",
>-	 		lv_path_0_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -317,13 +267,12 @@
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getSubmachineRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getSubmachineRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getSubmachineRuleAccess().getSubmachineStateMachineCrossReference_1_0(), "submachine"); 
>+		newLeafNode(otherlv_1, grammarAccess.getSubmachineRuleAccess().getSubmachineStateMachineCrossReference_1_0()); 
> 	}
> 
> )
>@@ -337,7 +286,7 @@
> // Entry rule entryRuleQualifiedName
> entryRuleQualifiedName returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getQualifiedNameRule()); }
> 	 iv_ruleQualifiedName=ruleQualifiedName 
> 	 { $current=$iv_ruleQualifiedName.current; } 
> 	 EOF 
>@@ -345,50 +294,41 @@
> 
> // Rule QualifiedName
> ruleQualifiedName returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_0=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	}
> 
> )
>-)	'::' 
>+)	otherlv_1='::' 
> {
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 }
> 		lv_remaining_2_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"remaining",
>-	 		lv_remaining_2_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -402,7 +342,7 @@
> // Entry rule entryRuleEntryRule
> entryRuleEntryRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getEntryRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getEntryRuleRule()); }
> 	 iv_ruleEntryRule=ruleEntryRule 
> 	 { $current=$iv_ruleEntryRule.current; } 
> 	 EOF 
>@@ -410,36 +350,28 @@
> 
> // Rule EntryRule
> ruleEntryRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'entry' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='entry' 
> {
>- createLeafNode(grammarAccess.getEntryRuleAccess().getEntryKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getEntryRuleAccess().getEntryKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 }
> 		lv_kind_1_0=ruleBehaviorKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getEntryRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"kind",
>-	 		lv_kind_1_0, 
>-	 		"BehaviorKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getEntryRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -447,23 +379,17 @@
> (
> 		lv_behaviorName_2_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getEntryRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+			newLeafNode(lv_behaviorName_2_0, grammarAccess.getEntryRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getEntryRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getEntryRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"behaviorName",
>-	 		lv_behaviorName_2_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 }
> 
> )
>@@ -477,7 +403,7 @@
> // Entry rule entryRuleDoRule
> entryRuleDoRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getDoRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getDoRuleRule()); }
> 	 iv_ruleDoRule=ruleDoRule 
> 	 { $current=$iv_ruleDoRule.current; } 
> 	 EOF 
>@@ -485,36 +411,28 @@
> 
> // Rule DoRule
> ruleDoRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'do' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='do' 
> {
>- createLeafNode(grammarAccess.getDoRuleAccess().getDoKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getDoRuleAccess().getDoKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 }
> 		lv_kind_1_0=ruleBehaviorKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getDoRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"kind",
>-	 		lv_kind_1_0, 
>-	 		"BehaviorKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getDoRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -522,23 +440,17 @@
> (
> 		lv_behaviorName_2_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getDoRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+			newLeafNode(lv_behaviorName_2_0, grammarAccess.getDoRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getDoRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"behaviorName",
>-	 		lv_behaviorName_2_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElement(grammarAccess.getDoRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 }
> 
> )
>@@ -552,7 +464,7 @@
> // Entry rule entryRuleExitRule
> entryRuleExitRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getExitRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getExitRuleRule()); }
> 	 iv_ruleExitRule=ruleExitRule 
> 	 { $current=$iv_ruleExitRule.current; } 
> 	 EOF 
>@@ -560,36 +472,28 @@
> 
> // Rule ExitRule
> ruleExitRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'exit' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='exit' 
> {
>- createLeafNode(grammarAccess.getExitRuleAccess().getExitKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getExitRuleAccess().getExitKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 }
> 		lv_kind_1_0=ruleBehaviorKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getExitRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getExitRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"kind",
>-	 		lv_kind_1_0, 
>-	 		"BehaviorKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -597,23 +501,17 @@
> (
> 		lv_behaviorName_2_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getExitRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+			newLeafNode(lv_behaviorName_2_0, grammarAccess.getExitRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getExitRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getExitRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"behaviorName",
>-	 		lv_behaviorName_2_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 }
> 
> )
>@@ -626,26 +524,24 @@
> 
> // Rule BehaviorKind
> ruleBehaviorKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'Activity' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='Activity' 
> 	{
> $current = grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'StateMachine' 
>+ |(	enumLiteral_1='StateMachine' 
> 	{
> $current = grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'OpaqueBehavior' 
>+ |(	enumLiteral_2='OpaqueBehavior' 
> 	{
> $current = grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2()); 
> }
> ));
> 
>@@ -655,7 +551,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.tokens	(working copy)
>@@ -1,5 +1,13 @@
> RULE_ID=4
> RULE_STRING=6
>+T__16=16
>+T__15=15
>+T__18=18
>+T__17=17
>+T__12=12
>+T__11=11
>+T__14=14
>+T__13=13
> RULE_ANY_OTHER=10
> RULE_INT=5
> RULE_WS=9
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlStateParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlStateParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlStateParser.java	(working copy)
>@@ -1,10 +1,8 @@
> package org.eclipse.papyrus.state.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -12,7 +10,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.state.editor.xtext.services.UmlStateGrammarAccess;
> 
> 
>@@ -29,6 +26,14 @@
> };
> public static final int RULE_ID=4;
> 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__17=17;
>+ public static final int T__12=12;
>+ public static final int T__11=11;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
> public static final int RULE_ANY_OTHER=10;
> public static final int RULE_INT=5;
> public static final int RULE_WS=9;
>@@ -36,29 +41,30 @@
> public static final int EOF=-1;
> public static final int RULE_ML_COMMENT=7;
> 
>+ // delegates
>+ // delegators
>+
>+
> public InternalUmlStateParser(TokenStream input) {
>- super(input);
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlStateParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
> }
> 
> 
>- public String[] getTokenNames() { return tokenNames; }
>+ public String[] getTokenNames() { return InternalUmlStateParser.tokenNames; }
> public String getGrammarFileName() { return "../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g"; }
> 
> 
> 
> 	private UmlStateGrammarAccess grammarAccess;
> 	
>- public InternalUmlStateParser(TokenStream input, IAstFactory factory, UmlStateGrammarAccess grammarAccess) {
>+ public InternalUmlStateParser(TokenStream input, UmlStateGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -73,8 +79,8 @@
> 
> 
> 
>- // $ANTLR start entryRuleStateRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:78:1: entryRuleStateRule returns [EObject current=null] : iv_ruleStateRule= ruleStateRule EOF ;
>+ // $ANTLR start "entryRuleStateRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:68:1: entryRuleStateRule returns [EObject current=null] : iv_ruleStateRule= ruleStateRule EOF ;
> public final EObject entryRuleStateRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -82,13 +88,14 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:79:2: (iv_ruleStateRule= ruleStateRule EOF )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:80:2: iv_ruleStateRule= ruleStateRule EOF
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:69:2: (iv_ruleStateRule= ruleStateRule EOF )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:70:2: iv_ruleStateRule= ruleStateRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getStateRuleRule(), currentNode); 
>+ newCompositeNode(grammarAccess.getStateRuleRule()); 
> pushFollow(FOLLOW_ruleStateRule_in_entryRuleStateRule75);
> iv_ruleStateRule=ruleStateRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleStateRule; 
> match(input,EOF,FOLLOW_EOF_in_entryRuleStateRule85); 
>@@ -105,15 +112,16 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleStateRule
>+ // $ANTLR end "entryRuleStateRule"
> 
> 
>- // $ANTLR start ruleStateRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:87:1: ruleStateRule returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) ( ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) ) ) ) ;
>+ // $ANTLR start "ruleStateRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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 ) ) ) ) ) )* ) ) ) ) ;
> public final EObject ruleStateRule() throws RecognitionException {
> EObject current = null;
> 
> Token lv_name_0_0=null;
>+ Token otherlv_1=null;
> EObject lv_submachine_2_0 = null;
> 
> EObject lv_entry_4_0 = null;
>@@ -123,41 +131,34 @@
> EObject lv_exit_6_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:92:6: ( ( ( (lv_name_0_0= RULE_ID ) ) ( ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) ) ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:93:1: ( ( (lv_name_0_0= RULE_ID ) ) ( ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:93:1: ( ( (lv_name_0_0= RULE_ID ) ) ( ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:93:2: ( (lv_name_0_0= RULE_ID ) ) ( ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )? ( ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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 ) ) ) ) ) )* ) ) )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:93:2: ( (lv_name_0_0= RULE_ID ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:94:1: (lv_name_0_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:81:2: ( (lv_name_0_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:82:1: (lv_name_0_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:94:1: (lv_name_0_0= RULE_ID )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:95:3: lv_name_0_0= RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:82:1: (lv_name_0_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:83:3: lv_name_0_0= RULE_ID
> {
>- lv_name_0_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleStateRule127); 
>+ lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleStateRule127); 
> 
>- 			createLeafNode(grammarAccess.getStateRuleAccess().getNameIDTerminalRuleCall_0_0(), "name"); 
>+ 			newLeafNode(lv_name_0_0, grammarAccess.getStateRuleAccess().getNameIDTerminalRuleCall_0_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"name",
>- 	 		lv_name_0_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getStateRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"name",
>+ 		lv_name_0_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -165,7 +166,7 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:117:2: ( ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:99:2: (otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) ) )?
> int alt1=2;
> int LA1_0 = input.LA(1);
> 
>@@ -174,41 +175,36 @@
> }
> switch (alt1) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:117:4: ':' ( (lv_submachine_2_0= ruleSubmachineRule ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:99:4: otherlv_1= ':' ( (lv_submachine_2_0= ruleSubmachineRule ) )
> {
>- match(input,11,FOLLOW_11_in_ruleStateRule143); 
>+ otherlv_1=(Token)match(input,11,FOLLOW_11_in_ruleStateRule145); 
> 
>- createLeafNode(grammarAccess.getStateRuleAccess().getColonKeyword_1_0(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getStateRuleAccess().getColonKeyword_1_0());
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:121:1: ( (lv_submachine_2_0= ruleSubmachineRule ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:122:1: (lv_submachine_2_0= ruleSubmachineRule )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:103:1: ( (lv_submachine_2_0= ruleSubmachineRule ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:104:1: (lv_submachine_2_0= ruleSubmachineRule )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:122:1: (lv_submachine_2_0= ruleSubmachineRule )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:123:3: lv_submachine_2_0= ruleSubmachineRule
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:104:1: (lv_submachine_2_0= ruleSubmachineRule )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:105:3: lv_submachine_2_0= ruleSubmachineRule
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getStateRuleAccess().getSubmachineSubmachineRuleParserRuleCall_1_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleSubmachineRule_in_ruleStateRule164);
>+ pushFollow(FOLLOW_ruleSubmachineRule_in_ruleStateRule166);
> lv_submachine_2_0=ruleSubmachineRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"submachine",
>- 	 		lv_submachine_2_0, 
>- 	 		"SubmachineRule", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"submachine",
>+ 		lv_submachine_2_0, 
>+ 		"SubmachineRule");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -222,19 +218,19 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:145:4: ( ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:147:1: ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:147:1: ( ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:148:2: ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:151:2: ( ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )* )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:152:3: ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:128:3: ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )*
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:152:3: ( ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) ) | ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) ) | ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) ) )*
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:128:3: ( ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) ) )*
> loop2:
> do {
> int alt2=4;
>@@ -253,49 +249,50 @@
> 
> switch (alt2) {
> 	case 1 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:154:4: ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:130:4: ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) )
> 	 {
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:154:4: ({...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:155:5: {...}? => ( ( (lv_entry_4_0= ruleEntryRule ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:130:4: ({...}? => ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:155:106: ( ( (lv_entry_4_0= ruleEntryRule ) ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:156:6: ( (lv_entry_4_0= ruleEntryRule ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:131:106: ( ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:132:6: ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) )
> 	 {
> 	 
> 	 	 				 getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 0);
> 	 	 				
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:159:6: ( (lv_entry_4_0= ruleEntryRule ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:160:1: (lv_entry_4_0= ruleEntryRule )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:135:6: ({...}? => ( (lv_entry_4_0= ruleEntryRule ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:135:7: {...}? => ( (lv_entry_4_0= ruleEntryRule ) )
>+ 	 {
>+ 	 if ( !((true)) ) {
>+ 	 throw new FailedPredicateException(input, "ruleStateRule", "true");
>+ 	 }
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:135:16: ( (lv_entry_4_0= ruleEntryRule ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:136:1: (lv_entry_4_0= ruleEntryRule )
> 	 {
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:160:1: (lv_entry_4_0= ruleEntryRule )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:161:3: lv_entry_4_0= ruleEntryRule
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:136:1: (lv_entry_4_0= ruleEntryRule )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:137:3: lv_entry_4_0= ruleEntryRule
> 	 {
> 	 
>- 	 	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0(), currentNode); 
>+ 	 	 newCompositeNode(grammarAccess.getStateRuleAccess().getEntryEntryRuleParserRuleCall_2_0_0()); 
> 	 	 
>- 	 pushFollow(FOLLOW_ruleEntryRule_in_ruleStateRule229);
>+ 	 pushFollow(FOLLOW_ruleEntryRule_in_ruleStateRule234);
> 	 lv_entry_4_0=ruleEntryRule();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 	 if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 	 current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 	 }
>- 	 	 try {
>- 	 	 		set(
>- 	 	 			current, 
>- 	 	 			"entry",
>- 	 	 		lv_entry_4_0, 
>- 	 	 		"EntryRule", 
>- 	 	 		currentNode);
>- 	 	 } catch (ValueConverterException vce) {
>- 	 				handleValueConverterException(vce);
>- 	 	 }
>- 	 	 currentNode = currentNode.getParent();
>+ 	 		set(
>+ 	 			current, 
>+ 	 			"entry",
>+ 	 		lv_entry_4_0, 
>+ 	 		"EntryRule");
>+ 	 	 afterParserOrEnumRuleCall();
> 	 	 
> 
> 	 }
>@@ -303,6 +300,9 @@
> 
> 	 }
> 
>+
>+ 	 }
>+
> 	 
> 	 	 				 getUnorderedGroupHelper().returnFromSelection(grammarAccess.getStateRuleAccess().getUnorderedGroup_2());
> 	 	 				
>@@ -316,49 +316,50 @@
> 	 }
> 	 break;
> 	case 2 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:190:4: ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:160:4: ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) )
> 	 {
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:190:4: ({...}? => ( ( (lv_do_5_0= ruleDoRule ) ) ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:191:5: {...}? => ( ( (lv_do_5_0= ruleDoRule ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:160:4: ({...}? => ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:191:106: ( ( (lv_do_5_0= ruleDoRule ) ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:192:6: ( (lv_do_5_0= ruleDoRule ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:161:106: ( ({...}? => ( (lv_do_5_0= ruleDoRule ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:162:6: ({...}? => ( (lv_do_5_0= ruleDoRule ) ) )
> 	 {
> 	 
> 	 	 				 getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 1);
> 	 	 				
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:195:6: ( (lv_do_5_0= ruleDoRule ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:196:1: (lv_do_5_0= ruleDoRule )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:165:6: ({...}? => ( (lv_do_5_0= ruleDoRule ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:165:7: {...}? => ( (lv_do_5_0= ruleDoRule ) )
>+ 	 {
>+ 	 if ( !((true)) ) {
>+ 	 throw new FailedPredicateException(input, "ruleStateRule", "true");
>+ 	 }
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:165:16: ( (lv_do_5_0= ruleDoRule ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:166:1: (lv_do_5_0= ruleDoRule )
> 	 {
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:196:1: (lv_do_5_0= ruleDoRule )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:197:3: lv_do_5_0= ruleDoRule
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:166:1: (lv_do_5_0= ruleDoRule )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:167:3: lv_do_5_0= ruleDoRule
> 	 {
> 	 
>- 	 	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0(), currentNode); 
>+ 	 	 newCompositeNode(grammarAccess.getStateRuleAccess().getDoDoRuleParserRuleCall_2_1_0()); 
> 	 	 
>- 	 pushFollow(FOLLOW_ruleDoRule_in_ruleStateRule300);
>+ 	 pushFollow(FOLLOW_ruleDoRule_in_ruleStateRule309);
> 	 lv_do_5_0=ruleDoRule();
>- 	 _fsp--;
>+
>+ 	 state._fsp--;
> 
> 
> 	 	 if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 	 current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 	 }
>- 	 	 try {
>- 	 	 		set(
>- 	 	 			current, 
>- 	 	 			"do",
>- 	 	 		lv_do_5_0, 
>- 	 	 		"DoRule", 
>- 	 	 		currentNode);
>- 	 	 } catch (ValueConverterException vce) {
>- 	 				handleValueConverterException(vce);
>- 	 	 }
>- 	 	 currentNode = currentNode.getParent();
>+ 	 		set(
>+ 	 			current, 
>+ 	 			"do",
>+ 	 		lv_do_5_0, 
>+ 	 		"DoRule");
>+ 	 	 afterParserOrEnumRuleCall();
> 	 	 
> 
> 	 }
>@@ -366,6 +367,9 @@
> 
> 	 }
> 
>+
>+ 	 }
>+
> 	 
> 	 	 				 getUnorderedGroupHelper().returnFromSelection(grammarAccess.getStateRuleAccess().getUnorderedGroup_2());
> 	 	 				
>@@ -379,49 +383,50 @@
> 	 }
> 	 break;
> 	case 3 :
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:226:4: ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:190:4: ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) )
> 	 {
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:226:4: ({...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:227:5: {...}? => ( ( (lv_exit_6_0= ruleExitRule ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:190:4: ({...}? => ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:227:106: ( ( (lv_exit_6_0= ruleExitRule ) ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:228:6: ( (lv_exit_6_0= ruleExitRule ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:191:106: ( ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:192:6: ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) )
> 	 {
> 	 
> 	 	 				 getUnorderedGroupHelper().select(grammarAccess.getStateRuleAccess().getUnorderedGroup_2(), 2);
> 	 	 				
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:231:6: ( (lv_exit_6_0= ruleExitRule ) )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:232:1: (lv_exit_6_0= ruleExitRule )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:195:6: ({...}? => ( (lv_exit_6_0= ruleExitRule ) ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:195:7: {...}? => ( (lv_exit_6_0= ruleExitRule ) )
> 	 {
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:232:1: (lv_exit_6_0= ruleExitRule )
>- 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:233:3: lv_exit_6_0= ruleExitRule
>+ 	 if ( !((true)) ) {
>+ 	 throw new FailedPredicateException(input, "ruleStateRule", "true");
>+ 	 }
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:195:16: ( (lv_exit_6_0= ruleExitRule ) )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:196:1: (lv_exit_6_0= ruleExitRule )
>+ 	 {
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:196:1: (lv_exit_6_0= ruleExitRule )
>+ 	 // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:197:3: lv_exit_6_0= ruleExitRule
> 	 {
> 	 
>- 	 	 currentNode=createCompositeNode(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0(), currentNode); 
>+ 	 	 newCompositeNode(grammarAccess.getStateRuleAccess().getExitExitRuleParserRuleCall_2_2_0()); 
> 	 	 
>- 	 pushFollow(FOLLOW_ruleExitRule_in_ruleStateRule371);
>+ 	 pushFollow(FOLLOW_ruleExitRule_in_ruleStateRule384);
> 	 lv_exit_6_0=ruleExitRule();
>- 	 _fsp--;
> 
>+ 	 state._fsp--;
>+
> 
> 	 	 if (current==null) {
>- 	 	 current = factory.create(grammarAccess.getStateRuleRule().getType().getClassifier());
>- 	 	 associateNodeWithAstElement(currentNode.getParent(), current);
>+ 	 	 current = createModelElementForParent(grammarAccess.getStateRuleRule());
> 	 	 }
>- 	 	 try {
>- 	 	 		set(
>- 	 	 			current, 
>- 	 	 			"exit",
>- 	 	 		lv_exit_6_0, 
>- 	 	 		"ExitRule", 
>- 	 	 		currentNode);
>- 	 	 } catch (ValueConverterException vce) {
>- 	 				handleValueConverterException(vce);
>- 	 	 }
>- 	 	 currentNode = currentNode.getParent();
>+ 	 		set(
>+ 	 			current, 
>+ 	 			"exit",
>+ 	 		lv_exit_6_0, 
>+ 	 		"ExitRule");
>+ 	 	 afterParserOrEnumRuleCall();
> 	 	 
> 
> 	 }
>@@ -429,6 +434,9 @@
> 
> 	 }
> 
>+
>+ 	 }
>+
> 	 
> 	 	 				 getUnorderedGroupHelper().returnFromSelection(grammarAccess.getStateRuleAccess().getUnorderedGroup_2());
> 	 	 				
>@@ -465,9 +473,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -478,11 +484,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleStateRule
>+ // $ANTLR end "ruleStateRule"
> 
> 
>- // $ANTLR start entryRuleSubmachineRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:277:1: entryRuleSubmachineRule returns [EObject current=null] : iv_ruleSubmachineRule= ruleSubmachineRule EOF ;
>+ // $ANTLR start "entryRuleSubmachineRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:235:1: entryRuleSubmachineRule returns [EObject current=null] : iv_ruleSubmachineRule= ruleSubmachineRule EOF ;
> public final EObject entryRuleSubmachineRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -490,16 +496,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:278:2: (iv_ruleSubmachineRule= ruleSubmachineRule EOF )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:279:2: iv_ruleSubmachineRule= ruleSubmachineRule EOF
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:236:2: (iv_ruleSubmachineRule= ruleSubmachineRule EOF )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:237:2: iv_ruleSubmachineRule= ruleSubmachineRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getSubmachineRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleSubmachineRule_in_entryRuleSubmachineRule446);
>+ newCompositeNode(grammarAccess.getSubmachineRuleRule()); 
>+ pushFollow(FOLLOW_ruleSubmachineRule_in_entryRuleSubmachineRule460);
> iv_ruleSubmachineRule=ruleSubmachineRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleSubmachineRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleSubmachineRule456); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleSubmachineRule470); 
> 
> }
> 
>@@ -513,27 +520,28 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleSubmachineRule
>+ // $ANTLR end "entryRuleSubmachineRule"
> 
> 
>- // $ANTLR start ruleSubmachineRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:286:1: ruleSubmachineRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleSubmachineRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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;
> 
>+ Token otherlv_1=null;
> EObject lv_path_0_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:291:6: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:292:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:247:28: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:248:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:292:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:292:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:248:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:248:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:292:2: ( (lv_path_0_0= ruleQualifiedName ) )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:248:2: ( (lv_path_0_0= ruleQualifiedName ) )?
> int alt3=2;
> int LA3_0 = input.LA(1);
> 
>@@ -546,34 +554,29 @@
> }
> switch (alt3) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:293:1: (lv_path_0_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:249:1: (lv_path_0_0= ruleQualifiedName )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:293:1: (lv_path_0_0= ruleQualifiedName )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:294:3: lv_path_0_0= ruleQualifiedName
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:249:1: (lv_path_0_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:250:3: lv_path_0_0= ruleQualifiedName
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getSubmachineRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 	 
>- pushFollow(FOLLOW_ruleQualifiedName_in_ruleSubmachineRule502);
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleSubmachineRule516);
> lv_path_0_0=ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getSubmachineRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"path",
>- 	 		lv_path_0_0, 
>- 	 		"QualifiedName", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getSubmachineRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -584,21 +587,20 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:316:3: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:317:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:266:3: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:267:1: (otherlv_1= RULE_ID )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:317:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:318:3: RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:267:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:268:3: otherlv_1= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getSubmachineRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getSubmachineRuleRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubmachineRule521); 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubmachineRule537); 
> 
>- 		createLeafNode(grammarAccess.getSubmachineRuleAccess().getSubmachineStateMachineCrossReference_1_0(), "submachine"); 
>+ 		newLeafNode(otherlv_1, grammarAccess.getSubmachineRuleAccess().getSubmachineStateMachineCrossReference_1_0()); 
> 	
> 
> }
>@@ -612,9 +614,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -625,11 +625,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleSubmachineRule
>+ // $ANTLR end "ruleSubmachineRule"
> 
> 
>- // $ANTLR start entryRuleQualifiedName
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:338:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:287:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
> public final EObject entryRuleQualifiedName() throws RecognitionException {
> EObject current = null;
> 
>@@ -637,16 +637,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:339:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:340:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:288:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:289:2: iv_ruleQualifiedName= ruleQualifiedName EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); 
>- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName557);
>+ newCompositeNode(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName573);
> iv_ruleQualifiedName=ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleQualifiedName; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName567); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName583); 
> 
> }
> 
>@@ -660,41 +661,42 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleQualifiedName
>+ // $ANTLR end "entryRuleQualifiedName"
> 
> 
>- // $ANTLR start ruleQualifiedName
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:347:1: ruleQualifiedName returns [EObject current=null] : ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ;
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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;
> 
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
> EObject lv_remaining_2_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:352:6: ( ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:353:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:299:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:300:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:353:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:353:2: ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:300:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:300:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:353:2: ( ( RULE_ID ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:354:1: ( RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:300:2: ( (otherlv_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:301:1: (otherlv_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:354:1: ( RULE_ID )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:355:3: RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:301:1: (otherlv_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:302:3: otherlv_0= RULE_ID
> {
> 
> 			if (current==null) {
>- 	 current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>+ 	 current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> 
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName610); 
>+ otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName628); 
> 
>- 		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+ 		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	
> 
> }
>@@ -702,11 +704,11 @@
> 
> }
> 
>- match(input,12,FOLLOW_12_in_ruleQualifiedName620); 
>+ otherlv_1=(Token)match(input,12,FOLLOW_12_in_ruleQualifiedName640); 
> 
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:371:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:317:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
> int alt4=2;
> int LA4_0 = input.LA(1);
> 
>@@ -719,34 +721,29 @@
> }
> switch (alt4) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:372:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:318:1: (lv_remaining_2_0= ruleQualifiedName )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:372:1: (lv_remaining_2_0= ruleQualifiedName )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:373:3: lv_remaining_2_0= ruleQualifiedName
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:318:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:319:3: lv_remaining_2_0= ruleQualifiedName
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 
>- pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName641);
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName661);
> lv_remaining_2_0=ruleQualifiedName();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"remaining",
>- 	 		lv_remaining_2_0, 
>- 	 		"QualifiedName", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -763,9 +760,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -776,11 +771,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleQualifiedName
>+ // $ANTLR end "ruleQualifiedName"
> 
> 
>- // $ANTLR start entryRuleEntryRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:403:1: entryRuleEntryRule returns [EObject current=null] : iv_ruleEntryRule= ruleEntryRule EOF ;
>+ // $ANTLR start "entryRuleEntryRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:343:1: entryRuleEntryRule returns [EObject current=null] : iv_ruleEntryRule= ruleEntryRule EOF ;
> public final EObject entryRuleEntryRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -788,16 +783,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:404:2: (iv_ruleEntryRule= ruleEntryRule EOF )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:405:2: iv_ruleEntryRule= ruleEntryRule EOF
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:344:2: (iv_ruleEntryRule= ruleEntryRule EOF )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:345:2: iv_ruleEntryRule= ruleEntryRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getEntryRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleEntryRule_in_entryRuleEntryRule678);
>+ newCompositeNode(grammarAccess.getEntryRuleRule()); 
>+ pushFollow(FOLLOW_ruleEntryRule_in_entryRuleEntryRule698);
> iv_ruleEntryRule=ruleEntryRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleEntryRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleEntryRule688); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleEntryRule708); 
> 
> }
> 
>@@ -811,60 +807,56 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleEntryRule
>+ // $ANTLR end "entryRuleEntryRule"
> 
> 
>- // $ANTLR start ruleEntryRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:412:1: ruleEntryRule returns [EObject current=null] : ( 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleEntryRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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 ) ) ) ;
> public final EObject ruleEntryRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_behaviorName_2_0=null;
> Enumerator lv_kind_1_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:417:6: ( ( 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:418:1: ( 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:418:1: ( 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:418:3: 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:356:3: otherlv_0= 'entry' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
> {
>- match(input,13,FOLLOW_13_in_ruleEntryRule723); 
>+ otherlv_0=(Token)match(input,13,FOLLOW_13_in_ruleEntryRule745); 
> 
>- createLeafNode(grammarAccess.getEntryRuleAccess().getEntryKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getEntryRuleAccess().getEntryKeyword_0());
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:422:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:423:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:360:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:361:1: (lv_kind_1_0= ruleBehaviorKind )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:423:1: (lv_kind_1_0= ruleBehaviorKind )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:424:3: lv_kind_1_0= ruleBehaviorKind
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:361:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:362:3: lv_kind_1_0= ruleBehaviorKind
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getEntryRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleBehaviorKind_in_ruleEntryRule744);
>+ pushFollow(FOLLOW_ruleBehaviorKind_in_ruleEntryRule766);
> lv_kind_1_0=ruleBehaviorKind();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getEntryRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"kind",
>- 	 		lv_kind_1_0, 
>- 	 		"BehaviorKind", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getEntryRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -872,32 +864,25 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:446:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:447:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:378:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:379:1: (lv_behaviorName_2_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:447:1: (lv_behaviorName_2_0= RULE_ID )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:448:3: lv_behaviorName_2_0= RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:379:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:380:3: lv_behaviorName_2_0= RULE_ID
> {
>- lv_behaviorName_2_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntryRule761); 
>+ lv_behaviorName_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntryRule783); 
> 
>- 			createLeafNode(grammarAccess.getEntryRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+ 			newLeafNode(lv_behaviorName_2_0, grammarAccess.getEntryRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getEntryRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"behaviorName",
>- 	 		lv_behaviorName_2_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getEntryRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -911,9 +896,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -924,11 +907,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleEntryRule
>+ // $ANTLR end "ruleEntryRule"
> 
> 
>- // $ANTLR start entryRuleDoRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:478:1: entryRuleDoRule returns [EObject current=null] : iv_ruleDoRule= ruleDoRule EOF ;
>+ // $ANTLR start "entryRuleDoRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:404:1: entryRuleDoRule returns [EObject current=null] : iv_ruleDoRule= ruleDoRule EOF ;
> public final EObject entryRuleDoRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -936,16 +919,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:479:2: (iv_ruleDoRule= ruleDoRule EOF )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:480:2: iv_ruleDoRule= ruleDoRule EOF
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:405:2: (iv_ruleDoRule= ruleDoRule EOF )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:406:2: iv_ruleDoRule= ruleDoRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getDoRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleDoRule_in_entryRuleDoRule802);
>+ newCompositeNode(grammarAccess.getDoRuleRule()); 
>+ pushFollow(FOLLOW_ruleDoRule_in_entryRuleDoRule824);
> iv_ruleDoRule=ruleDoRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleDoRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleDoRule812); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleDoRule834); 
> 
> }
> 
>@@ -959,60 +943,56 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleDoRule
>+ // $ANTLR end "entryRuleDoRule"
> 
> 
>- // $ANTLR start ruleDoRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:487:1: ruleDoRule returns [EObject current=null] : ( 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleDoRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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 ) ) ) ;
> public final EObject ruleDoRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_behaviorName_2_0=null;
> Enumerator lv_kind_1_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:492:6: ( ( 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:493:1: ( 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:493:1: ( 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:493:3: 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:417:3: otherlv_0= 'do' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
> {
>- match(input,14,FOLLOW_14_in_ruleDoRule847); 
>+ otherlv_0=(Token)match(input,14,FOLLOW_14_in_ruleDoRule871); 
> 
>- createLeafNode(grammarAccess.getDoRuleAccess().getDoKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getDoRuleAccess().getDoKeyword_0());
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:497:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:498:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:421:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:422:1: (lv_kind_1_0= ruleBehaviorKind )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:498:1: (lv_kind_1_0= ruleBehaviorKind )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:499:3: lv_kind_1_0= ruleBehaviorKind
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:422:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:423:3: lv_kind_1_0= ruleBehaviorKind
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getDoRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleBehaviorKind_in_ruleDoRule868);
>+ pushFollow(FOLLOW_ruleBehaviorKind_in_ruleDoRule892);
> lv_kind_1_0=ruleBehaviorKind();
>- _fsp--;
>+
>+ state._fsp--;
> 
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getDoRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"kind",
>- 	 		lv_kind_1_0, 
>- 	 		"BehaviorKind", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getDoRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1020,32 +1000,25 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:521:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:522:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:439:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:440:1: (lv_behaviorName_2_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:522:1: (lv_behaviorName_2_0= RULE_ID )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:523:3: lv_behaviorName_2_0= RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:440:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:441:3: lv_behaviorName_2_0= RULE_ID
> {
>- lv_behaviorName_2_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDoRule885); 
>+ lv_behaviorName_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDoRule909); 
> 
>- 			createLeafNode(grammarAccess.getDoRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+ 			newLeafNode(lv_behaviorName_2_0, grammarAccess.getDoRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getDoRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"behaviorName",
>- 	 		lv_behaviorName_2_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getDoRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -1059,9 +1032,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1072,11 +1043,11 @@
> }
> return current;
> }
>- // $ANTLR end ruleDoRule
>+ // $ANTLR end "ruleDoRule"
> 
> 
>- // $ANTLR start entryRuleExitRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:553:1: entryRuleExitRule returns [EObject current=null] : iv_ruleExitRule= ruleExitRule EOF ;
>+ // $ANTLR start "entryRuleExitRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:465:1: entryRuleExitRule returns [EObject current=null] : iv_ruleExitRule= ruleExitRule EOF ;
> public final EObject entryRuleExitRule() throws RecognitionException {
> EObject current = null;
> 
>@@ -1084,16 +1055,17 @@
> 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:554:2: (iv_ruleExitRule= ruleExitRule EOF )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:555:2: iv_ruleExitRule= ruleExitRule EOF
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:466:2: (iv_ruleExitRule= ruleExitRule EOF )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:467:2: iv_ruleExitRule= ruleExitRule EOF
> {
>- currentNode = createCompositeNode(grammarAccess.getExitRuleRule(), currentNode); 
>- pushFollow(FOLLOW_ruleExitRule_in_entryRuleExitRule926);
>+ newCompositeNode(grammarAccess.getExitRuleRule()); 
>+ pushFollow(FOLLOW_ruleExitRule_in_entryRuleExitRule950);
> iv_ruleExitRule=ruleExitRule();
>- _fsp--;
>+
>+ state._fsp--;
> 
> current =iv_ruleExitRule; 
>- match(input,EOF,FOLLOW_EOF_in_entryRuleExitRule936); 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleExitRule960); 
> 
> }
> 
>@@ -1107,60 +1079,56 @@
> }
> return current;
> }
>- // $ANTLR end entryRuleExitRule
>+ // $ANTLR end "entryRuleExitRule"
> 
> 
>- // $ANTLR start ruleExitRule
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:562:1: ruleExitRule returns [EObject current=null] : ( 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) ;
>+ // $ANTLR start "ruleExitRule"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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 ) ) ) ;
> public final EObject ruleExitRule() throws RecognitionException {
> EObject current = null;
> 
>+ Token otherlv_0=null;
> Token lv_behaviorName_2_0=null;
> Enumerator lv_kind_1_0 = null;
> 
> 
>- EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ enterRule(); 
> 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:567:6: ( ( 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:568:1: ( 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:568:1: ( 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:568:3: 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/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.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:478:3: otherlv_0= 'exit' ( (lv_kind_1_0= ruleBehaviorKind ) ) ( (lv_behaviorName_2_0= RULE_ID ) )
> {
>- match(input,15,FOLLOW_15_in_ruleExitRule971); 
>+ otherlv_0=(Token)match(input,15,FOLLOW_15_in_ruleExitRule997); 
> 
>- createLeafNode(grammarAccess.getExitRuleAccess().getExitKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getExitRuleAccess().getExitKeyword_0());
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:572:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:573:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:482:1: ( (lv_kind_1_0= ruleBehaviorKind ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:483:1: (lv_kind_1_0= ruleBehaviorKind )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:573:1: (lv_kind_1_0= ruleBehaviorKind )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:574:3: lv_kind_1_0= ruleBehaviorKind
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:483:1: (lv_kind_1_0= ruleBehaviorKind )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:484:3: lv_kind_1_0= ruleBehaviorKind
> {
> 
>- 	 currentNode=createCompositeNode(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0(), currentNode); 
>+ 	 newCompositeNode(grammarAccess.getExitRuleAccess().getKindBehaviorKindEnumRuleCall_1_0()); 
> 	 
>- pushFollow(FOLLOW_ruleBehaviorKind_in_ruleExitRule992);
>+ pushFollow(FOLLOW_ruleBehaviorKind_in_ruleExitRule1018);
> lv_kind_1_0=ruleBehaviorKind();
>- _fsp--;
> 
>+ state._fsp--;
>+
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getExitRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode.getParent(), current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"kind",
>- 	 		lv_kind_1_0, 
>- 	 		"BehaviorKind", 
>- 	 		currentNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElementForParent(grammarAccess.getExitRuleRule());
> 	 }
>- 	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			current, 
>+ 			"kind",
>+ 		lv_kind_1_0, 
>+ 		"BehaviorKind");
>+ 	 afterParserOrEnumRuleCall();
> 	 
> 
> }
>@@ -1168,32 +1136,25 @@
> 
> }
> 
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:596:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:597:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:500:2: ( (lv_behaviorName_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:501:1: (lv_behaviorName_2_0= RULE_ID )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:597:1: (lv_behaviorName_2_0= RULE_ID )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:598:3: lv_behaviorName_2_0= RULE_ID
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:501:1: (lv_behaviorName_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:502:3: lv_behaviorName_2_0= RULE_ID
> {
>- lv_behaviorName_2_0=(Token)input.LT(1);
>- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExitRule1009); 
>+ lv_behaviorName_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExitRule1035); 
> 
>- 			createLeafNode(grammarAccess.getExitRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0(), "behaviorName"); 
>+ 			newLeafNode(lv_behaviorName_2_0, grammarAccess.getExitRuleAccess().getBehaviorNameIDTerminalRuleCall_2_0()); 
> 		
> 
> 	 if (current==null) {
>- 	 current = factory.create(grammarAccess.getExitRuleRule().getType().getClassifier());
>- 	 associateNodeWithAstElement(currentNode, current);
>- 	 }
>- 	 try {
>- 	 		set(
>- 	 			current, 
>- 	 			"behaviorName",
>- 	 		lv_behaviorName_2_0, 
>- 	 		"ID", 
>- 	 		lastConsumedNode);
>- 	 } catch (ValueConverterException vce) {
>- 				handleValueConverterException(vce);
>+ 	 current = createModelElement(grammarAccess.getExitRuleRule());
> 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"behaviorName",
>+ 		lv_behaviorName_2_0, 
>+ 		"ID");
> 	 
> 
> }
>@@ -1207,9 +1168,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1220,20 +1179,24 @@
> }
> return current;
> }
>- // $ANTLR end ruleExitRule
>+ // $ANTLR end "ruleExitRule"
> 
> 
>- // $ANTLR start ruleBehaviorKind
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:628:1: ruleBehaviorKind returns [Enumerator current=null] : ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) ) ;
>+ // $ANTLR start "ruleBehaviorKind"
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/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;
> 
>- setCurrentLookahead(); resetLookahead(); 
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+
>+ enterRule(); 
> try {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:632:6: ( ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) ) )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:633:1: ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:528:28: ( ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:529:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:633:1: ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:529:1: ( (enumLiteral_0= 'Activity' ) | (enumLiteral_1= 'StateMachine' ) | (enumLiteral_2= 'OpaqueBehavior' ) )
> int alt5=3;
> switch ( input.LA(1) ) {
> case 16:
>@@ -1253,22 +1216,22 @@
> break;
> default:
> NoViableAltException nvae =
>- new NoViableAltException("633:1: ( ( 'Activity' ) | ( 'StateMachine' ) | ( 'OpaqueBehavior' ) )", 5, 0, input);
>+ new NoViableAltException("", 5, 0, input);
> 
> throw nvae;
> }
> 
> switch (alt5) {
> case 1 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:633:2: ( 'Activity' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:529:2: (enumLiteral_0= 'Activity' )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:633:2: ( 'Activity' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:633:4: 'Activity'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:529:2: (enumLiteral_0= 'Activity' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:529:4: enumLiteral_0= 'Activity'
> {
>- match(input,16,FOLLOW_16_in_ruleBehaviorKind1062); 
>+ enumLiteral_0=(Token)match(input,16,FOLLOW_16_in_ruleBehaviorKind1090); 
> 
> current = grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getBehaviorKindAccess().getACTIVITYEnumLiteralDeclaration_0()); 
> 
> 
> }
>@@ -1277,15 +1240,15 @@
> }
> break;
> case 2 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:639:6: ( 'StateMachine' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:535:6: (enumLiteral_1= 'StateMachine' )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:639:6: ( 'StateMachine' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:639:8: 'StateMachine'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:535:6: (enumLiteral_1= 'StateMachine' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:535:8: enumLiteral_1= 'StateMachine'
> {
>- match(input,17,FOLLOW_17_in_ruleBehaviorKind1077); 
>+ enumLiteral_1=(Token)match(input,17,FOLLOW_17_in_ruleBehaviorKind1107); 
> 
> current = grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getBehaviorKindAccess().getSTATE_MACHINEEnumLiteralDeclaration_1()); 
> 
> 
> }
>@@ -1294,15 +1257,15 @@
> }
> break;
> case 3 :
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:645:6: ( 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:541:6: (enumLiteral_2= 'OpaqueBehavior' )
> {
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:645:6: ( 'OpaqueBehavior' )
>- // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:645:8: 'OpaqueBehavior'
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:541:6: (enumLiteral_2= 'OpaqueBehavior' )
>+ // ../org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/parser/antlr/internal/InternalUmlState.g:541:8: enumLiteral_2= 'OpaqueBehavior'
> {
>- match(input,18,FOLLOW_18_in_ruleBehaviorKind1092); 
>+ enumLiteral_2=(Token)match(input,18,FOLLOW_18_in_ruleBehaviorKind1124); 
> 
> current = grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getBehaviorKindAccess().getOPAQUE_BEHAVIOREnumLiteralDeclaration_2()); 
> 
> 
> }
>@@ -1316,9 +1279,7 @@
> 
> }
> 
>- resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- 
>+ leaveRule(); 
> }
> 
> catch (RecognitionException re) { 
>@@ -1329,45 +1290,47 @@
> }
> return current;
> }
>- // $ANTLR end ruleBehaviorKind
>+ // $ANTLR end "ruleBehaviorKind"
> 
>+ // Delegated rules
>+
> 
> 
> 
> 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[]{0x000000000000E802L});
>- public static final BitSet FOLLOW_11_in_ruleStateRule143 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_ruleSubmachineRule_in_ruleStateRule164 = new BitSet(new long[]{0x000000000000E002L});
>- public static final BitSet FOLLOW_ruleEntryRule_in_ruleStateRule229 = new BitSet(new long[]{0x000000000000E002L});
>- public static final BitSet FOLLOW_ruleDoRule_in_ruleStateRule300 = new BitSet(new long[]{0x000000000000E002L});
>- public static final BitSet FOLLOW_ruleExitRule_in_ruleStateRule371 = new BitSet(new long[]{0x000000000000E002L});
>- public static final BitSet FOLLOW_ruleSubmachineRule_in_entryRuleSubmachineRule446 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleSubmachineRule456 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleSubmachineRule502 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleSubmachineRule521 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName557 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName567 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName610 = new BitSet(new long[]{0x0000000000001000L});
>- public static final BitSet FOLLOW_12_in_ruleQualifiedName620 = new BitSet(new long[]{0x0000000000000012L});
>- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName641 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleEntryRule_in_entryRuleEntryRule678 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleEntryRule688 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_13_in_ruleEntryRule723 = new BitSet(new long[]{0x0000000000070000L});
>- public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleEntryRule744 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleEntryRule761 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleDoRule_in_entryRuleDoRule802 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleDoRule812 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_14_in_ruleDoRule847 = new BitSet(new long[]{0x0000000000070000L});
>- public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleDoRule868 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleDoRule885 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_ruleExitRule_in_entryRuleExitRule926 = new BitSet(new long[]{0x0000000000000000L});
>- public static final BitSet FOLLOW_EOF_in_entryRuleExitRule936 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_15_in_ruleExitRule971 = new BitSet(new long[]{0x0000000000070000L});
>- public static final BitSet FOLLOW_ruleBehaviorKind_in_ruleExitRule992 = new BitSet(new long[]{0x0000000000000010L});
>- public static final BitSet FOLLOW_RULE_ID_in_ruleExitRule1009 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_16_in_ruleBehaviorKind1062 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_17_in_ruleBehaviorKind1077 = new BitSet(new long[]{0x0000000000000002L});
>- public static final BitSet FOLLOW_18_in_ruleBehaviorKind1092 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_11_in_ruleStateRule145 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_ruleSubmachineRule_in_ruleStateRule166 = new BitSet(new long[]{0x000000000000E002L});
>+ public static final BitSet FOLLOW_ruleEntryRule_in_ruleStateRule234 = new BitSet(new long[]{0x000000000000E002L});
>+ public static final BitSet FOLLOW_ruleDoRule_in_ruleStateRule309 = new BitSet(new long[]{0x000000000000E002L});
>+ public static final BitSet FOLLOW_ruleExitRule_in_ruleStateRule384 = new BitSet(new long[]{0x000000000000E002L});
>+ 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[]{0x0000000000001000L});
>+ public static final BitSet FOLLOW_12_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_13_in_ruleEntryRule745 = new BitSet(new long[]{0x0000000000070000L});
>+ 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_14_in_ruleDoRule871 = new BitSet(new long[]{0x0000000000070000L});
>+ 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_15_in_ruleExitRule997 = new BitSet(new long[]{0x0000000000070000L});
>+ 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_16_in_ruleBehaviorKind1090 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_17_in_ruleBehaviorKind1107 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_18_in_ruleBehaviorKind1124 = new BitSet(new long[]{0x0000000000000002L});
> 
> }
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/validation/AbstractUmlStateJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/validation/AbstractUmlStateJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/validation/AbstractUmlStateJavaValidator.java	(working copy)
>@@ -10,7 +10,7 @@
> @ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlStateJavaValidator extends AbstractDeclarativeValidator {
> 
>-@Override
>+	@Override
> 	protected List<EPackage> getEPackages() {
> 	 List<EPackage> result = new ArrayList<EPackage>();
> 	 result.add(org.eclipse.papyrus.state.editor.xtext.umlState.UmlStatePackage.eINSTANCE);
>Index: src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.genmodel	(working copy)
>@@ -6,40 +6,40 @@
> modelPluginID="org.eclipse.papyrus.state.editor.xtext" forceOverwrite="true" modelName="UmlState"
> updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.state.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.state.editor.xtext.editor" usedGenPackages="../../../../../../../model/UML.genmodel#//uml">
>+ editorPluginID="org.eclipse.papyrus.state.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.state.editor.xtext/model/UML.genmodel#//uml">
> <genPackages prefix="UmlState" basePackage="org.eclipse.papyrus.state.editor.xtext"
>- resource="XML" 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"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlState.ecore#//BehaviorKind/OPAQUE_BEHAVIOR"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#/">
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind/ACTIVITY"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind/STATE_MACHINE"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//BehaviorKind/OPAQUE_BEHAVIOR"/>
> </genEnums>
>- <genClasses ecoreClass="UmlState.ecore#//StateRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//StateRule/name"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlState.ecore#//StateRule/submachine"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlState.ecore#//StateRule/entry"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlState.ecore#//StateRule/do"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlState.ecore#//StateRule/exit"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//StateRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//StateRule/name"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//StateRule/submachine"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//StateRule/entry"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//StateRule/do"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//StateRule/exit"/>
> </genClasses>
>- <genClasses ecoreClass="UmlState.ecore#//SubmachineRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlState.ecore#//SubmachineRule/path"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlState.ecore#//SubmachineRule/submachine"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//SubmachineRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//SubmachineRule/path"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//SubmachineRule/submachine"/>
> </genClasses>
>- <genClasses ecoreClass="UmlState.ecore#//QualifiedName">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference UmlState.ecore#//QualifiedName/path"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlState.ecore#//QualifiedName/remaining"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//QualifiedName">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//QualifiedName/path"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//QualifiedName/remaining"/>
> </genClasses>
>- <genClasses ecoreClass="UmlState.ecore#//EntryRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//EntryRule/kind"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//EntryRule/behaviorName"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//EntryRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//EntryRule/kind"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//EntryRule/behaviorName"/>
> </genClasses>
>- <genClasses ecoreClass="UmlState.ecore#//DoRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//DoRule/kind"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//DoRule/behaviorName"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//DoRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//DoRule/kind"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//DoRule/behaviorName"/>
> </genClasses>
>- <genClasses ecoreClass="UmlState.ecore#//ExitRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//ExitRule/kind"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlState.ecore#//ExitRule/behaviorName"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//ExitRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//ExitRule/kind"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.state.editor.xtext/src-gen/org/eclipse/papyrus/state/editor/xtext/UmlState.ecore#//ExitRule/behaviorName"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>Index: src/org/eclipse/papyrus/state/editor/xtext/validation/UmlStateJavaValidator.java
>===================================================================
>--- src/org/eclipse/papyrus/state/editor/xtext/validation/UmlStateJavaValidator.java	(revision 4043)
>+++ src/org/eclipse/papyrus/state/editor/xtext/validation/UmlStateJavaValidator.java	(working copy)
>@@ -97,12 +97,12 @@
> 		String newName = "" + stateRule.getName() ;
> 		
> 		if (alreadyUsedNames.contains("" + newName))
>-			warning("Name " + newName + " is already used by another State in this Region", UmlStatePackage.STATE_RULE__NAME) ;
>+			warning("Name " + newName + " is already used by another State in this Region", UmlStatePackage.eINSTANCE.getStateRule_Name()) ;
> 		
> 		
> 		// Check if ConnectionPointReference exist when one delete the submachine reference: not allowed!
> 		if((stateRule.getSubmachine() == null) && !editedState.getConnections().isEmpty()){
>-			error(getErrorMessageForSubmachineState(), stateRule, UmlStatePackage.STATE_RULE) ;
>+			error(getErrorMessageForSubmachineState(), UmlStatePackage.eINSTANCE.getStateRule_Submachine()) ;
> 			valid_StateName = false ;
> 		}
> 		else {
>@@ -123,7 +123,7 @@
> 					)
> 					+ " "
> 					+ editedState.getDoActivity().getName()
>-					+ " will be deleted", UmlStatePackage.STATE_RULE__NAME) ;
>+					+ " will be deleted", UmlStatePackage.eINSTANCE.getStateRule_Name()) ;
> 		}
> 		
> 		if (deletionOfExit) {
>@@ -132,7 +132,7 @@
> 					)
> 					+ " "
> 					+ editedState.getExit().getName()
>-					+ " will be deleted", UmlStatePackage.STATE_RULE__NAME) ;
>+					+ " will be deleted", UmlStatePackage.eINSTANCE.getStateRule_Name()) ;
> 		}
> 		
> 		if (deletionOfEntry) {
>@@ -141,7 +141,7 @@
> 					)
> 					+ " "
> 					+ editedState.getEntry().getName()
>-					+ " will be deleted", UmlStatePackage.STATE_RULE__NAME) ;
>+					+ " will be deleted", UmlStatePackage.eINSTANCE.getStateRule_Name()) ;
> 		}
> 	}
> 	
>@@ -179,7 +179,7 @@
> 						+ getBehaviorKindAsString(oldDoKind)
> 						+ " "
> 						+ doRule.getBehaviorName()
>-						+ " will be lost", UmlStatePackage.DO_RULE__KIND) ;
>+						+ " will be lost", UmlStatePackage.eINSTANCE.getDoRule_Kind()) ;
> 			}
> 		}
> 	}
>@@ -218,7 +218,7 @@
> 						+ getBehaviorKindAsString(oldDoKind)
> 						+ " "
> 						+ entryRule.getBehaviorName()
>-						+ " will be lost", UmlStatePackage.ENTRY_RULE__KIND) ;
>+						+ " will be lost", UmlStatePackage.eINSTANCE.getEntryRule_Kind()) ;
> 			}
> 		}
> 	}
>@@ -257,7 +257,7 @@
> 						+ getBehaviorKindAsString(oldDoKind)
> 						+ " "
> 						+ exitRule.getBehaviorName()
>-						+ " will be lost", UmlStatePackage.EXIT_RULE__KIND) ;
>+						+ " will be lost", UmlStatePackage.eINSTANCE.getExitRule_Kind()) ;
> 			}
> 		}
> 	}
>@@ -268,14 +268,14 @@
> 			return ;
> 		org.eclipse.uml2.uml.State contextState = (org.eclipse.uml2.uml.State)contextElement ;
> 		if (contextState.isOrthogonal()) {
>-			error(getErrorMessageForOrthogonalState(), rule, UmlStatePackage.SUBMACHINE_RULE__SUBMACHINE) ;
>+			error(getErrorMessageForOrthogonalState(), UmlStatePackage.eINSTANCE.getSubmachineRule_Submachine()) ;
> 			valid_SubMachineRule = false ;
> 		}
> 		else {
> 			valid_SubMachineRule = true ;
> 		}
> 		if (contextState.isComposite()) {
>-			error(getErrorMessageForCompositeState(), rule, UmlStatePackage.SUBMACHINE_RULE__SUBMACHINE) ;
>+			error(getErrorMessageForCompositeState(), UmlStatePackage.eINSTANCE.getSubmachineRule_Submachine()) ;
> 			valid_SubMachineRule = false ;
> 		}
> 		else {
>Index: src/org/eclipse/papyrus/state/editor/xtext/GenerateUmlState.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/state/editor/xtext/GenerateUmlState.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/state/editor/xtext/GenerateUmlState.mwe2	(working copy)
>@@ -87,8 +87,7 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// quickfix API 
>#P org.eclipse.papyrus.parameter.editor.xtext
>Index: plugin.xml_gen
>===================================================================
>--- plugin.xml_gen	(revision 4043)
>+++ plugin.xml_gen	(working copy)
>@@ -14,5 +14,4 @@
> 
> 
> 
>-
> </plugin>
>Index: src/org/eclipse/papyrus/parameter/editor/xtext/GenerateUmlParameter.mwe2
>===================================================================
>--- src/org/eclipse/papyrus/parameter/editor/xtext/GenerateUmlParameter.mwe2	(revision 4043)
>+++ src/org/eclipse/papyrus/parameter/editor/xtext/GenerateUmlParameter.mwe2	(working copy)
>@@ -87,8 +87,7 @@
> 			fragment = labeling.LabelProviderFragment {}
> 
> 			// outline API 
>-			fragment = outline.TransformerFragment {}
>-			fragment = outline.OutlineNodeAdapterFactoryFragment {}
>+			fragment = outline.OutlineTreeProviderFragment {}
> 			fragment = outline.QuickOutlineFragment {}
> 
> 			// quickfix API 
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens	(working copy)
>@@ -1,11 +1,37 @@
> RULE_ID=4
>-RULE_STRING=7
> RULE_UNLIMITEDLITERAL=5
>+T__29=29
>+T__28=28
>+T__27=27
>+T__26=26
>+T__25=25
>+T__24=24
>+T__23=23
>+T__22=22
> RULE_ANY_OTHER=11
>-RULE_INT=6
>-RULE_WS=10
>+T__21=21
>+T__20=20
> RULE_SL_COMMENT=9
> RULE_ML_COMMENT=8
>+T__30=30
>+T__19=19
>+T__31=31
>+RULE_STRING=7
>+T__32=32
>+T__33=33
>+T__16=16
>+T__34=34
>+T__15=15
>+T__35=35
>+T__18=18
>+T__36=36
>+T__17=17
>+T__37=37
>+T__12=12
>+T__14=14
>+T__13=13
>+RULE_INT=6
>+RULE_WS=10
> '..'=20
> 'ordered'=24
> 'update'=28
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g	(working copy)
>@@ -19,11 +19,9 @@
> @parser::header {
> package org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -31,7 +29,6 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.parameter.editor.xtext.services.UmlParameterGrammarAccess;
> 
> }
>@@ -40,17 +37,10 @@
> 
> 	private UmlParameterGrammarAccess grammarAccess;
> 	
>- public InternalUmlParameterParser(TokenStream input, IAstFactory factory, UmlParameterGrammarAccess grammarAccess) {
>+ public InternalUmlParameterParser(TokenStream input, UmlParameterGrammarAccess grammarAccess) {
> this(input);
>- this.factory = factory;
>- registerRules(grammarAccess.getGrammar());
> this.grammarAccess = grammarAccess;
>- }
>- 
>- @Override
>- protected InputStream getTokenFile() {
>- 	ClassLoader classLoader = getClass().getClassLoader();
>- 	return classLoader.getResourceAsStream("org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens");
>+ registerRules(grammarAccess.getGrammar());
> }
> 
> @Override
>@@ -77,7 +67,7 @@
> // Entry rule entryRuleParameterRule
> entryRuleParameterRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getParameterRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getParameterRuleRule()); }
> 	 iv_ruleParameterRule=ruleParameterRule 
> 	 { $current=$iv_ruleParameterRule.current; } 
> 	 EOF 
>@@ -85,56 +75,42 @@
> 
> // Rule ParameterRule
> ruleParameterRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
> 	 }
> 		lv_visibility_0_0=ruleVisibilityKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"visibility",
>-	 		lv_visibility_0_0, 
>-	 		"VisibilityKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"visibility",
>+ 		lv_visibility_0_0, 
>+ 		"VisibilityKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0()); 
> 	 }
> 		lv_direction_1_0=ruleDirection		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"direction",
>-	 		lv_direction_1_0, 
>-	 		"Direction", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"direction",
>+ 		lv_direction_1_0, 
>+ 		"Direction");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -142,128 +118,98 @@
> (
> 		lv_name_2_0=RULE_ID
> 		{
>-			createLeafNode(grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
>+			newLeafNode(lv_name_2_0, grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"name",
>-	 		lv_name_2_0, 
>-	 		"ID", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"name",
>+ 		lv_name_2_0, 
>+ 		"ID");
> 	 }
> 
> )
>-)	':' 
>+)	otherlv_3=':' 
> {
>- createLeafNode(grammarAccess.getParameterRuleAccess().getColonKeyword_3(), null); 
>+ 	newLeafNode(otherlv_3, grammarAccess.getParameterRuleAccess().getColonKeyword_3());
> }
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
> 	 }
> 		lv_type_4_0=ruleTypeRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"type",
>-	 		lv_type_4_0, 
>-	 		"TypeRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"type",
>+ 		lv_type_4_0, 
>+ 		"TypeRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )
>- |	'<Undefined>' 
>+ |	otherlv_5='<Undefined>' 
> {
>- createLeafNode(grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1(), null); 
>+ 	newLeafNode(otherlv_5, grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1());
> }
> )(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
> 	 }
> 		lv_multiplicity_6_0=ruleMultiplicityRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"multiplicity",
>-	 		lv_multiplicity_6_0, 
>-	 		"MultiplicityRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"multiplicity",
>+ 		lv_multiplicity_6_0, 
>+ 		"MultiplicityRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
> 	 }
> 		lv_modifiers_7_0=ruleModifiersRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"modifiers",
>-	 		lv_modifiers_7_0, 
>-	 		"ModifiersRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"modifiers",
>+ 		lv_modifiers_7_0, 
>+ 		"ModifiersRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
> )?(
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0()); 
> 	 }
> 		lv_effect_8_0=ruleEffectRule		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getParameterRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"effect",
>-	 		lv_effect_8_0, 
>-	 		"EffectRule", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"effect",
>+ 		lv_effect_8_0, 
>+ 		"EffectRule");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -277,7 +223,7 @@
> // Entry rule entryRuleModifiersRule
> entryRuleModifiersRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getModifiersRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getModifiersRuleRule()); }
> 	 iv_ruleModifiersRule=ruleModifiersRule 
> 	 { $current=$iv_ruleModifiersRule.current; } 
> 	 EOF 
>@@ -285,70 +231,56 @@
> 
> // Rule ModifiersRule
> ruleModifiersRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'{' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='{' 
> {
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
> 	 }
> 		lv_values_1_0=ruleModifierSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"values",
>-	 		lv_values_1_0, 
>-	 		"ModifierSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"values",
>+ 		lv_values_1_0, 
>+ 		"ModifierSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)(	',' 
>+)(	otherlv_2=',' 
> {
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
> 	 }
> 		lv_values_3_0=ruleModifierSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"values",
>-	 		lv_values_3_0, 
>-	 		"ModifierSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"values",
>+ 		lv_values_3_0, 
>+ 		"ModifierSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-))*	'}' 
>+))*	otherlv_4='}' 
> {
>- createLeafNode(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3());
> }
> )
> ;
>@@ -360,7 +292,7 @@
> // Entry rule entryRuleModifierSpecification
> entryRuleModifierSpecification returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getModifierSpecificationRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getModifierSpecificationRule()); }
> 	 iv_ruleModifierSpecification=ruleModifierSpecification 
> 	 { $current=$iv_ruleModifierSpecification.current; } 
> 	 EOF 
>@@ -368,32 +300,24 @@
> 
> // Rule ModifierSpecification
> ruleModifierSpecification returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); 
> 	 }
> 		lv_value_0_0=ruleModifierKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"value",
>-	 		lv_value_0_0, 
>-	 		"ModifierKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"ModifierKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -407,7 +331,7 @@
> // Entry rule entryRuleEffectRule
> entryRuleEffectRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getEffectRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getEffectRuleRule()); }
> 	 iv_ruleEffectRule=ruleEffectRule 
> 	 { $current=$iv_ruleEffectRule.current; } 
> 	 EOF 
>@@ -415,46 +339,38 @@
> 
> // Rule EffectRule
> ruleEffectRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'{' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='{' 
> {
>- createLeafNode(grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0());
> }
>-	'effect: ' 
>+	otherlv_1='effect: ' 
> {
>- createLeafNode(grammarAccess.getEffectRuleAccess().getEffectKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getEffectRuleAccess().getEffectKeyword_1());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0()); 
> 	 }
> 		lv_effectKind_2_0=ruleEffectKind		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getEffectRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"effectKind",
>-	 		lv_effectKind_2_0, 
>-	 		"EffectKind", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getEffectRuleRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"effectKind",
>+ 		lv_effectKind_2_0, 
>+ 		"EffectKind");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)	'}' 
>+)	otherlv_3='}' 
> {
>- createLeafNode(grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_3, grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3());
> }
> )
> ;
>@@ -466,7 +382,7 @@
> // Entry rule entryRuleQualifiedName
> entryRuleQualifiedName returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getQualifiedNameRule()); }
> 	 iv_ruleQualifiedName=ruleQualifiedName 
> 	 { $current=$iv_ruleQualifiedName.current; } 
> 	 EOF 
>@@ -474,50 +390,41 @@
> 
> // Rule QualifiedName
> ruleQualifiedName returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getQualifiedNameRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_0=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
>+		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
> 	}
> 
> )
>-)	'::' 
>+)	otherlv_1='::' 
> {
>- createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
> 	 }
> 		lv_remaining_2_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>-	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"remaining",
>-	 		lv_remaining_2_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>+	 $current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
> 	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -531,7 +438,7 @@
> // Entry rule entryRuleTypeRule
> entryRuleTypeRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getTypeRuleRule()); }
> 	 iv_ruleTypeRule=ruleTypeRule 
> 	 { $current=$iv_ruleTypeRule.current; } 
> 	 EOF 
>@@ -539,32 +446,24 @@
> 
> // Rule TypeRule
> ruleTypeRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> ((
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
> 	 }
> 		lv_path_0_0=ruleQualifiedName		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getTypeRuleRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"path",
>-	 		lv_path_0_0, 
>-	 		"QualifiedName", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		set(
>+ 			$current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>@@ -572,13 +471,12 @@
> (
> 		{
> 			if ($current==null) {
>-	 $current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getTypeRuleRule());
> 	 }
> }
>-	RULE_ID
>+	otherlv_1=RULE_ID
> 	{
>-		createLeafNode(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0(), "type"); 
>+		newLeafNode(otherlv_1, grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0()); 
> 	}
> 
> )
>@@ -592,7 +490,7 @@
> // Entry rule entryRuleMultiplicityRule
> entryRuleMultiplicityRule returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getMultiplicityRuleRule()); }
> 	 iv_ruleMultiplicityRule=ruleMultiplicityRule 
> 	 { $current=$iv_ruleMultiplicityRule.current; } 
> 	 EOF 
>@@ -600,70 +498,56 @@
> 
> // Rule MultiplicityRule
> ruleMultiplicityRule returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-(	'[' 
>+ @after { leaveRule(); }:
>+(	otherlv_0='[' 
> {
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0(), null); 
>+ 	newLeafNode(otherlv_0, grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
> 	 }
> 		lv_bounds_1_0=ruleBoundSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"bounds",
>-	 		lv_bounds_1_0, 
>-	 		"BoundSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"bounds",
>+ 		lv_bounds_1_0, 
>+ 		"BoundSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-)(	'..' 
>+)(	otherlv_2='..' 
> {
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0(), null); 
>+ 	newLeafNode(otherlv_2, grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0());
> }
> (
> (
> 		{ 
>-	 currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(), currentNode); 
>+	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
> 	 }
> 		lv_bounds_3_0=ruleBoundSpecification		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode.getParent(), $current);
>+	 $current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
> 	 }
>-	 try {
>-	 		add(
>-	 			$current, 
>-	 			"bounds",
>-	 		lv_bounds_3_0, 
>-	 		"BoundSpecification", 
>-	 		currentNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>-	 currentNode = currentNode.getParent();
>+ 		add(
>+ 			$current, 
>+ 			"bounds",
>+ 		lv_bounds_3_0, 
>+ 		"BoundSpecification");
>+	 afterParserOrEnumRuleCall();
> 	 }
> 
> )
>-))?	']' 
>+))?	otherlv_4=']' 
> {
>- createLeafNode(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3(), null); 
>+ 	newLeafNode(otherlv_4, grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3());
> }
> )
> ;
>@@ -675,7 +559,7 @@
> // Entry rule entryRuleBoundSpecification
> entryRuleBoundSpecification returns [EObject current=null] 
> 	:
>-	{ currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode); }
>+	{ newCompositeNode(grammarAccess.getBoundSpecificationRule()); }
> 	 iv_ruleBoundSpecification=ruleBoundSpecification 
> 	 { $current=$iv_ruleBoundSpecification.current; } 
> 	 EOF 
>@@ -683,32 +567,24 @@
> 
> // Rule BoundSpecification
> ruleBoundSpecification returns [EObject current=null] 
>- @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
>+ @init { enterRule(); 
> }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>+ @after { leaveRule(); }:
> (
> (
> 		lv_value_0_0=RULE_UNLIMITEDLITERAL
> 		{
>-			createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value"); 
>+			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
> 		}
> 		{
> 	 if ($current==null) {
>-	 $current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-	 associateNodeWithAstElement(currentNode, $current);
>+	 $current = createModelElement(grammarAccess.getBoundSpecificationRule());
> 	 }
>-	 try {
>-	 		set(
>-	 			$current, 
>-	 			"value",
>-	 		lv_value_0_0, 
>-	 		"UnlimitedLiteral", 
>-	 		lastConsumedNode);
>-	 } catch (ValueConverterException vce) {
>-				handleValueConverterException(vce);
>-	 }
>+ 		setWithLastConsumed(
>+ 			$current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
> 	 }
> 
> )
>@@ -721,32 +597,30 @@
> 
> // Rule ModifierKind
> ruleModifierKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'exception' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='exception' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'stream' 
>+ |(	enumLiteral_1='stream' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'ordered' 
>+ |(	enumLiteral_2='ordered' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'unique' 
>+ |(	enumLiteral_3='unique' 
> 	{
> $current = grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -754,32 +628,30 @@
> 
> // Rule EffectKind
> ruleEffectKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'create' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='create' 
> 	{
> $current = grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'read' 
>+ |(	enumLiteral_1='read' 
> 	{
> $current = grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'update' 
>+ |(	enumLiteral_2='update' 
> 	{
> $current = grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'delete' 
>+ |(	enumLiteral_3='delete' 
> 	{
> $current = grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -787,32 +659,30 @@
> 
> // Rule VisibilityKind
> ruleVisibilityKind returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'+' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='+' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'-' 
>+ |(	enumLiteral_1='-' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'#' 
>+ |(	enumLiteral_2='#' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'~' 
>+ |(	enumLiteral_3='~' 
> 	{
> $current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -820,32 +690,30 @@
> 
> // Rule Direction
> ruleDirection returns [Enumerator current=null] 
>- @init { setCurrentLookahead(); resetLookahead(); }
>- @after { resetLookahead(); 
>- 	lastConsumedNode = currentNode;
>- }:
>-((	'in' 
>+ @init { enterRule(); }
>+ @after { leaveRule(); }:
>+((	enumLiteral_0='in' 
> 	{
> $current = grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0(), null); 
>+ newLeafNode(enumLiteral_0, grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); 
> }
> )
>- |(	'out' 
>+ |(	enumLiteral_1='out' 
> 	{
> $current = grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1(), null); 
>+ newLeafNode(enumLiteral_1, grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); 
> }
> )
>- |(	'inout' 
>+ |(	enumLiteral_2='inout' 
> 	{
> $current = grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2(), null); 
>+ newLeafNode(enumLiteral_2, grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2()); 
> }
> )
>- |(	'return' 
>+ |(	enumLiteral_3='return' 
> 	{
> $current = grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>- createLeafNode(grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3(), null); 
>+ newLeafNode(enumLiteral_3, grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3()); 
> }
> ));
> 
>@@ -857,7 +725,7 @@
> 
> RULE_INT : ('0'..'9')+;
> 
>-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
>+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
> 
> RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
> 
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameterLexer.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameterLexer.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameterLexer.java	(working copy)
>@@ -1,22 +1,10 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.parameter.editor.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.eclipse.xtext.parser.antlr.Lexer;
> 
>+
> import org.antlr.runtime.*;
> import java.util.Stack;
> import java.util.List;
>@@ -24,1438 +12,1723 @@
> 
> @SuppressWarnings("all")
> public class InternalUmlParameterLexer extends Lexer {
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int T29 = 29;
>-
>-	public static final int T28 = 28;
>-
>-	public static final int T27 = 27;
>-
>-	public static final int T26 = 26;
>-
>-	public static final int T25 = 25;
>-
>-	public static final int Tokens = 38;
>-
>-	public static final int T24 = 24;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int T23 = 23;
>-
>-	public static final int T22 = 22;
>-
>-	public static final int T21 = 21;
>-
>-	public static final int T20 = 20;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int T37 = 37;
>-
>-	public static final int T12 = 12;
>-
>-	public static final int T13 = 13;
>-
>-	public static final int T14 = 14;
>-
>-	public static final int T34 = 34;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int T15 = 15;
>-
>-	public static final int T33 = 33;
>+ public static final int RULE_ID=4;
>+ public static final int T__29=29;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
>+ public static final int EOF=-1;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int RULE_ML_COMMENT=8;
>+ public static final int T__19=19;
>+ public static final int T__30=30;
>+ public static final int T__31=31;
>+ public static final int T__32=32;
>+ public static final int RULE_STRING=7;
>+ public static final int T__16=16;
>+ public static final int T__33=33;
>+ public static final int T__15=15;
>+ public static final int T__34=34;
>+ public static final int T__18=18;
>+ public static final int T__35=35;
>+ public static final int T__17=17;
>+ public static final int T__36=36;
>+ public static final int T__12=12;
>+ public static final int T__37=37;
>+ public static final int T__14=14;
>+ public static final int T__13=13;
>+ public static final int RULE_INT=6;
>+ public static final int RULE_WS=10;
> 
>-	public static final int T16 = 16;
>+ // delegates
>+ // delegators
> 
>-	public static final int T36 = 36;
>+ public InternalUmlParameterLexer() {;} 
>+ public InternalUmlParameterLexer(CharStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlParameterLexer(CharStream input, RecognizerSharedState state) {
>+ super(input,state);
> 
>-	public static final int T17 = 17;
>+ }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g"; }
> 
>-	public static final int T35 = 35;
>+ // $ANTLR start "T__12"
>+ public final void mT__12() throws RecognitionException {
>+ try {
>+ int _type = T__12;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:11:7: ( ':' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:11:9: ':'
>+ {
>+ match(':'); 
> 
>-	public static final int T18 = 18;
>+ }
> 
>-	public static final int T30 = 30;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__12"
> 
>-	public static final int T19 = 19;
>+ // $ANTLR start "T__13"
>+ public final void mT__13() throws RecognitionException {
>+ try {
>+ int _type = T__13;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:12:7: ( '<Undefined>' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:12:9: '<Undefined>'
>+ {
>+ match("<Undefined>"); 
> 
>-	public static final int T32 = 32;
> 
>-	public static final int T31 = 31;
>+ }
> 
>-	public InternalUmlParameterLexer() {
>-		;
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__13"
> 
>-	public InternalUmlParameterLexer(CharStream input) {
>-		super(input);
>-	}
>+ // $ANTLR start "T__14"
>+ public final void mT__14() throws RecognitionException {
>+ try {
>+ int _type = T__14;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:13:7: ( '{' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:13:9: '{'
>+ {
>+ match('{'); 
> 
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g";
>-	}
>+ }
> 
>-	// $ANTLR start T12
>-	public final void mT12() throws RecognitionException {
>-		try {
>-			int _type = T12;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:10:5: ( ':' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:10:7: ':'
>-			{
>-				match(':');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__14"
> 
>-			}
>+ // $ANTLR start "T__15"
>+ public final void mT__15() throws RecognitionException {
>+ try {
>+ int _type = T__15;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:14:7: ( ',' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:14:9: ','
>+ {
>+ match(','); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T12
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__15"
> 
>-	// $ANTLR start T13
>-	public final void mT13() throws RecognitionException {
>-		try {
>-			int _type = T13;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:11:5: ( '<Undefined>' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:11:7: '<Undefined>'
>-			{
>-				match("<Undefined>");
>+ // $ANTLR start "T__16"
>+ public final void mT__16() throws RecognitionException {
>+ try {
>+ int _type = T__16;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:15:7: ( '}' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:15:9: '}'
>+ {
>+ match('}'); 
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__16"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__17"
>+ public final void mT__17() throws RecognitionException {
>+ try {
>+ int _type = T__17;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:16:7: ( 'effect: ' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:16:9: 'effect: '
>+ {
>+ match("effect: "); 
> 
>-	// $ANTLR end T13
> 
>-	// $ANTLR start T14
>-	public final void mT14() throws RecognitionException {
>-		try {
>-			int _type = T14;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:12:5: ( '{' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:12:7: '{'
>-			{
>-				match('{');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__17"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__18"
>+ public final void mT__18() throws RecognitionException {
>+ try {
>+ int _type = T__18;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:17:7: ( '::' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:17:9: '::'
>+ {
>+ match("::"); 
> 
>-	// $ANTLR end T14
> 
>-	// $ANTLR start T15
>-	public final void mT15() throws RecognitionException {
>-		try {
>-			int _type = T15;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:13:5: ( ',' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:13:7: ','
>-			{
>-				match(',');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__18"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__19"
>+ public final void mT__19() throws RecognitionException {
>+ try {
>+ int _type = T__19;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:18:7: ( '[' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:18:9: '['
>+ {
>+ match('['); 
> 
>-	// $ANTLR end T15
>+ }
> 
>-	// $ANTLR start T16
>-	public final void mT16() throws RecognitionException {
>-		try {
>-			int _type = T16;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:14:5: ( '}' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:14:7: '}'
>-			{
>-				match('}');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__19"
> 
>-			}
>+ // $ANTLR start "T__20"
>+ public final void mT__20() throws RecognitionException {
>+ try {
>+ int _type = T__20;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:19:7: ( '..' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:19:9: '..'
>+ {
>+ match(".."); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T16
>+ }
> 
>-	// $ANTLR start T17
>-	public final void mT17() throws RecognitionException {
>-		try {
>-			int _type = T17;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:15:5: ( 'effect: ' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:15:7: 'effect: '
>-			{
>-				match("effect: ");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__20"
> 
>+ // $ANTLR start "T__21"
>+ public final void mT__21() throws RecognitionException {
>+ try {
>+ int _type = T__21;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:20:7: ( ']' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:20:9: ']'
>+ {
>+ match(']'); 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__21"
> 
>-	// $ANTLR end T17
>+ // $ANTLR start "T__22"
>+ public final void mT__22() throws RecognitionException {
>+ try {
>+ int _type = T__22;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:21:7: ( 'exception' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:21:9: 'exception'
>+ {
>+ match("exception"); 
> 
>-	// $ANTLR start T18
>-	public final void mT18() throws RecognitionException {
>-		try {
>-			int _type = T18;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:16:5: ( '::' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:16:7: '::'
>-			{
>-				match("::");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__22"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__23"
>+ public final void mT__23() throws RecognitionException {
>+ try {
>+ int _type = T__23;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:22:7: ( 'stream' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:22:9: 'stream'
>+ {
>+ match("stream"); 
> 
>-	// $ANTLR end T18
> 
>-	// $ANTLR start T19
>-	public final void mT19() throws RecognitionException {
>-		try {
>-			int _type = T19;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:17:5: ( '[' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:17:7: '['
>-			{
>-				match('[');
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__23"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__24"
>+ public final void mT__24() throws RecognitionException {
>+ try {
>+ int _type = T__24;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:23:7: ( 'ordered' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:23:9: 'ordered'
>+ {
>+ match("ordered"); 
> 
>-	// $ANTLR end T19
> 
>-	// $ANTLR start T20
>-	public final void mT20() throws RecognitionException {
>-		try {
>-			int _type = T20;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:18:5: ( '..' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:18:7: '..'
>-			{
>-				match("..");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__24"
> 
>-			}
>+ // $ANTLR start "T__25"
>+ public final void mT__25() throws RecognitionException {
>+ try {
>+ int _type = T__25;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:24:7: ( 'unique' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:24:9: 'unique'
>+ {
>+ match("unique"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T20
>+ }
> 
>-	// $ANTLR start T21
>-	public final void mT21() throws RecognitionException {
>-		try {
>-			int _type = T21;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:19:5: ( ']' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:19:7: ']'
>-			{
>-				match(']');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__25"
> 
>-			}
>+ // $ANTLR start "T__26"
>+ public final void mT__26() throws RecognitionException {
>+ try {
>+ int _type = T__26;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:25:7: ( 'create' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:25:9: 'create'
>+ {
>+ match("create"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T21
>+ }
> 
>-	// $ANTLR start T22
>-	public final void mT22() throws RecognitionException {
>-		try {
>-			int _type = T22;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:20:5: ( 'exception' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:20:7: 'exception'
>-			{
>-				match("exception");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__26"
> 
>+ // $ANTLR start "T__27"
>+ public final void mT__27() throws RecognitionException {
>+ try {
>+ int _type = T__27;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:26:7: ( 'read' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:26:9: 'read'
>+ {
>+ match("read"); 
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T22
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__27"
> 
>-	// $ANTLR start T23
>-	public final void mT23() throws RecognitionException {
>-		try {
>-			int _type = T23;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:21:5: ( 'stream' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:21:7: 'stream'
>-			{
>-				match("stream");
>+ // $ANTLR start "T__28"
>+ public final void mT__28() throws RecognitionException {
>+ try {
>+ int _type = T__28;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:27:7: ( 'update' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:27:9: 'update'
>+ {
>+ match("update"); 
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__28"
> 
>-	// $ANTLR end T23
>+ // $ANTLR start "T__29"
>+ public final void mT__29() throws RecognitionException {
>+ try {
>+ int _type = T__29;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:28:7: ( 'delete' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:28:9: 'delete'
>+ {
>+ match("delete"); 
> 
>-	// $ANTLR start T24
>-	public final void mT24() throws RecognitionException {
>-		try {
>-			int _type = T24;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:22:5: ( 'ordered' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:22:7: 'ordered'
>-			{
>-				match("ordered");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__29"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__30"
>+ public final void mT__30() throws RecognitionException {
>+ try {
>+ int _type = T__30;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:29:7: ( '+' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:29:9: '+'
>+ {
>+ match('+'); 
> 
>-	// $ANTLR end T24
>+ }
> 
>-	// $ANTLR start T25
>-	public final void mT25() throws RecognitionException {
>-		try {
>-			int _type = T25;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:23:5: ( 'unique' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:23:7: 'unique'
>-			{
>-				match("unique");
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__30"
> 
>+ // $ANTLR start "T__31"
>+ public final void mT__31() throws RecognitionException {
>+ try {
>+ int _type = T__31;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:30:7: ( '-' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:30:9: '-'
>+ {
>+ match('-'); 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__31"
> 
>-	// $ANTLR end T25
>+ // $ANTLR start "T__32"
>+ public final void mT__32() throws RecognitionException {
>+ try {
>+ int _type = T__32;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:31:7: ( '#' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:31:9: '#'
>+ {
>+ match('#'); 
> 
>-	// $ANTLR start T26
>-	public final void mT26() throws RecognitionException {
>-		try {
>-			int _type = T26;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:24:5: ( 'create' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:24:7: 'create'
>-			{
>-				match("create");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__32"
> 
>-			}
>+ // $ANTLR start "T__33"
>+ public final void mT__33() throws RecognitionException {
>+ try {
>+ int _type = T__33;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:32:7: ( '~' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:32:9: '~'
>+ {
>+ match('~'); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T26
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__33"
> 
>-	// $ANTLR start T27
>-	public final void mT27() throws RecognitionException {
>-		try {
>-			int _type = T27;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:25:5: ( 'read' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:25:7: 'read'
>-			{
>-				match("read");
>+ // $ANTLR start "T__34"
>+ public final void mT__34() throws RecognitionException {
>+ try {
>+ int _type = T__34;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:33:7: ( 'in' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:33:9: 'in'
>+ {
>+ match("in"); 
> 
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__34"
> 
>-	// $ANTLR end T27
>+ // $ANTLR start "T__35"
>+ public final void mT__35() throws RecognitionException {
>+ try {
>+ int _type = T__35;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:34:7: ( 'out' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:34:9: 'out'
>+ {
>+ match("out"); 
> 
>-	// $ANTLR start T28
>-	public final void mT28() throws RecognitionException {
>-		try {
>-			int _type = T28;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:26:5: ( 'update' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:26:7: 'update'
>-			{
>-				match("update");
> 
>+ }
> 
>-			}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__35"
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ // $ANTLR start "T__36"
>+ public final void mT__36() throws RecognitionException {
>+ try {
>+ int _type = T__36;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:35:7: ( 'inout' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:35:9: 'inout'
>+ {
>+ match("inout"); 
> 
>-	// $ANTLR end T28
> 
>-	// $ANTLR start T29
>-	public final void mT29() throws RecognitionException {
>-		try {
>-			int _type = T29;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:27:5: ( 'delete' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:27:7: 'delete'
>-			{
>-				match("delete");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__36"
> 
>-			}
>+ // $ANTLR start "T__37"
>+ public final void mT__37() throws RecognitionException {
>+ try {
>+ int _type = T__37;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:36:7: ( 'return' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:36:9: 'return'
>+ {
>+ match("return"); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T29
>+ }
> 
>-	// $ANTLR start T30
>-	public final void mT30() throws RecognitionException {
>-		try {
>-			int _type = T30;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:28:5: ( '+' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:28:7: '+'
>-			{
>-				match('+');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "T__37"
> 
>-			}
>+ // $ANTLR start "RULE_UNLIMITEDLITERAL"
>+ public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>+ try {
>+ int _type = RULE_UNLIMITEDLITERAL;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ if ( ((LA2_0>='0' && LA2_0<='9')) ) {
>+ alt2=1;
>+ }
>+ else if ( (LA2_0=='*') ) {
>+ alt2=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 2, 0, input);
> 
>-	// $ANTLR end T30
>+ throw nvae;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:26: '0' .. '9' ( '0' .. '9' )*
>+ {
>+ matchRange('0','9'); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:35: ( '0' .. '9' )*
>+ loop1:
>+ do {
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-	// $ANTLR start T31
>-	public final void mT31() throws RecognitionException {
>-		try {
>-			int _type = T31;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:29:5: ( '-' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:29:7: '-'
>-			{
>-				match('-');
>+ if ( ((LA1_0>='0' && LA1_0<='9')) ) {
>+ alt1=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ switch (alt1) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:36: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-	// $ANTLR end T31
>+ 	 }
>+ 	 break;
> 
>-	// $ANTLR start T32
>-	public final void mT32() throws RecognitionException {
>-		try {
>-			int _type = T32;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:30:5: ( '#' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:30:7: '#'
>-			{
>-				match('#');
>+ 	default :
>+ 	 break loop1;
>+ }
>+ } while (true);
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:722:47: '*'
>+ {
>+ match('*'); 
> 
>-	// $ANTLR end T32
>+ }
>+ break;
> 
>-	// $ANTLR start T33
>-	public final void mT33() throws RecognitionException {
>-		try {
>-			int _type = T33;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:31:5: ( '~' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:31:7: '~'
>-			{
>-				match('~');
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T33
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_UNLIMITEDLITERAL"
> 
>-	// $ANTLR start T34
>-	public final void mT34() throws RecognitionException {
>-		try {
>-			int _type = T34;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:32:5: ( 'in' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:32:7: 'in'
>-			{
>-				match("in");
>+ // $ANTLR start "RULE_ID"
>+ public final void mRULE_ID() throws RecognitionException {
>+ try {
>+ int _type = RULE_ID;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:724:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:724:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:724:11: ( '^' )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>+ if ( (LA3_0=='^') ) {
>+ alt3=1;
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:724:11: '^'
>+ {
>+ match('^'); 
> 
>-			}
>+ }
>+ break;
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
> 
>-	// $ANTLR end T34
>+ if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
>+ input.consume();
> 
>-	// $ANTLR start T35
>-	public final void mT35() throws RecognitionException {
>-		try {
>-			int _type = T35;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:33:5: ( 'out' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:33:7: 'out'
>-			{
>-				match("out");
>+ }
>+ else {
>+ MismatchedSetException mse = new MismatchedSetException(null,input);
>+ recover(mse);
>+ throw mse;}
> 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:724:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-			}
>+ if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
>+ alt4=1;
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end T35
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.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();
> 
>-	// $ANTLR start T36
>-	public final void mT36() throws RecognitionException {
>-		try {
>-			int _type = T36;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:34:5: ( 'inout' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:34:7: 'inout'
>-			{
>-				match("inout");
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
> 
>-			}
>+ 	 }
>+ 	 break;
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
>-	// $ANTLR end T36
> 
>-	// $ANTLR start T37
>-	public final void mT37() throws RecognitionException {
>-		try {
>-			int _type = T37;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:35:5: ( 'return' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:35:7: 'return'
>-			{
>-				match("return");
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ID"
> 
>-			}
>+ // $ANTLR start "RULE_INT"
>+ public final void mRULE_INT() throws RecognitionException {
>+ try {
>+ int _type = RULE_INT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:726:10: ( ( '0' .. '9' )+ )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:726:12: ( '0' .. '9' )+
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:726:12: ( '0' .. '9' )+
>+ int cnt5=0;
>+ loop5:
>+ do {
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ if ( ((LA5_0>='0' && LA5_0<='9')) ) {
>+ alt5=1;
>+ }
> 
>-	// $ANTLR end T37
> 
>-	// $ANTLR start RULE_UNLIMITEDLITERAL
>-	public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
>-		try {
>-			int _type = RULE_UNLIMITEDLITERAL;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )
>-				int alt2 = 2;
>-				int LA2_0 = input.LA(1);
>+ switch (alt5) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:726:13: '0' .. '9'
>+ 	 {
>+ 	 matchRange('0','9'); 
> 
>-				if(((LA2_0 >= '0' && LA2_0 <= '9'))) {
>-					alt2 = 1;
>-				} else if((LA2_0 == '*')) {
>-					alt2 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("854:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
>+ 	 }
>+ 	 break;
> 
>-					throw nvae;
>-				}
>-				switch(alt2) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:26: '0' .. '9' ( '0' .. '9' )*
>-				{
>-					matchRange('0', '9');
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:35: ( '0' .. '9' )*
>-					loop1: do {
>-						int alt1 = 2;
>-						int LA1_0 = input.LA(1);
>+ 	default :
>+ 	 if ( cnt5 >= 1 ) break loop5;
>+ EarlyExitException eee =
>+ new EarlyExitException(5, input);
>+ throw eee;
>+ }
>+ cnt5++;
>+ } while (true);
> 
>-						if(((LA1_0 >= '0' && LA1_0 <= '9'))) {
>-							alt1 = 1;
>-						}
> 
>+ }
> 
>-						switch(alt1) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:36: '0' .. '9'
>-						{
>-							matchRange('0', '9');
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_INT"
> 
>-						}
>-							break;
>+ // $ANTLR start "RULE_STRING"
>+ public final void mRULE_STRING() throws RecognitionException {
>+ try {
>+ int _type = RULE_STRING;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>+ int alt8=2;
>+ int LA8_0 = input.LA(1);
> 
>-						default:
>-							break loop1;
>-						}
>-					} while(true);
>+ if ( (LA8_0=='\"') ) {
>+ alt8=1;
>+ }
>+ else if ( (LA8_0=='\'') ) {
>+ alt8=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>+ throw nvae;
>+ }
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>+ {
>+ match('\"'); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>+ loop6:
>+ do {
>+ int alt6=3;
>+ int LA6_0 = input.LA(1);
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:854:47: '*'
>-				{
>-					match('*');
>+ if ( (LA6_0=='\\') ) {
>+ alt6=1;
>+ }
>+ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=']' && LA6_0<='\uFFFF')) ) {
>+ alt6=2;
>+ }
> 
>-				}
>-					break;
> 
>-				}
>+ switch (alt6) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:66: ~ ( ( '\\\\' | '\"' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-	// $ANTLR end RULE_UNLIMITEDLITERAL
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start RULE_ID
>-	public final void mRULE_ID() throws RecognitionException {
>-		try {
>-			int _type = RULE_ID;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:856:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:856:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:856:11: ( '^' )?
>-				int alt3 = 2;
>-				int LA3_0 = input.LA(1);
> 
>-				if((LA3_0 == '^')) {
>-					alt3 = 1;
>-				}
>-				switch(alt3) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:856:11: '^'
>-				{
>-					match('^');
>+ 	 }
>+ 	 break;
> 
>-				}
>-					break;
>+ 	default :
>+ 	 break loop6;
>+ }
>+ } while (true);
> 
>-				}
>+ match('\"'); 
> 
>-				if((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {
>-					input.consume();
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>+ {
>+ match('\''); 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>+ loop7:
>+ do {
>+ int alt7=3;
>+ int LA7_0 = input.LA(1);
> 
>-				} else {
>-					MismatchedSetException mse = new MismatchedSetException(null, input);
>-					recover(mse);
>-					throw mse;
>-				}
>+ if ( (LA7_0=='\\') ) {
>+ alt7=1;
>+ }
>+ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=']' && LA7_0<='\uFFFF')) ) {
>+ alt7=2;
>+ }
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:856:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
>-				loop4: do {
>-					int alt4 = 2;
>-					int LA4_0 = input.LA(1);
> 
>-					if(((LA4_0 >= '0' && LA4_0 <= '9') || (LA4_0 >= 'A' && LA4_0 <= 'Z') || LA4_0 == '_' || (LA4_0 >= 'a' && LA4_0 <= 'z'))) {
>-						alt4 = 1;
>-					}
>+ switch (alt7) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
>+ 	 {
>+ 	 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.LA(1)<='u') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					switch(alt4) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.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 {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ 	 }
>+ 	 break;
>+ 	case 2 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:137: ~ ( ( '\\\\' | '\\'' ) )
>+ 	 {
>+ 	 if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					}
>-						break;
> 
>-					default:
>-						break loop4;
>-					}
>-				} while(true);
>+ 	 }
>+ 	 break;
> 
>+ 	default :
>+ 	 break loop7;
>+ }
>+ } while (true);
> 
>-			}
>+ match('\''); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
> 
>-	// $ANTLR end RULE_ID
>+ }
> 
>-	// $ANTLR start RULE_INT
>-	public final void mRULE_INT() throws RecognitionException {
>-		try {
>-			int _type = RULE_INT;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:858:10: ( ( '0' .. '9' )+ )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:858:12: ( '0' .. '9' )+
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:858:12: ( '0' .. '9' )+
>-				int cnt5 = 0;
>-				loop5: do {
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
> 
>-					if(((LA5_0 >= '0' && LA5_0 <= '9'))) {
>-						alt5 = 1;
>-					}
>+ }
> 
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_STRING"
> 
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:858:13: '0' .. '9'
>-					{
>-						matchRange('0', '9');
>+ // $ANTLR start "RULE_ML_COMMENT"
>+ public final void mRULE_ML_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_ML_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:730:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:730:19: '/*' ( options {greedy=false; } : . )* '*/'
>+ {
>+ match("/*"); 
> 
>-					}
>-						break;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:730:24: ( options {greedy=false; } : . )*
>+ loop9:
>+ do {
>+ int alt9=2;
>+ int LA9_0 = input.LA(1);
> 
>-					default:
>-						if(cnt5 >= 1)
>-							break loop5;
>-						EarlyExitException eee = new EarlyExitException(5, input);
>-						throw eee;
>-					}
>-					cnt5++;
>-				} while(true);
>+ if ( (LA9_0=='*') ) {
>+ int LA9_1 = input.LA(2);
> 
>+ if ( (LA9_1=='/') ) {
>+ alt9=2;
>+ }
>+ else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
>+ alt9=1;
>+ }
> 
>-	// $ANTLR end RULE_INT
> 
>-	// $ANTLR start RULE_STRING
>-	public final void mRULE_STRING() throws RecognitionException {
>-		try {
>-			int _type = RULE_STRING;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
>-				int alt8 = 2;
>-				int LA8_0 = input.LA(1);
>+ switch (alt9) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:730:52: .
>+ 	 {
>+ 	 matchAny(); 
> 
>-				if((LA8_0 == '\"')) {
>-					alt8 = 1;
>-				} else if((LA8_0 == '\'')) {
>-					alt8 = 2;
>-				} else {
>-					NoViableAltException nvae = new NoViableAltException("860:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
>+ 	 }
>+ 	 break;
> 
>-					throw nvae;
>-				}
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
>-				{
>-					match('\"');
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
>-					loop6: do {
>-						int alt6 = 3;
>-						int LA6_0 = input.LA(1);
>+ 	default :
>+ 	 break loop9;
>+ }
>+ } while (true);
> 
>-						if((LA6_0 == '\\')) {
>-							alt6 = 1;
>-						} else if(((LA6_0 >= '\u0000' && LA6_0 <= '!') || (LA6_0 >= '#' && LA6_0 <= '[') || (LA6_0 >= ']' && LA6_0 <= '\uFFFE'))) {
>-							alt6 = 2;
>-						}
>+ match("*/"); 
> 
> 
>-						switch(alt6) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:21: '\\\\' ( '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 {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ML_COMMENT"
> 
>+ // $ANTLR start "RULE_SL_COMMENT"
>+ public final void mRULE_SL_COMMENT() throws RecognitionException {
>+ try {
>+ int _type = RULE_SL_COMMENT;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>+ {
>+ match("//"); 
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:62: ~ ( ( '\\\\' | '\"' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:24: (~ ( ( '\\n' | '\\r' ) ) )*
>+ loop10:
>+ do {
>+ int alt10=2;
>+ int LA10_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( ((LA10_0>='\u0000' && LA10_0<='\t')||(LA10_0>='\u000B' && LA10_0<='\f')||(LA10_0>='\u000E' && LA10_0<='\uFFFF')) ) {
>+ alt10=1;
>+ }
> 
> 
>-						}
>-							break;
>+ switch (alt10) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732: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)<='\uFFFF') ) {
>+ 	 input.consume();
> 
>-						default:
>-							break loop6;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-					match('\"');
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
>-				{
>-					match('\'');
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
>-					loop7: do {
>-						int alt7 = 3;
>-						int LA7_0 = input.LA(1);
>+ 	 }
>+ 	 break;
> 
>-						if((LA7_0 == '\\')) {
>-							alt7 = 1;
>-						} else if(((LA7_0 >= '\u0000' && LA7_0 <= '&') || (LA7_0 >= '(' && LA7_0 <= '[') || (LA7_0 >= ']' && LA7_0 <= '\uFFFE'))) {
>-							alt7 = 2;
>-						}
>+ 	default :
>+ 	 break loop10;
>+ }
>+ } while (true);
> 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:40: ( ( '\\r' )? '\\n' )?
>+ int alt12=2;
>+ int LA12_0 = input.LA(1);
> 
>-						switch(alt7) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:88: '\\\\' ( '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();
>+ if ( (LA12_0=='\n'||LA12_0=='\r') ) {
>+ alt12=1;
>+ }
>+ switch (alt12) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:41: ( '\\r' )? '\\n'
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:41: ( '\\r' )?
>+ int alt11=2;
>+ int LA11_0 = input.LA(1);
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ if ( (LA11_0=='\r') ) {
>+ alt11=1;
>+ }
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:732:41: '\\r'
>+ {
>+ match('\r'); 
> 
>+ }
>+ break;
> 
>-						}
>-							break;
>-						case 2:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:860:129: ~ ( ( '\\\\' | '\\'' ) )
>-						{
>-							if((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFE')) {
>-								input.consume();
>+ }
> 
>-							} else {
>-								MismatchedSetException mse = new MismatchedSetException(null, input);
>-								recover(mse);
>-								throw mse;
>-							}
>+ match('\n'); 
> 
>+ }
>+ break;
> 
>-						}
>-							break;
>+ }
> 
>-						default:
>-							break loop7;
>-						}
>-					} while(true);
> 
>-					match('\'');
>+ }
> 
>-				}
>-					break;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_SL_COMMENT"
> 
>-				}
>+ // $ANTLR start "RULE_WS"
>+ public final void mRULE_WS() throws RecognitionException {
>+ try {
>+ int _type = RULE_WS;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:734:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:734:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:734:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>+ int cnt13=0;
>+ loop13:
>+ do {
>+ int alt13=2;
>+ int LA13_0 = input.LA(1);
> 
>+ if ( ((LA13_0>='\t' && LA13_0<='\n')||LA13_0=='\r'||LA13_0==' ') ) {
>+ alt13=1;
>+ }
> 
>-			}
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ switch (alt13) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:
>+ 	 {
>+ 	 if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
>+ 	 input.consume();
> 
>-	// $ANTLR end RULE_STRING
>+ 	 }
>+ 	 else {
>+ 	 MismatchedSetException mse = new MismatchedSetException(null,input);
>+ 	 recover(mse);
>+ 	 throw mse;}
> 
>-	// $ANTLR start RULE_ML_COMMENT
>-	public final void mRULE_ML_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_ML_COMMENT;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:862:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:862:19: '/*' ( options {greedy=false; } : . )* '*/'
>-			{
>-				match("/*");
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:862:24: ( options {greedy=false; } : . )*
>-				loop9: do {
>-					int alt9 = 2;
>-					int LA9_0 = input.LA(1);
>+ 	 }
>+ 	 break;
> 
>-					if((LA9_0 == '*')) {
>-						int LA9_1 = input.LA(2);
>+ 	default :
>+ 	 if ( cnt13 >= 1 ) break loop13;
>+ EarlyExitException eee =
>+ new EarlyExitException(13, input);
>+ throw eee;
>+ }
>+ cnt13++;
>+ } while (true);
> 
>-						if((LA9_1 == '/')) {
>-							alt9 = 2;
>-						} else if(((LA9_1 >= '\u0000' && LA9_1 <= '.') || (LA9_1 >= '0' && LA9_1 <= '\uFFFE'))) {
>-							alt9 = 1;
>-						}
> 
>+ }
> 
>-					} else if(((LA9_0 >= '\u0000' && LA9_0 <= ')') || (LA9_0 >= '+' && LA9_0 <= '\uFFFE'))) {
>-						alt9 = 1;
>-					}
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_WS"
> 
>+ // $ANTLR start "RULE_ANY_OTHER"
>+ public final void mRULE_ANY_OTHER() throws RecognitionException {
>+ try {
>+ int _type = RULE_ANY_OTHER;
>+ int _channel = DEFAULT_TOKEN_CHANNEL;
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:736:16: ( . )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:736:18: .
>+ {
>+ matchAny(); 
> 
>-					switch(alt9) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:862:52: .
>-					{
>-						matchAny();
>+ }
> 
>-					}
>-						break;
>+ state.type = _type;
>+ state.channel = _channel;
>+ }
>+ finally {
>+ }
>+ }
>+ // $ANTLR end "RULE_ANY_OTHER"
> 
>-					default:
>-						break loop9;
>-					}
>-				} while(true);
>+ public void mTokens() throws RecognitionException {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>+ int alt14=34;
>+ alt14 = dfa14.predict(input);
>+ switch (alt14) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:10: T__12
>+ {
>+ mT__12(); 
> 
>-				match("*/");
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:16: T__13
>+ {
>+ mT__13(); 
> 
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:22: T__14
>+ {
>+ mT__14(); 
> 
>-			}
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:28: T__15
>+ {
>+ mT__15(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 5 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:34: T__16
>+ {
>+ mT__16(); 
> 
>-	// $ANTLR end RULE_ML_COMMENT
>+ }
>+ break;
>+ case 6 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:40: T__17
>+ {
>+ mT__17(); 
> 
>-	// $ANTLR start RULE_SL_COMMENT
>-	public final void mRULE_SL_COMMENT() throws RecognitionException {
>-		try {
>-			int _type = RULE_SL_COMMENT;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
>-			{
>-				match("//");
>+ }
>+ break;
>+ case 7 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:46: T__18
>+ {
>+ mT__18(); 
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:24: (~ ( ( '\\n' | '\\r' ) ) )*
>-				loop10: do {
>-					int alt10 = 2;
>-					int LA10_0 = input.LA(1);
>+ }
>+ break;
>+ case 8 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:52: T__19
>+ {
>+ mT__19(); 
> 
>-					if(((LA10_0 >= '\u0000' && LA10_0 <= '\t') || (LA10_0 >= '\u000B' && LA10_0 <= '\f') || (LA10_0 >= '\u000E' && LA10_0 <= '\uFFFE'))) {
>-						alt10 = 1;
>-					}
>+ }
>+ break;
>+ case 9 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:58: T__20
>+ {
>+ mT__20(); 
> 
>+ }
>+ break;
>+ case 10 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:64: T__21
>+ {
>+ mT__21(); 
> 
>-					switch(alt10) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864: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) <= '\uFFFE')) {
>-							input.consume();
>+ }
>+ break;
>+ case 11 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:70: T__22
>+ {
>+ mT__22(); 
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
>+ break;
>+ case 12 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:76: T__23
>+ {
>+ mT__23(); 
> 
>+ }
>+ break;
>+ case 13 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:82: T__24
>+ {
>+ mT__24(); 
> 
>-					}
>-						break;
>+ }
>+ break;
>+ case 14 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:88: T__25
>+ {
>+ mT__25(); 
> 
>-					default:
>-						break loop10;
>-					}
>-				} while(true);
>+ }
>+ break;
>+ case 15 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:94: T__26
>+ {
>+ mT__26(); 
> 
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:40: ( ( '\\r' )? '\\n' )?
>-				int alt12 = 2;
>-				int LA12_0 = input.LA(1);
>+ }
>+ break;
>+ case 16 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:100: T__27
>+ {
>+ mT__27(); 
> 
>-				if((LA12_0 == '\n' || LA12_0 == '\r')) {
>-					alt12 = 1;
>-				}
>-				switch(alt12) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:41: ( '\\r' )? '\\n'
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:41: ( '\\r' )?
>-					int alt11 = 2;
>-					int LA11_0 = input.LA(1);
>+ }
>+ break;
>+ case 17 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:106: T__28
>+ {
>+ mT__28(); 
> 
>-					if((LA11_0 == '\r')) {
>-						alt11 = 1;
>-					}
>-					switch(alt11) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:864:41: '\\r'
>-					{
>-						match('\r');
>+ }
>+ break;
>+ case 18 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:112: T__29
>+ {
>+ mT__29(); 
> 
>-					}
>-						break;
>+ }
>+ break;
>+ case 19 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:118: T__30
>+ {
>+ mT__30(); 
> 
>-					}
>+ }
>+ break;
>+ case 20 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:124: T__31
>+ {
>+ mT__31(); 
> 
>-					match('\n');
>+ }
>+ break;
>+ case 21 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:130: T__32
>+ {
>+ mT__32(); 
> 
>-				}
>-					break;
>+ }
>+ break;
>+ case 22 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:136: T__33
>+ {
>+ mT__33(); 
> 
>-				}
>+ }
>+ break;
>+ case 23 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:142: T__34
>+ {
>+ mT__34(); 
> 
>+ }
>+ break;
>+ case 24 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:148: T__35
>+ {
>+ mT__35(); 
> 
>-			}
>+ }
>+ break;
>+ case 25 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:154: T__36
>+ {
>+ mT__36(); 
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ }
>+ break;
>+ case 26 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:160: T__37
>+ {
>+ mT__37(); 
> 
>-	// $ANTLR end RULE_SL_COMMENT
>+ }
>+ break;
>+ case 27 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:166: RULE_UNLIMITEDLITERAL
>+ {
>+ mRULE_UNLIMITEDLITERAL(); 
> 
>-	// $ANTLR start RULE_WS
>-	public final void mRULE_WS() throws RecognitionException {
>-		try {
>-			int _type = RULE_WS;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:866:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:866:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:866:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
>-				int cnt13 = 0;
>-				loop13: do {
>-					int alt13 = 2;
>-					int LA13_0 = input.LA(1);
>+ }
>+ break;
>+ case 28 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:188: RULE_ID
>+ {
>+ mRULE_ID(); 
> 
>-					if(((LA13_0 >= '\t' && LA13_0 <= '\n') || LA13_0 == '\r' || LA13_0 == ' ')) {
>-						alt13 = 1;
>-					}
>+ }
>+ break;
>+ case 29 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:196: RULE_INT
>+ {
>+ mRULE_INT(); 
> 
>+ }
>+ break;
>+ case 30 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:205: RULE_STRING
>+ {
>+ mRULE_STRING(); 
> 
>-					switch(alt13) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:
>-					{
>-						if((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
>-							input.consume();
>+ }
>+ break;
>+ case 31 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:217: RULE_ML_COMMENT
>+ {
>+ mRULE_ML_COMMENT(); 
> 
>-						} else {
>-							MismatchedSetException mse = new MismatchedSetException(null, input);
>-							recover(mse);
>-							throw mse;
>-						}
>+ }
>+ break;
>+ case 32 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:233: RULE_SL_COMMENT
>+ {
>+ mRULE_SL_COMMENT(); 
> 
>+ }
>+ break;
>+ case 33 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:249: RULE_WS
>+ {
>+ mRULE_WS(); 
> 
>-					}
>-						break;
>+ }
>+ break;
>+ case 34 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:257: RULE_ANY_OTHER
>+ {
>+ mRULE_ANY_OTHER(); 
> 
>-					default:
>-						if(cnt13 >= 1)
>-							break loop13;
>-						EarlyExitException eee = new EarlyExitException(13, input);
>-						throw eee;
>-					}
>-					cnt13++;
>-				} while(true);
>+ }
>+ break;
> 
>+ }
> 
>-			}
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
> 
>-	// $ANTLR end RULE_WS
>+ protected DFA14 dfa14 = new DFA14(this);
>+ static final String DFA14_eotS =
>+ "\1\uffff\1\37\1\35\3\uffff\1\46\1\uffff\1\35\1\uffff\6\46\4\uffff"+
>+ "\1\46\1\67\1\uffff\1\35\1\uffff\3\35\10\uffff\2\46\4\uffff\10\46"+
>+ "\4\uffff\1\111\1\uffff\1\67\4\uffff\4\46\1\116\7\46\1\uffff\4\46"+
>+ "\1\uffff\3\46\1\135\12\46\1\uffff\2\46\1\152\2\46\1\155\1\46\1\157"+
>+ "\1\160\1\161\1\162\1\163\2\uffff\1\46\1\uffff\1\165\5\uffff\1\46"+
>+ "\1\uffff\1\167\1\uffff";
>+ static final String DFA14_eofS =
>+ "\170\uffff";
>+ static final String DFA14_minS =
>+ "\1\0\1\72\1\125\3\uffff\1\146\1\uffff\1\56\1\uffff\1\164\1\162"+
>+ "\1\156\1\162\2\145\4\uffff\1\156\1\60\1\uffff\1\101\1\uffff\2\0"+
>+ "\1\52\10\uffff\1\146\1\143\4\uffff\1\162\1\144\1\164\1\151\1\144"+
>+ "\1\145\1\141\1\154\4\uffff\1\60\1\uffff\1\60\4\uffff\4\145\1\60"+
>+ "\1\161\2\141\1\144\1\165\1\145\1\165\1\uffff\1\143\1\160\1\141\1"+
>+ "\162\1\uffff\1\165\2\164\1\60\1\162\4\164\1\155\4\145\1\uffff\1"+
>+ "\156\1\145\1\60\1\72\1\151\1\60\1\144\5\60\2\uffff\1\157\1\uffff"+
>+ "\1\60\5\uffff\1\156\1\uffff\1\60\1\uffff";
>+ static final String DFA14_maxS =
>+ "\1\uffff\1\72\1\125\3\uffff\1\170\1\uffff\1\56\1\uffff\1\164\1"+
>+ "\165\1\160\1\162\2\145\4\uffff\1\156\1\71\1\uffff\1\172\1\uffff"+
>+ "\2\uffff\1\57\10\uffff\1\146\1\143\4\uffff\1\162\1\144\1\164\1\151"+
>+ "\1\144\1\145\1\164\1\154\4\uffff\1\172\1\uffff\1\71\4\uffff\4\145"+
>+ "\1\172\1\161\2\141\1\144\1\165\1\145\1\165\1\uffff\1\143\1\160\1"+
>+ "\141\1\162\1\uffff\1\165\2\164\1\172\1\162\4\164\1\155\4\145\1\uffff"+
>+ "\1\156\1\145\1\172\1\72\1\151\1\172\1\144\5\172\2\uffff\1\157\1"+
>+ "\uffff\1\172\5\uffff\1\156\1\uffff\1\172\1\uffff";
>+ static final String DFA14_acceptS =
>+ "\3\uffff\1\3\1\4\1\5\1\uffff\1\10\1\uffff\1\12\6\uffff\1\23\1\24"+
>+ "\1\25\1\26\2\uffff\1\33\1\uffff\1\34\3\uffff\1\41\1\42\1\7\1\1\1"+
>+ "\2\1\3\1\4\1\5\2\uffff\1\34\1\10\1\11\1\12\10\uffff\1\23\1\24\1"+
>+ "\25\1\26\1\uffff\1\33\1\uffff\1\36\1\37\1\40\1\41\14\uffff\1\27"+
>+ "\4\uffff\1\30\16\uffff\1\20\14\uffff\1\31\1\6\1\uffff\1\14\1\uffff"+
>+ "\1\16\1\21\1\17\1\32\1\22\1\uffff\1\15\1\uffff\1\13";
>+ static final String DFA14_specialS =
>+ "\1\1\30\uffff\1\2\1\0\135\uffff}>";
>+ static final String[] DFA14_transitionS = {
>+ "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\1\22\3\35\1\32\2"+
>+ "\35\1\26\1\20\1\4\1\21\1\10\1\33\12\25\1\1\1\35\1\2\4\35\32"+
>+ "\30\1\7\1\35\1\11\1\27\1\30\1\35\2\30\1\15\1\17\1\6\3\30\1\24"+
>+ "\5\30\1\13\2\30\1\16\1\12\1\30\1\14\5\30\1\3\1\35\1\5\1\23\uff81"+
>+ "\35",
>+ "\1\36",
>+ "\1\40",
>+ "",
>+ "",
>+ "",
>+ "\1\44\21\uffff\1\45",
>+ "",
>+ "\1\50",
>+ "",
>+ "\1\52",
>+ "\1\53\2\uffff\1\54",
>+ "\1\55\1\uffff\1\56",
>+ "\1\57",
>+ "\1\60",
>+ "\1\61",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\66",
>+ "\12\70",
>+ "",
>+ "\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "",
>+ "\0\71",
>+ "\0\71",
>+ "\1\72\4\uffff\1\73",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\75",
>+ "\1\76",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\77",
>+ "\1\100",
>+ "\1\101",
>+ "\1\102",
>+ "\1\103",
>+ "\1\104",
>+ "\1\105\22\uffff\1\106",
>+ "\1\107",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\16\46\1\110\13\46",
>+ "",
>+ "\12\70",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\112",
>+ "\1\113",
>+ "\1\114",
>+ "\1\115",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\1\117",
>+ "\1\120",
>+ "\1\121",
>+ "\1\122",
>+ "\1\123",
>+ "\1\124",
>+ "\1\125",
>+ "",
>+ "\1\126",
>+ "\1\127",
>+ "\1\130",
>+ "\1\131",
>+ "",
>+ "\1\132",
>+ "\1\133",
>+ "\1\134",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\1\136",
>+ "\1\137",
>+ "\1\140",
>+ "\1\141",
>+ "\1\142",
>+ "\1\143",
>+ "\1\144",
>+ "\1\145",
>+ "\1\146",
>+ "\1\147",
>+ "",
>+ "\1\150",
>+ "\1\151",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\1\153",
>+ "\1\154",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\1\156",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "",
>+ "",
>+ "\1\164",
>+ "",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "",
>+ "\1\166",
>+ "",
>+ "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
>+ ""
>+ };
> 
>-	// $ANTLR start RULE_ANY_OTHER
>-	public final void mRULE_ANY_OTHER() throws RecognitionException {
>-		try {
>-			int _type = RULE_ANY_OTHER;
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:868:16: ( . )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:868:18: .
>-			{
>-				matchAny();
>+ static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>+ static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>+ static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>+ static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>+ static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>+ static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>+ static final short[][] DFA14_transition;
> 
>-			}
>+ static {
>+ int numStates = DFA14_transitionS.length;
>+ DFA14_transition = new short[numStates][];
>+ for (int i=0; i<numStates; i++) {
>+ DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>+ }
>+ }
> 
>-			this.type = _type;
>-		} finally {
>-		}
>-	}
>+ class DFA14 extends DFA {
> 
>-	// $ANTLR end RULE_ANY_OTHER
>+ public DFA14(BaseRecognizer recognizer) {
>+ this.recognizer = recognizer;
>+ this.decisionNumber = 14;
>+ this.eot = DFA14_eot;
>+ this.eof = DFA14_eof;
>+ this.min = DFA14_min;
>+ this.max = DFA14_max;
>+ this.accept = DFA14_accept;
>+ this.special = DFA14_special;
>+ this.transition = DFA14_transition;
>+ }
>+ public String getDescription() {
>+ return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>+ }
>+ public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
>+ IntStream input = _input;
>+ 	int _s = s;
>+ switch ( s ) {
>+ case 0 : 
>+ int LA14_26 = input.LA(1);
> 
>-	public void mTokens() throws RecognitionException {
>-		// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:8: ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
>-		int alt14 = 34;
>-		alt14 = dfa14.predict(input);
>-		switch(alt14) {
>-		case 1:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:10: T12
>-		{
>-			mT12();
>+ s = -1;
>+ if ( ((LA14_26>='\u0000' && LA14_26<='\uFFFF')) ) {s = 57;}
> 
>-		}
>-			break;
>-		case 2:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:14: T13
>-		{
>-			mT13();
>+ else s = 29;
> 
>-		}
>-			break;
>-		case 3:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:18: T14
>-		{
>-			mT14();
>+ if ( s>=0 ) return s;
>+ break;
>+ case 1 : 
>+ int LA14_0 = input.LA(1);
> 
>-		}
>-			break;
>-		case 4:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:22: T15
>-		{
>-			mT15();
>+ s = -1;
>+ if ( (LA14_0==':') ) {s = 1;}
> 
>-		}
>-			break;
>-		case 5:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:26: T16
>-		{
>-			mT16();
>+ else if ( (LA14_0=='<') ) {s = 2;}
> 
>-		}
>-			break;
>-		case 6:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:30: T17
>-		{
>-			mT17();
>+ else if ( (LA14_0=='{') ) {s = 3;}
> 
>-		}
>-			break;
>-		case 7:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:34: T18
>-		{
>-			mT18();
>+ else if ( (LA14_0==',') ) {s = 4;}
> 
>-		}
>-			break;
>-		case 8:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:38: T19
>-		{
>-			mT19();
>+ else if ( (LA14_0=='}') ) {s = 5;}
> 
>-		}
>-			break;
>-		case 9:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:42: T20
>-		{
>-			mT20();
>+ else if ( (LA14_0=='e') ) {s = 6;}
> 
>-		}
>-			break;
>-		case 10:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:46: T21
>-		{
>-			mT21();
>+ else if ( (LA14_0=='[') ) {s = 7;}
> 
>-		}
>-			break;
>-		case 11:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:50: T22
>-		{
>-			mT22();
>+ else if ( (LA14_0=='.') ) {s = 8;}
> 
>-		}
>-			break;
>-		case 12:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:54: T23
>-		{
>-			mT23();
>+ else if ( (LA14_0==']') ) {s = 9;}
> 
>-		}
>-			break;
>-		case 13:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:58: T24
>-		{
>-			mT24();
>+ else if ( (LA14_0=='s') ) {s = 10;}
> 
>-		}
>-			break;
>-		case 14:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:62: T25
>-		{
>-			mT25();
>+ else if ( (LA14_0=='o') ) {s = 11;}
> 
>-		}
>-			break;
>-		case 15:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:66: T26
>-		{
>-			mT26();
>+ else if ( (LA14_0=='u') ) {s = 12;}
> 
>-		}
>-			break;
>-		case 16:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:70: T27
>-		{
>-			mT27();
>+ else if ( (LA14_0=='c') ) {s = 13;}
> 
>-		}
>-			break;
>-		case 17:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:74: T28
>-		{
>-			mT28();
>+ else if ( (LA14_0=='r') ) {s = 14;}
> 
>-		}
>-			break;
>-		case 18:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:78: T29
>-		{
>-			mT29();
>+ else if ( (LA14_0=='d') ) {s = 15;}
> 
>-		}
>-			break;
>-		case 19:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:82: T30
>-		{
>-			mT30();
>+ else if ( (LA14_0=='+') ) {s = 16;}
> 
>-		}
>-			break;
>-		case 20:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:86: T31
>-		{
>-			mT31();
>+ else if ( (LA14_0=='-') ) {s = 17;}
> 
>-		}
>-			break;
>-		case 21:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:90: T32
>-		{
>-			mT32();
>+ else if ( (LA14_0=='#') ) {s = 18;}
> 
>-		}
>-			break;
>-		case 22:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:94: T33
>-		{
>-			mT33();
>+ else if ( (LA14_0=='~') ) {s = 19;}
> 
>-		}
>-			break;
>-		case 23:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:98: T34
>-		{
>-			mT34();
>+ else if ( (LA14_0=='i') ) {s = 20;}
> 
>-		}
>-			break;
>-		case 24:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:102: T35
>-		{
>-			mT35();
>+ else if ( ((LA14_0>='0' && LA14_0<='9')) ) {s = 21;}
> 
>-		}
>-			break;
>-		case 25:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:106: T36
>-		{
>-			mT36();
>+ else if ( (LA14_0=='*') ) {s = 22;}
> 
>-		}
>-			break;
>-		case 26:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:110: T37
>-		{
>-			mT37();
>+ else if ( (LA14_0=='^') ) {s = 23;}
> 
>-		}
>-			break;
>-		case 27:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:114: RULE_UNLIMITEDLITERAL
>-		{
>-			mRULE_UNLIMITEDLITERAL();
>+ else if ( ((LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='b')||(LA14_0>='f' && LA14_0<='h')||(LA14_0>='j' && LA14_0<='n')||(LA14_0>='p' && LA14_0<='q')||LA14_0=='t'||(LA14_0>='v' && LA14_0<='z')) ) {s = 24;}
> 
>-		}
>-			break;
>-		case 28:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:136: RULE_ID
>-		{
>-			mRULE_ID();
>+ else if ( (LA14_0=='\"') ) {s = 25;}
> 
>-		}
>-			break;
>-		case 29:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:144: RULE_INT
>-		{
>-			mRULE_INT();
>+ else if ( (LA14_0=='\'') ) {s = 26;}
> 
>-		}
>-			break;
>-		case 30:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:153: RULE_STRING
>-		{
>-			mRULE_STRING();
>+ else if ( (LA14_0=='/') ) {s = 27;}
> 
>-		}
>-			break;
>-		case 31:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:165: RULE_ML_COMMENT
>-		{
>-			mRULE_ML_COMMENT();
>+ else if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {s = 28;}
> 
>-		}
>-			break;
>-		case 32:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:181: RULE_SL_COMMENT
>-		{
>-			mRULE_SL_COMMENT();
>+ else if ( ((LA14_0>='\u0000' && LA14_0<='\b')||(LA14_0>='\u000B' && LA14_0<='\f')||(LA14_0>='\u000E' && LA14_0<='\u001F')||LA14_0=='!'||(LA14_0>='$' && LA14_0<='&')||(LA14_0>='(' && LA14_0<=')')||LA14_0==';'||(LA14_0>='=' && LA14_0<='@')||LA14_0=='\\'||LA14_0=='`'||LA14_0=='|'||(LA14_0>='\u007F' && LA14_0<='\uFFFF')) ) {s = 29;}
> 
>-		}
>-			break;
>-		case 33:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:197: RULE_WS
>-		{
>-			mRULE_WS();
>+ if ( s>=0 ) return s;
>+ break;
>+ case 2 : 
>+ int LA14_25 = input.LA(1);
> 
>-		}
>-			break;
>-		case 34:
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:1:205: RULE_ANY_OTHER
>-		{
>-			mRULE_ANY_OTHER();
>+ s = -1;
>+ if ( ((LA14_25>='\u0000' && LA14_25<='\uFFFF')) ) {s = 57;}
> 
>-		}
>-			break;
>+ else s = 29;
> 
>-		}
>+ if ( s>=0 ) return s;
>+ break;
>+ }
>+ NoViableAltException nvae =
>+ new NoViableAltException(getDescription(), 14, _s, input);
>+ error(nvae);
>+ throw nvae;
>+ }
>+ }
>+ 
> 
>-	}
>-
>-
>-	protected DFA14 dfa14 = new DFA14(this);
>-
>-	static final String DFA14_eotS = "\1\uffff\1\37\1\35\3\uffff\1\46\1\uffff\1\35\1\uffff\6\46\4\uffff" + "\1\46\1\67\1\uffff\1\35\1\uffff\3\35\10\uffff\2\46\4\uffff\10\46" + "\4\uffff\1\111\1\uffff\1\67\4\uffff\4\46\1\116\7\46\1\uffff\4\46" + "\1\uffff\3\46\1\135\12\46\1\uffff\2\46\1\152\2\46\1\155\1\46\1\157" + "\1\160\1\161\1\162\1\163\2\uffff\1\46\1\uffff\1\165\5\uffff\1\46" + "\1\uffff\1\167\1\uffff";
>-
>-	static final String DFA14_eofS = "\170\uffff";
>-
>-	static final String DFA14_minS = "\1\0\1\72\1\125\3\uffff\1\146\1\uffff\1\56\1\uffff\1\164\1\162\1" + "\156\1\162\2\145\4\uffff\1\156\1\60\1\uffff\1\101\1\uffff\2\0\1" + "\52\10\uffff\1\146\1\143\4\uffff\1\162\1\144\1\164\1\144\1\151\1" + "\145\1\141\1\154\4\uffff\1\60\1\uffff\1\60\4\uffff\4\145\1\60\1" + "\141\1\161\1\141\1\144\1\165\1\145\1\165\1\uffff\1\143\1\160\1\141" + "\1\162\1\uffff\1\164\1\165\1\164\1\60\1\162\4\164\1\155\4\145\1" + "\uffff\1\156\1\145\1\60\1\72\1\151\1\60\1\144\5\60\2\uffff\1\157" + "\1\uffff\1\60\5\uffff\1\156\1\uffff\1\60\1\uffff";
>-
>-	static final String DFA14_maxS = "\1\ufffe\1\72\1\125\3\uffff\1\170\1\uffff\1\56\1\uffff\1\164\1\165" + "\1\160\1\162\2\145\4\uffff\1\156\1\71\1\uffff\1\172\1\uffff\2\ufffe" + "\1\57\10\uffff\1\146\1\143\4\uffff\1\162\1\144\1\164\1\144\1\151" + "\1\145\1\164\1\154\4\uffff\1\172\1\uffff\1\71\4\uffff\4\145\1\172" + "\1\141\1\161\1\141\1\144\1\165\1\145\1\165\1\uffff\1\143\1\160\1" + "\141\1\162\1\uffff\1\164\1\165\1\164\1\172\1\162\4\164\1\155\4\145" + "\1\uffff\1\156\1\145\1\172\1\72\1\151\1\172\1\144\5\172\2\uffff" + "\1\157\1\uffff\1\172\5\uffff\1\156\1\uffff\1\172\1\uffff";
>-
>-	static final String DFA14_acceptS = "\3\uffff\1\3\1\4\1\5\1\uffff\1\10\1\uffff\1\12\6\uffff\1\23\1\24" + "\1\25\1\26\2\uffff\1\33\1\uffff\1\34\3\uffff\1\41\1\42\1\7\1\1\1" + "\2\1\3\1\4\1\5\2\uffff\1\34\1\10\1\11\1\12\10\uffff\1\23\1\24\1" + "\25\1\26\1\uffff\1\33\1\uffff\1\36\1\40\1\37\1\41\14\uffff\1\27" + "\4\uffff\1\30\16\uffff\1\20\14\uffff\1\31\1\6\1\uffff\1\14\1\uffff" + "\1\21\1\16\1\17\1\32\1\22\1\uffff\1\15\1\uffff\1\13";
>-
>-	static final String DFA14_specialS = "\170\uffff}>";
>-
>-	static final String[] DFA14_transitionS = { "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\1\22\3\35\1\32\2" + "\35\1\26\1\20\1\4\1\21\1\10\1\33\12\25\1\1\1\35\1\2\4\35\32" + "\30\1\7\1\35\1\11\1\27\1\30\1\35\2\30\1\15\1\17\1\6\3\30\1\24" + "\5\30\1\13\2\30\1\16\1\12\1\30\1\14\5\30\1\3\1\35\1\5\1\23\uff80" + "\35", "\1\36", "\1\40", "", "", "", "\1\44\21\uffff\1\45", "", "\1\50", "", "\1\52", "\1\53\2\uffff\1\54", "\1\56\1\uffff\1\55", "\1\57", "\1\60", "\1\61", "", "", "", "", "\1\66", "\12\70", "", "\32\46\4\uffff\1\46\1\uffff\32\46", "", "\uffff\71", "\uffff\71", "\1\73\4\uffff\1\72", "", "", "", "", "", "", "", "", "\1\75", "\1\76", "", "", "", "", "\1\77", "\1\100", "\1\101", "\1\102", "\1\103", "\1\104", "\1\105\22\uffff\1\106", "\1\107", "", "", "", "", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\16\46\1\110\13\46", "", "\12\70", "", "", "", "", "\1\112", "\1\113", "\1\114", "\1\115", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\117", "\1\120", "\1\121", "\1\122", "\1\123", "\1\124", "\1\125", "", "\1\126", "\1\127", "\1\130", "\1\131", "", "\1\132", "\1\133", "\1\134", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\136", "\1\137", "\1\140", "\1\141", "\1\142", "\1\143", "\1\144", "\1\145", "\1\146", "\1\147", "", "\1\150", "\1\151", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\153", "\1\154", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\156", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "", "", "\1\164", "", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "", "", "", "", "", "\1\166", "", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "" };
>-
>-	static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
>-
>-	static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
>-
>-	static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
>-
>-	static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
>-
>-	static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
>-
>-	static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
>-
>-	static final short[][] DFA14_transition;
>-
>-	static {
>-		int numStates = DFA14_transitionS.length;
>-		DFA14_transition = new short[numStates][];
>-		for(int i = 0; i < numStates; i++) {
>-			DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
>-		}
>-	}
>-
>-	class DFA14 extends DFA {
>-
>-		public DFA14(BaseRecognizer recognizer) {
>-			this.recognizer = recognizer;
>-			this.decisionNumber = 14;
>-			this.eot = DFA14_eot;
>-			this.eof = DFA14_eof;
>-			this.min = DFA14_min;
>-			this.max = DFA14_max;
>-			this.accept = DFA14_accept;
>-			this.special = DFA14_special;
>-			this.transition = DFA14_transition;
>-		}
>-
>-		public String getDescription() {
>-			return "1:1: Tokens : ( T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
>-		}
>-	}
>-
>-
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameterParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameterParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameterParser.java	(working copy)
>@@ -1,23 +1,8 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
>-package org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal;
>+package org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal; 
> 
>-import java.io.InputStream;
> import org.eclipse.xtext.*;
> import org.eclipse.xtext.parser.*;
> import org.eclipse.xtext.parser.impl.*;
>-import org.eclipse.xtext.parsetree.*;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.common.util.Enumerator;
>@@ -25,9 +10,10 @@
> import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
> import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
>-import org.eclipse.xtext.conversion.ValueConverterException;
> import org.eclipse.papyrus.parameter.editor.xtext.services.UmlParameterGrammarAccess;
> 
>+
>+
> import org.antlr.runtime.*;
> import java.util.Stack;
> import java.util.List;
>@@ -35,2034 +21,1989 @@
> 
> @SuppressWarnings("all")
> public class InternalUmlParameterParser extends AbstractInternalAntlrParser {
>-
>-	public static final String[] tokenNames = new String[]{ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'<Undefined>'", "'{'", "','", "'}'", "'effect: '", "'::'", "'['", "'..'", "']'", "'exception'", "'stream'", "'ordered'", "'unique'", "'create'", "'read'", "'update'", "'delete'", "'+'", "'-'", "'#'", "'~'", "'in'", "'out'", "'inout'", "'return'" };
>-
>-	public static final int RULE_ID = 4;
>-
>-	public static final int RULE_STRING = 7;
>-
>-	public static final int RULE_UNLIMITEDLITERAL = 5;
>-
>-	public static final int RULE_ANY_OTHER = 11;
>-
>-	public static final int RULE_INT = 6;
>-
>-	public static final int RULE_WS = 10;
>-
>-	public static final int RULE_SL_COMMENT = 9;
>-
>-	public static final int EOF = -1;
>-
>-	public static final int RULE_ML_COMMENT = 8;
>-
>-	public InternalUmlParameterParser(TokenStream input) {
>-		super(input);
>-	}
>-
>-
>-	public String[] getTokenNames() {
>-		return tokenNames;
>-	}
>-
>-	public String getGrammarFileName() {
>-		return "../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g";
>-	}
>-
>-
>-
>-	private UmlParameterGrammarAccess grammarAccess;
>-
>-	public InternalUmlParameterParser(TokenStream input, IAstFactory factory, UmlParameterGrammarAccess grammarAccess) {
>-		this(input);
>-		this.factory = factory;
>-		registerRules(grammarAccess.getGrammar());
>-		this.grammarAccess = grammarAccess;
>-	}
>-
>-	@Override
>-	protected InputStream getTokenFile() {
>-		ClassLoader classLoader = getClass().getClassLoader();
>-		return classLoader.getResourceAsStream("org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens");
>-	}
>-
>-	@Override
>-	protected String getFirstRuleName() {
>-		return "ParameterRule";
>-	}
>-
>-	@Override
>-	protected UmlParameterGrammarAccess getGrammarAccess() {
>-		return grammarAccess;
>-	}
>-
>-
>-
>-	// $ANTLR start entryRuleParameterRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:78:1: entryRuleParameterRule returns [EObject current=null] : iv_ruleParameterRule= ruleParameterRule EOF ;
>-	public final EObject entryRuleParameterRule() throws RecognitionException {
>-		EObject current = null;
>-
>-		EObject iv_ruleParameterRule = null;
>-
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:79:2: (iv_ruleParameterRule= ruleParameterRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:80:2: iv_ruleParameterRule= ruleParameterRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getParameterRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleParameterRule_in_entryRuleParameterRule75);
>-				iv_ruleParameterRule = ruleParameterRule();
>-				_fsp--;
>-
>-				current = iv_ruleParameterRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleParameterRule85);
>-
>-			}
>-
>-		}
>-
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>-
>-	// $ANTLR end entryRuleParameterRule
>-
>-
>-	// $ANTLR start ruleParameterRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:87:1: ruleParameterRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) ) ;
>-	public final EObject ruleParameterRule() throws RecognitionException {
>-		EObject current = null;
>-
>-		Token lv_name_2_0 = null;
>-		Enumerator lv_visibility_0_0 = null;
>-
>-		Enumerator lv_direction_1_0 = null;
>-
>-		EObject lv_type_4_0 = null;
>-
>-		EObject lv_multiplicity_6_0 = null;
>-
>-		EObject lv_modifiers_7_0 = null;
>-
>-		EObject lv_effect_8_0 = null;
>-
>-
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>-
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:92:6: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:93:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:93:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:93:2: ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:93:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:94:1: (lv_visibility_0_0= ruleVisibilityKind )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:94:1: (lv_visibility_0_0= ruleVisibilityKind )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:95:3: lv_visibility_0_0= ruleVisibilityKind
>-						{
>-
>-							currentNode = createCompositeNode(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), currentNode);
>+ public static final String[] tokenNames = new String[] {
>+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_UNLIMITEDLITERAL", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'<Undefined>'", "'{'", "','", "'}'", "'effect: '", "'::'", "'['", "'..'", "']'", "'exception'", "'stream'", "'ordered'", "'unique'", "'create'", "'read'", "'update'", "'delete'", "'+'", "'-'", "'#'", "'~'", "'in'", "'out'", "'inout'", "'return'"
>+ };
>+ public static final int RULE_ID=4;
>+ public static final int RULE_UNLIMITEDLITERAL=5;
>+ public static final int T__29=29;
>+ public static final int T__28=28;
>+ public static final int T__27=27;
>+ public static final int T__26=26;
>+ public static final int T__25=25;
>+ public static final int T__24=24;
>+ public static final int T__23=23;
>+ public static final int T__22=22;
>+ public static final int RULE_ANY_OTHER=11;
>+ public static final int T__21=21;
>+ public static final int T__20=20;
>+ public static final int RULE_SL_COMMENT=9;
>+ public static final int EOF=-1;
>+ public static final int RULE_ML_COMMENT=8;
>+ public static final int T__30=30;
>+ public static final int T__19=19;
>+ public static final int T__31=31;
>+ public static final int RULE_STRING=7;
>+ public static final int T__32=32;
>+ public static final int T__33=33;
>+ public static final int T__16=16;
>+ public static final int T__34=34;
>+ public static final int T__15=15;
>+ public static final int T__35=35;
>+ public static final int T__18=18;
>+ public static final int T__36=36;
>+ public static final int T__17=17;
>+ public static final int T__37=37;
>+ 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=6;
>+ public static final int RULE_WS=10;
> 
>-							pushFollow(FOLLOW_ruleVisibilityKind_in_ruleParameterRule131);
>-							lv_visibility_0_0 = ruleVisibilityKind();
>-							_fsp--;
>+ // delegates
>+ // delegators
> 
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "visibility", lv_visibility_0_0, "VisibilityKind", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ public InternalUmlParameterParser(TokenStream input) {
>+ this(input, new RecognizerSharedState());
>+ }
>+ public InternalUmlParameterParser(TokenStream input, RecognizerSharedState state) {
>+ super(input, state);
>+ 
>+ }
>+ 
> 
>+ public String[] getTokenNames() { return InternalUmlParameterParser.tokenNames; }
>+ public String getGrammarFileName() { return "../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g"; }
> 
>-						}
> 
> 
>-					}
>+ 	private UmlParameterGrammarAccess grammarAccess;
>+ 	
>+ public InternalUmlParameterParser(TokenStream input, UmlParameterGrammarAccess grammarAccess) {
>+ this(input);
>+ this.grammarAccess = grammarAccess;
>+ registerRules(grammarAccess.getGrammar());
>+ }
>+ 
>+ @Override
>+ protected String getFirstRuleName() {
>+ 	return "ParameterRule";	
>+ 	}
>+ 	
>+ 	@Override
>+ 	protected UmlParameterGrammarAccess getGrammarAccess() {
>+ 		return grammarAccess;
>+ 	}
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:117:2: ( (lv_direction_1_0= ruleDirection ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:118:1: (lv_direction_1_0= ruleDirection )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:118:1: (lv_direction_1_0= ruleDirection )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:119:3: lv_direction_1_0= ruleDirection
>-						{
> 
>-							currentNode = createCompositeNode(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0(), currentNode);
> 
>-							pushFollow(FOLLOW_ruleDirection_in_ruleParameterRule152);
>-							lv_direction_1_0 = ruleDirection();
>-							_fsp--;
>+ // $ANTLR start "entryRuleParameterRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:68:1: entryRuleParameterRule returns [EObject current=null] : iv_ruleParameterRule= ruleParameterRule EOF ;
>+ public final EObject entryRuleParameterRule() throws RecognitionException {
>+ EObject current = null;
> 
>+ EObject iv_ruleParameterRule = null;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "direction", lv_direction_1_0, "Direction", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
> 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:69:2: (iv_ruleParameterRule= ruleParameterRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:70:2: iv_ruleParameterRule= ruleParameterRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getParameterRuleRule()); 
>+ pushFollow(FOLLOW_ruleParameterRule_in_entryRuleParameterRule75);
>+ iv_ruleParameterRule=ruleParameterRule();
> 
>-						}
>+ state._fsp--;
> 
>+ current =iv_ruleParameterRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleParameterRule85); 
> 
>-					}
>+ }
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:141:2: ( (lv_name_2_0= RULE_ID ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:142:1: (lv_name_2_0= RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:142:1: (lv_name_2_0= RULE_ID )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:143:3: lv_name_2_0= RULE_ID
>-						{
>-							lv_name_2_0 = (Token)input.LT(1);
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleParameterRule169);
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleParameterRule"
> 
>-							createLeafNode(grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0(), "name");
> 
>+ // $ANTLR start "ruleParameterRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:77:1: ruleParameterRule returns [EObject current=null] : ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) ) ;
>+ public final EObject ruleParameterRule() throws RecognitionException {
>+ EObject current = null;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>-							try {
>-								set(current, "name", lv_name_2_0, "ID", lastConsumedNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>+ Token lv_name_2_0=null;
>+ Token otherlv_3=null;
>+ Token otherlv_5=null;
>+ Enumerator lv_visibility_0_0 = null;
> 
>+ Enumerator lv_direction_1_0 = null;
> 
>-						}
>+ EObject lv_type_4_0 = null;
> 
>+ EObject lv_multiplicity_6_0 = null;
> 
>-					}
>+ EObject lv_modifiers_7_0 = null;
> 
>-					match(input, 12, FOLLOW_12_in_ruleParameterRule184);
>+ EObject lv_effect_8_0 = null;
> 
>-					createLeafNode(grammarAccess.getParameterRuleAccess().getColonKeyword_3(), null);
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:169:1: ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' )
>-					int alt1 = 2;
>-					int LA1_0 = input.LA(1);
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:80:28: ( ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:81:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:81:1: ( ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:81:2: ( (lv_visibility_0_0= ruleVisibilityKind ) ) ( (lv_direction_1_0= ruleDirection ) ) ( (lv_name_2_0= RULE_ID ) ) otherlv_3= ':' ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' ) ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )? ( (lv_modifiers_7_0= ruleModifiersRule ) )? ( (lv_effect_8_0= ruleEffectRule ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:81:2: ( (lv_visibility_0_0= ruleVisibilityKind ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:82:1: (lv_visibility_0_0= ruleVisibilityKind )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:82:1: (lv_visibility_0_0= ruleVisibilityKind )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:83:3: lv_visibility_0_0= ruleVisibilityKind
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleVisibilityKind_in_ruleParameterRule131);
>+ lv_visibility_0_0=ruleVisibilityKind();
> 
>-					if((LA1_0 == RULE_ID)) {
>-						alt1 = 1;
>-					} else if((LA1_0 == 13)) {
>-						alt1 = 2;
>-					} else {
>-						NoViableAltException nvae = new NoViableAltException("169:1: ( ( (lv_type_4_0= ruleTypeRule ) ) | '<Undefined>' )", 1, 0, input);
>+ state._fsp--;
> 
>-						throw nvae;
>-					}
>-					switch(alt1) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:169:2: ( (lv_type_4_0= ruleTypeRule ) )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:169:2: ( (lv_type_4_0= ruleTypeRule ) )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:170:1: (lv_type_4_0= ruleTypeRule )
>-						{
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:170:1: (lv_type_4_0= ruleTypeRule )
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:171:3: lv_type_4_0= ruleTypeRule
>-							{
> 
>-								currentNode = createCompositeNode(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0(), currentNode);
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"visibility",
>+ 		lv_visibility_0_0, 
>+ 		"VisibilityKind");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-								pushFollow(FOLLOW_ruleTypeRule_in_ruleParameterRule206);
>-								lv_type_4_0 = ruleTypeRule();
>-								_fsp--;
>+ }
> 
> 
>-								if(current == null) {
>-									current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-									associateNodeWithAstElement(currentNode.getParent(), current);
>-								}
>-								try {
>-									set(current, "type", lv_type_4_0, "TypeRule", currentNode);
>-								} catch (ValueConverterException vce) {
>-									handleValueConverterException(vce);
>-								}
>-								currentNode = currentNode.getParent();
>+ }
> 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:99:2: ( (lv_direction_1_0= ruleDirection ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:100:1: (lv_direction_1_0= ruleDirection )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:100:1: (lv_direction_1_0= ruleDirection )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:101:3: lv_direction_1_0= ruleDirection
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleDirection_in_ruleParameterRule152);
>+ lv_direction_1_0=ruleDirection();
> 
>-							}
>+ state._fsp--;
> 
> 
>-						}
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"direction",
>+ 		lv_direction_1_0, 
>+ 		"Direction");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>+ }
> 
>-					}
>-						break;
>-					case 2:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:194:7: '<Undefined>'
>-					{
>-						match(input, 13, FOLLOW_13_in_ruleParameterRule222);
> 
>-						createLeafNode(grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1(), null);
>+ }
> 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:117:2: ( (lv_name_2_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:118:1: (lv_name_2_0= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:118:1: (lv_name_2_0= RULE_ID )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:119:3: lv_name_2_0= RULE_ID
>+ {
>+ lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameterRule169); 
> 
>-					}
>-						break;
>+ 			newLeafNode(lv_name_2_0, grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0()); 
>+ 		
> 
>-					}
>+ 	 if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"name",
>+ 		lv_name_2_0, 
>+ 		"ID");
>+ 	 
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:198:2: ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )?
>-					int alt2 = 2;
>-					int LA2_0 = input.LA(1);
>+ }
> 
>-					if((LA2_0 == 19)) {
>-						alt2 = 1;
>-					}
>-					switch(alt2) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:199:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:199:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:200:3: lv_multiplicity_6_0= ruleMultiplicityRule
>-						{
> 
>-							currentNode = createCompositeNode(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0(), currentNode);
>+ }
> 
>-							pushFollow(FOLLOW_ruleMultiplicityRule_in_ruleParameterRule244);
>-							lv_multiplicity_6_0 = ruleMultiplicityRule();
>-							_fsp--;
>+ otherlv_3=(Token)match(input,12,FOLLOW_12_in_ruleParameterRule186); 
> 
>+ 	newLeafNode(otherlv_3, grammarAccess.getParameterRuleAccess().getColonKeyword_3());
>+ 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:139:1: ( ( (lv_type_4_0= ruleTypeRule ) ) | otherlv_5= '<Undefined>' )
>+ int alt1=2;
>+ int LA1_0 = input.LA(1);
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "multiplicity", lv_multiplicity_6_0, "MultiplicityRule", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ if ( (LA1_0==RULE_ID) ) {
>+ alt1=1;
>+ }
>+ else if ( (LA1_0==13) ) {
>+ alt1=2;
>+ }
>+ else {
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 1, 0, input);
> 
>+ throw nvae;
>+ }
>+ switch (alt1) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:139:2: ( (lv_type_4_0= ruleTypeRule ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:139:2: ( (lv_type_4_0= ruleTypeRule ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:140:1: (lv_type_4_0= ruleTypeRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:140:1: (lv_type_4_0= ruleTypeRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:141:3: lv_type_4_0= ruleTypeRule
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleTypeRule_in_ruleParameterRule208);
>+ lv_type_4_0=ruleTypeRule();
> 
>-						}
>+ state._fsp--;
> 
> 
>-					}
>-						break;
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"type",
>+ 		lv_type_4_0, 
>+ 		"TypeRule");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-					}
>+ }
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:222:3: ( (lv_modifiers_7_0= ruleModifiersRule ) )?
>-					int alt3 = 2;
>-					int LA3_0 = input.LA(1);
> 
>-					if((LA3_0 == 14)) {
>-						int LA3_1 = input.LA(2);
>+ }
> 
>-						if(((LA3_1 >= 22 && LA3_1 <= 25))) {
>-							alt3 = 1;
>-						}
>-					}
>-					switch(alt3) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:223:1: (lv_modifiers_7_0= ruleModifiersRule )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:223:1: (lv_modifiers_7_0= ruleModifiersRule )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:224:3: lv_modifiers_7_0= ruleModifiersRule
>-						{
> 
>-							currentNode = createCompositeNode(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0(), currentNode);
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:158:7: otherlv_5= '<Undefined>'
>+ {
>+ otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleParameterRule226); 
> 
>-							pushFollow(FOLLOW_ruleModifiersRule_in_ruleParameterRule266);
>-							lv_modifiers_7_0 = ruleModifiersRule();
>-							_fsp--;
>+ 	newLeafNode(otherlv_5, grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1());
>+ 
> 
>+ }
>+ break;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "modifiers", lv_modifiers_7_0, "ModifiersRule", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ }
> 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:162:2: ( (lv_multiplicity_6_0= ruleMultiplicityRule ) )?
>+ int alt2=2;
>+ int LA2_0 = input.LA(1);
> 
>-						}
>+ if ( (LA2_0==19) ) {
>+ alt2=1;
>+ }
>+ switch (alt2) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:163:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:163:1: (lv_multiplicity_6_0= ruleMultiplicityRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:164:3: lv_multiplicity_6_0= ruleMultiplicityRule
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleMultiplicityRule_in_ruleParameterRule248);
>+ lv_multiplicity_6_0=ruleMultiplicityRule();
> 
>+ state._fsp--;
> 
>-					}
>-						break;
> 
>-					}
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"multiplicity",
>+ 		lv_multiplicity_6_0, 
>+ 		"MultiplicityRule");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:246:3: ( (lv_effect_8_0= ruleEffectRule ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:247:1: (lv_effect_8_0= ruleEffectRule )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:247:1: (lv_effect_8_0= ruleEffectRule )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:248:3: lv_effect_8_0= ruleEffectRule
>-						{
>+ }
> 
>-							currentNode = createCompositeNode(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0(), currentNode);
> 
>-							pushFollow(FOLLOW_ruleEffectRule_in_ruleParameterRule288);
>-							lv_effect_8_0 = ruleEffectRule();
>-							_fsp--;
>+ }
>+ break;
> 
>+ }
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getParameterRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "effect", lv_effect_8_0, "EffectRule", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:180:3: ( (lv_modifiers_7_0= ruleModifiersRule ) )?
>+ int alt3=2;
>+ int LA3_0 = input.LA(1);
> 
>+ if ( (LA3_0==14) ) {
>+ int LA3_1 = input.LA(2);
> 
>-						}
>+ if ( ((LA3_1>=22 && LA3_1<=25)) ) {
>+ alt3=1;
>+ }
>+ }
>+ switch (alt3) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:181:1: (lv_modifiers_7_0= ruleModifiersRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:181:1: (lv_modifiers_7_0= ruleModifiersRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:182:3: lv_modifiers_7_0= ruleModifiersRule
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleModifiersRule_in_ruleParameterRule270);
>+ lv_modifiers_7_0=ruleModifiersRule();
> 
>+ state._fsp--;
> 
>-					}
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"modifiers",
>+ 		lv_modifiers_7_0, 
>+ 		"ModifiersRule");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-				}
>+ }
> 
> 
>-			}
>+ }
>+ break;
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ }
> 
>-		}
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:198:3: ( (lv_effect_8_0= ruleEffectRule ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:199:1: (lv_effect_8_0= ruleEffectRule )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:199:1: (lv_effect_8_0= ruleEffectRule )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:200:3: lv_effect_8_0= ruleEffectRule
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleEffectRule_in_ruleParameterRule292);
>+ lv_effect_8_0=ruleEffectRule();
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ state._fsp--;
> 
>-	// $ANTLR end ruleParameterRule
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getParameterRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"effect",
>+ 		lv_effect_8_0, 
>+ 		"EffectRule");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-	// $ANTLR start entryRuleModifiersRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:278:1: entryRuleModifiersRule returns [EObject current=null] : iv_ruleModifiersRule= ruleModifiersRule EOF ;
>-	public final EObject entryRuleModifiersRule() throws RecognitionException {
>-		EObject current = null;
>+ }
> 
>-		EObject iv_ruleModifiersRule = null;
> 
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:279:2: (iv_ruleModifiersRule= ruleModifiersRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:280:2: iv_ruleModifiersRule= ruleModifiersRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getModifiersRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule324);
>-				iv_ruleModifiersRule = ruleModifiersRule();
>-				_fsp--;
> 
>-				current = iv_ruleModifiersRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleModifiersRule334);
>+ }
> 
>-			}
> 
>-		}
>+ }
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleParameterRule"
> 
>-	// $ANTLR end entryRuleModifiersRule
> 
>+ // $ANTLR start "entryRuleModifiersRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:224:1: entryRuleModifiersRule returns [EObject current=null] : iv_ruleModifiersRule= ruleModifiersRule EOF ;
>+ public final EObject entryRuleModifiersRule() throws RecognitionException {
>+ EObject current = null;
> 
>-	// $ANTLR start ruleModifiersRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:287:1: ruleModifiersRule returns [EObject current=null] : ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' ) ;
>-	public final EObject ruleModifiersRule() throws RecognitionException {
>-		EObject current = null;
>+ EObject iv_ruleModifiersRule = null;
> 
>-		EObject lv_values_1_0 = null;
> 
>-		EObject lv_values_3_0 = null;
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:225:2: (iv_ruleModifiersRule= ruleModifiersRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:226:2: iv_ruleModifiersRule= ruleModifiersRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getModifiersRuleRule()); 
>+ pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule328);
>+ iv_ruleModifiersRule=ruleModifiersRule();
> 
>+ state._fsp--;
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ current =iv_ruleModifiersRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule338); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:292:6: ( ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:293:1: ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:293:1: ( '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:293:3: '{' ( (lv_values_1_0= ruleModifierSpecification ) ) ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* '}'
>-				{
>-					match(input, 14, FOLLOW_14_in_ruleModifiersRule369);
>+ }
> 
>-					createLeafNode(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0(), null);
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleModifiersRule"
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:297:1: ( (lv_values_1_0= ruleModifierSpecification ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:298:1: (lv_values_1_0= ruleModifierSpecification )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:298:1: (lv_values_1_0= ruleModifierSpecification )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:299:3: lv_values_1_0= ruleModifierSpecification
>-						{
> 
>-							currentNode = createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0(), currentNode);
>+ // $ANTLR start "ruleModifiersRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:233:1: ruleModifiersRule returns [EObject current=null] : (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' ) ;
>+ public final EObject ruleModifiersRule() throws RecognitionException {
>+ EObject current = null;
> 
>-							pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule390);
>-							lv_values_1_0 = ruleModifierSpecification();
>-							_fsp--;
>+ Token otherlv_0=null;
>+ Token otherlv_2=null;
>+ Token otherlv_4=null;
>+ EObject lv_values_1_0 = null;
> 
>+ EObject lv_values_3_0 = null;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								add(current, "values", lv_values_1_0, "ModifierSpecification", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
> 
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:236:28: ( (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:237:1: (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:237:1: (otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:237:3: otherlv_0= '{' ( (lv_values_1_0= ruleModifierSpecification ) ) (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )* otherlv_4= '}'
>+ {
>+ otherlv_0=(Token)match(input,14,FOLLOW_14_in_ruleModifiersRule375); 
> 
>-						}
>+ 	newLeafNode(otherlv_0, grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0());
>+ 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:241:1: ( (lv_values_1_0= ruleModifierSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:242:1: (lv_values_1_0= ruleModifierSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:242:1: (lv_values_1_0= ruleModifierSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:243:3: lv_values_1_0= ruleModifierSpecification
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule396);
>+ lv_values_1_0=ruleModifierSpecification();
> 
>+ state._fsp--;
> 
>-					}
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:321:2: ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )*
>-					loop4: do {
>-						int alt4 = 2;
>-						int LA4_0 = input.LA(1);
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
>+ 	 }
>+ 		add(
>+ 			current, 
>+ 			"values",
>+ 		lv_values_1_0, 
>+ 		"ModifierSpecification");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-						if((LA4_0 == 15)) {
>-							alt4 = 1;
>-						}
>+ }
> 
> 
>-						switch(alt4) {
>-						case 1:
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:321:4: ',' ( (lv_values_3_0= ruleModifierSpecification ) )
>-						{
>-							match(input, 15, FOLLOW_15_in_ruleModifiersRule401);
>+ }
> 
>-							createLeafNode(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0(), null);
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:259:2: (otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )*
>+ loop4:
>+ do {
>+ int alt4=2;
>+ int LA4_0 = input.LA(1);
> 
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:325:1: ( (lv_values_3_0= ruleModifierSpecification ) )
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:326:1: (lv_values_3_0= ruleModifierSpecification )
>-							{
>-								// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:326:1: (lv_values_3_0= ruleModifierSpecification )
>-								// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:327:3: lv_values_3_0= ruleModifierSpecification
>-								{
>+ if ( (LA4_0==15) ) {
>+ alt4=1;
>+ }
> 
>-									currentNode = createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0(), currentNode);
> 
>-									pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule422);
>-									lv_values_3_0 = ruleModifierSpecification();
>-									_fsp--;
>+ switch (alt4) {
>+ 	case 1 :
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:259:4: otherlv_2= ',' ( (lv_values_3_0= ruleModifierSpecification ) )
>+ 	 {
>+ 	 otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleModifiersRule409); 
> 
>+ 	 	newLeafNode(otherlv_2, grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0());
>+ 	 
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:263:1: ( (lv_values_3_0= ruleModifierSpecification ) )
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:264:1: (lv_values_3_0= ruleModifierSpecification )
>+ 	 {
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:264:1: (lv_values_3_0= ruleModifierSpecification )
>+ 	 // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:265:3: lv_values_3_0= ruleModifierSpecification
>+ 	 {
>+ 	 
>+ 	 	 newCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
>+ 	 	 
>+ 	 pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule430);
>+ 	 lv_values_3_0=ruleModifierSpecification();
> 
>-									if(current == null) {
>-										current = factory.create(grammarAccess.getModifiersRuleRule().getType().getClassifier());
>-										associateNodeWithAstElement(currentNode.getParent(), current);
>-									}
>-									try {
>-										add(current, "values", lv_values_3_0, "ModifierSpecification", currentNode);
>-									} catch (ValueConverterException vce) {
>-										handleValueConverterException(vce);
>-									}
>-									currentNode = currentNode.getParent();
>+ 	 state._fsp--;
> 
> 
>-								}
>+ 	 	 if (current==null) {
>+ 	 	 current = createModelElementForParent(grammarAccess.getModifiersRuleRule());
>+ 	 	 }
>+ 	 		add(
>+ 	 			current, 
>+ 	 			"values",
>+ 	 		lv_values_3_0, 
>+ 	 		"ModifierSpecification");
>+ 	 	 afterParserOrEnumRuleCall();
>+ 	 	 
> 
>+ 	 }
> 
>-							}
> 
>+ 	 }
> 
>-						}
>-							break;
> 
>-						default:
>-							break loop4;
>-						}
>-					} while(true);
>+ 	 }
>+ 	 break;
> 
>-					match(input, 16, FOLLOW_16_in_ruleModifiersRule434);
>+ 	default :
>+ 	 break loop4;
>+ }
>+ } while (true);
> 
>-					createLeafNode(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3(), null);
>+ otherlv_4=(Token)match(input,16,FOLLOW_16_in_ruleModifiersRule444); 
> 
>+ 	newLeafNode(otherlv_4, grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3());
>+ 
> 
>-				}
>+ }
> 
> 
>-			}
>+ }
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleModifiersRule"
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ // $ANTLR start "entryRuleModifierSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:293:1: entryRuleModifierSpecification returns [EObject current=null] : iv_ruleModifierSpecification= ruleModifierSpecification EOF ;
>+ public final EObject entryRuleModifierSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>-	// $ANTLR end ruleModifiersRule
>+ EObject iv_ruleModifierSpecification = null;
> 
> 
>-	// $ANTLR start entryRuleModifierSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:361:1: entryRuleModifierSpecification returns [EObject current=null] : iv_ruleModifierSpecification= ruleModifierSpecification EOF ;
>-	public final EObject entryRuleModifierSpecification() throws RecognitionException {
>-		EObject current = null;
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:294:2: (iv_ruleModifierSpecification= ruleModifierSpecification EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:295:2: iv_ruleModifierSpecification= ruleModifierSpecification EOF
>+ {
>+ newCompositeNode(grammarAccess.getModifierSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification480);
>+ iv_ruleModifierSpecification=ruleModifierSpecification();
> 
>-		EObject iv_ruleModifierSpecification = null;
>+ state._fsp--;
> 
>+ current =iv_ruleModifierSpecification; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification490); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:362:2: (iv_ruleModifierSpecification= ruleModifierSpecification EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:363:2: iv_ruleModifierSpecification= ruleModifierSpecification EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getModifierSpecificationRule(), currentNode);
>-				pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification470);
>-				iv_ruleModifierSpecification = ruleModifierSpecification();
>-				_fsp--;
>+ }
> 
>-				current = iv_ruleModifierSpecification;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleModifierSpecification480);
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleModifierSpecification"
> 
>-			}
> 
>-		}
>+ // $ANTLR start "ruleModifierSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:302:1: ruleModifierSpecification returns [EObject current=null] : ( (lv_value_0_0= ruleModifierKind ) ) ;
>+ public final EObject ruleModifierSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ Enumerator lv_value_0_0 = null;
> 
>-	// $ANTLR end entryRuleModifierSpecification
> 
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:305:28: ( ( (lv_value_0_0= ruleModifierKind ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:306:1: ( (lv_value_0_0= ruleModifierKind ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:306:1: ( (lv_value_0_0= ruleModifierKind ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:307:1: (lv_value_0_0= ruleModifierKind )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:307:1: (lv_value_0_0= ruleModifierKind )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:308:3: lv_value_0_0= ruleModifierKind
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleModifierKind_in_ruleModifierSpecification535);
>+ lv_value_0_0=ruleModifierKind();
> 
>-	// $ANTLR start ruleModifierSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:370:1: ruleModifierSpecification returns [EObject current=null] : ( (lv_value_0_0= ruleModifierKind ) ) ;
>-	public final EObject ruleModifierSpecification() throws RecognitionException {
>-		EObject current = null;
>+ state._fsp--;
> 
>-		Enumerator lv_value_0_0 = null;
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getModifierSpecificationRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"ModifierKind");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:375:6: ( ( (lv_value_0_0= ruleModifierKind ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:376:1: ( (lv_value_0_0= ruleModifierKind ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:376:1: ( (lv_value_0_0= ruleModifierKind ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:377:1: (lv_value_0_0= ruleModifierKind )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:377:1: (lv_value_0_0= ruleModifierKind )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:378:3: lv_value_0_0= ruleModifierKind
>-					{
> 
>-						currentNode = createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0(), currentNode);
>+ }
> 
>-						pushFollow(FOLLOW_ruleModifierKind_in_ruleModifierSpecification525);
>-						lv_value_0_0 = ruleModifierKind();
>-						_fsp--;
> 
>+ }
> 
>-						if(current == null) {
>-							current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
>-							associateNodeWithAstElement(currentNode.getParent(), current);
>-						}
>-						try {
>-							set(current, "value", lv_value_0_0, "ModifierKind", currentNode);
>-						} catch (ValueConverterException vce) {
>-							handleValueConverterException(vce);
>-						}
>-						currentNode = currentNode.getParent();
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleModifierSpecification"
> 
> 
>-					}
>+ // $ANTLR start "entryRuleEffectRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:332:1: entryRuleEffectRule returns [EObject current=null] : iv_ruleEffectRule= ruleEffectRule EOF ;
>+ public final EObject entryRuleEffectRule() throws RecognitionException {
>+ EObject current = null;
> 
>+ EObject iv_ruleEffectRule = null;
> 
>-				}
> 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:333:2: (iv_ruleEffectRule= ruleEffectRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:334:2: iv_ruleEffectRule= ruleEffectRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getEffectRuleRule()); 
>+ pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule570);
>+ iv_ruleEffectRule=ruleEffectRule();
> 
>-			}
>+ state._fsp--;
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ current =iv_ruleEffectRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleEffectRule580); 
> 
>-		}
>+ }
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleEffectRule"
> 
>-	// $ANTLR end ruleModifierSpecification
> 
>+ // $ANTLR start "ruleEffectRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:341:1: ruleEffectRule returns [EObject current=null] : (otherlv_0= '{' otherlv_1= 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) otherlv_3= '}' ) ;
>+ public final EObject ruleEffectRule() throws RecognitionException {
>+ EObject current = null;
> 
>-	// $ANTLR start entryRuleEffectRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:408:1: entryRuleEffectRule returns [EObject current=null] : iv_ruleEffectRule= ruleEffectRule EOF ;
>-	public final EObject entryRuleEffectRule() throws RecognitionException {
>-		EObject current = null;
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+ Token otherlv_3=null;
>+ Enumerator lv_effectKind_2_0 = null;
> 
>-		EObject iv_ruleEffectRule = null;
> 
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:344:28: ( (otherlv_0= '{' otherlv_1= 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) otherlv_3= '}' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:345:1: (otherlv_0= '{' otherlv_1= 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) otherlv_3= '}' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:345:1: (otherlv_0= '{' otherlv_1= 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) otherlv_3= '}' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:345:3: otherlv_0= '{' otherlv_1= 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) otherlv_3= '}'
>+ {
>+ otherlv_0=(Token)match(input,14,FOLLOW_14_in_ruleEffectRule617); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:409:2: (iv_ruleEffectRule= ruleEffectRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:410:2: iv_ruleEffectRule= ruleEffectRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getEffectRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleEffectRule_in_entryRuleEffectRule560);
>-				iv_ruleEffectRule = ruleEffectRule();
>-				_fsp--;
>+ 	newLeafNode(otherlv_0, grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0());
>+ 
>+ otherlv_1=(Token)match(input,17,FOLLOW_17_in_ruleEffectRule629); 
> 
>-				current = iv_ruleEffectRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleEffectRule570);
>+ 	newLeafNode(otherlv_1, grammarAccess.getEffectRuleAccess().getEffectKeyword_1());
>+ 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:353:1: ( (lv_effectKind_2_0= ruleEffectKind ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:354:1: (lv_effectKind_2_0= ruleEffectKind )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:354:1: (lv_effectKind_2_0= ruleEffectKind )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:355:3: lv_effectKind_2_0= ruleEffectKind
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleEffectKind_in_ruleEffectRule650);
>+ lv_effectKind_2_0=ruleEffectKind();
> 
>-			}
>+ state._fsp--;
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getEffectRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"effectKind",
>+ 		lv_effectKind_2_0, 
>+ 		"EffectKind");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-	// $ANTLR end entryRuleEffectRule
>+ }
> 
> 
>-	// $ANTLR start ruleEffectRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:417:1: ruleEffectRule returns [EObject current=null] : ( '{' 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) '}' ) ;
>-	public final EObject ruleEffectRule() throws RecognitionException {
>-		EObject current = null;
>+ }
> 
>-		Enumerator lv_effectKind_2_0 = null;
>+ otherlv_3=(Token)match(input,16,FOLLOW_16_in_ruleEffectRule662); 
> 
>+ 	newLeafNode(otherlv_3, grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3());
>+ 
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:422:6: ( ( '{' 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) '}' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:423:1: ( '{' 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) '}' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:423:1: ( '{' 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) '}' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:423:3: '{' 'effect: ' ( (lv_effectKind_2_0= ruleEffectKind ) ) '}'
>-				{
>-					match(input, 14, FOLLOW_14_in_ruleEffectRule605);
> 
>-					createLeafNode(grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0(), null);
>+ }
> 
>-					match(input, 17, FOLLOW_17_in_ruleEffectRule615);
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleEffectRule"
> 
>-					createLeafNode(grammarAccess.getEffectRuleAccess().getEffectKeyword_1(), null);
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:431:1: ( (lv_effectKind_2_0= ruleEffectKind ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:432:1: (lv_effectKind_2_0= ruleEffectKind )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:432:1: (lv_effectKind_2_0= ruleEffectKind )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:433:3: lv_effectKind_2_0= ruleEffectKind
>-						{
>+ // $ANTLR start "entryRuleQualifiedName"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:383:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>+ public final EObject entryRuleQualifiedName() throws RecognitionException {
>+ EObject current = null;
> 
>-							currentNode = createCompositeNode(grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0(), currentNode);
>+ EObject iv_ruleQualifiedName = null;
> 
>-							pushFollow(FOLLOW_ruleEffectKind_in_ruleEffectRule636);
>-							lv_effectKind_2_0 = ruleEffectKind();
>-							_fsp--;
> 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:384:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:385:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>+ {
>+ newCompositeNode(grammarAccess.getQualifiedNameRule()); 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName698);
>+ iv_ruleQualifiedName=ruleQualifiedName();
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getEffectRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "effectKind", lv_effectKind_2_0, "EffectKind", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ state._fsp--;
> 
>+ current =iv_ruleQualifiedName; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName708); 
> 
>-						}
>+ }
> 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleQualifiedName"
> 
>-					}
> 
>-					match(input, 16, FOLLOW_16_in_ruleEffectRule646);
>+ // $ANTLR start "ruleQualifiedName"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:392: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;
> 
>-					createLeafNode(grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3(), null);
>+ Token otherlv_0=null;
>+ Token otherlv_1=null;
>+ EObject lv_remaining_2_0 = null;
> 
> 
>-				}
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:395:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:396:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:396:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:396:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:396:2: ( (otherlv_0= RULE_ID ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:397:1: (otherlv_0= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:397:1: (otherlv_0= RULE_ID )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:398:3: otherlv_0= RULE_ID
>+ {
> 
>+ 			if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getQualifiedNameRule());
>+ 	 }
>+ 
>+ otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName753); 
> 
>-			}
>+ 		newLeafNode(otherlv_0, grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
>+ 	
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ }
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end ruleEffectRule
>+ otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleQualifiedName765); 
> 
>+ 	newLeafNode(otherlv_1, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1());
>+ 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:413:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>+ int alt5=2;
>+ int LA5_0 = input.LA(1);
> 
>-	// $ANTLR start entryRuleQualifiedName
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:467:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
>-	public final EObject entryRuleQualifiedName() throws RecognitionException {
>-		EObject current = null;
>+ if ( (LA5_0==RULE_ID) ) {
>+ int LA5_1 = input.LA(2);
> 
>-		EObject iv_ruleQualifiedName = null;
>+ if ( (LA5_1==18) ) {
>+ alt5=1;
>+ }
>+ }
>+ switch (alt5) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:414:1: (lv_remaining_2_0= ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:414:1: (lv_remaining_2_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:415:3: lv_remaining_2_0= ruleQualifiedName
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName786);
>+ lv_remaining_2_0=ruleQualifiedName();
> 
>+ state._fsp--;
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:468:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:469:2: iv_ruleQualifiedName= ruleQualifiedName EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode);
>-				pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName682);
>-				iv_ruleQualifiedName = ruleQualifiedName();
>-				_fsp--;
> 
>-				current = iv_ruleQualifiedName;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleQualifiedName692);
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getQualifiedNameRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"remaining",
>+ 		lv_remaining_2_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-			}
>+ }
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
>+ break;
> 
>-	// $ANTLR end entryRuleQualifiedName
>+ }
> 
> 
>-	// $ANTLR start ruleQualifiedName
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:476:1: ruleQualifiedName returns [EObject current=null] : ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ;
>-	public final EObject ruleQualifiedName() throws RecognitionException {
>-		EObject current = null;
>+ }
> 
>-		EObject lv_remaining_2_0 = null;
> 
>+ }
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleQualifiedName"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:481:6: ( ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:482:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:482:1: ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:482:2: ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )?
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:482:2: ( ( RULE_ID ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:483:1: ( RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:483:1: ( RULE_ID )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:484:3: RULE_ID
>-						{
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>+ // $ANTLR start "entryRuleTypeRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:439:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
>+ public final EObject entryRuleTypeRule() throws RecognitionException {
>+ EObject current = null;
> 
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleQualifiedName735);
>+ EObject iv_ruleTypeRule = null;
> 
>-							createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path");
> 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:440:2: (iv_ruleTypeRule= ruleTypeRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:441:2: iv_ruleTypeRule= ruleTypeRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getTypeRuleRule()); 
>+ pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule823);
>+ iv_ruleTypeRule=ruleTypeRule();
> 
>-						}
>+ state._fsp--;
> 
>+ current =iv_ruleTypeRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule833); 
> 
>-					}
>+ }
> 
>-					match(input, 18, FOLLOW_18_in_ruleQualifiedName745);
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleTypeRule"
> 
>-					createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null);
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:500:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
>-					int alt5 = 2;
>-					int LA5_0 = input.LA(1);
>+ // $ANTLR start "ruleTypeRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:448:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) ;
>+ public final EObject ruleTypeRule() throws RecognitionException {
>+ EObject current = null;
> 
>-					if((LA5_0 == RULE_ID)) {
>-						int LA5_1 = input.LA(2);
>+ Token otherlv_1=null;
>+ EObject lv_path_0_0 = null;
> 
>-						if((LA5_1 == 18)) {
>-							alt5 = 1;
>-						}
>-					}
>-					switch(alt5) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:501:1: (lv_remaining_2_0= ruleQualifiedName )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:501:1: (lv_remaining_2_0= ruleQualifiedName )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:502:3: lv_remaining_2_0= ruleQualifiedName
>-						{
> 
>-							currentNode = createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode);
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:451:28: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:452:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:452:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:452:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( (otherlv_1= RULE_ID ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:452:2: ( (lv_path_0_0= ruleQualifiedName ) )?
>+ int alt6=2;
>+ int LA6_0 = input.LA(1);
> 
>-							pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName766);
>-							lv_remaining_2_0 = ruleQualifiedName();
>-							_fsp--;
>+ if ( (LA6_0==RULE_ID) ) {
>+ int LA6_1 = input.LA(2);
> 
>+ if ( (LA6_1==18) ) {
>+ alt6=1;
>+ }
>+ }
>+ switch (alt6) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:453:1: (lv_path_0_0= ruleQualifiedName )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:453:1: (lv_path_0_0= ruleQualifiedName )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:454:3: lv_path_0_0= ruleQualifiedName
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule879);
>+ lv_path_0_0=ruleQualifiedName();
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getQualifiedNameRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "remaining", lv_remaining_2_0, "QualifiedName", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
>+ state._fsp--;
> 
> 
>-						}
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getTypeRuleRule());
>+ 	 }
>+ 		set(
>+ 			current, 
>+ 			"path",
>+ 		lv_path_0_0, 
>+ 		"QualifiedName");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>+ }
> 
>-					}
>-						break;
> 
>-					}
>+ }
>+ break;
> 
>+ }
> 
>-				}
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:470:3: ( (otherlv_1= RULE_ID ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:471:1: (otherlv_1= RULE_ID )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:471:1: (otherlv_1= RULE_ID )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:472:3: otherlv_1= RULE_ID
>+ {
> 
>+ 			if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getTypeRuleRule());
>+ 	 }
>+ 
>+ otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRule900); 
> 
>-			}
>+ 		newLeafNode(otherlv_1, grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0()); 
>+ 	
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ }
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end ruleQualifiedName
> 
>+ }
> 
>-	// $ANTLR start entryRuleTypeRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:532:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
>-	public final EObject entryRuleTypeRule() throws RecognitionException {
>-		EObject current = null;
> 
>-		EObject iv_ruleTypeRule = null;
>+ }
> 
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleTypeRule"
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:533:2: (iv_ruleTypeRule= ruleTypeRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:534:2: iv_ruleTypeRule= ruleTypeRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule803);
>-				iv_ruleTypeRule = ruleTypeRule();
>-				_fsp--;
> 
>-				current = iv_ruleTypeRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleTypeRule813);
>+ // $ANTLR start "entryRuleMultiplicityRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:491:1: entryRuleMultiplicityRule returns [EObject current=null] : iv_ruleMultiplicityRule= ruleMultiplicityRule EOF ;
>+ public final EObject entryRuleMultiplicityRule() throws RecognitionException {
>+ EObject current = null;
> 
>-			}
>+ EObject iv_ruleMultiplicityRule = null;
> 
>-		}
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:492:2: (iv_ruleMultiplicityRule= ruleMultiplicityRule EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:493:2: iv_ruleMultiplicityRule= ruleMultiplicityRule EOF
>+ {
>+ newCompositeNode(grammarAccess.getMultiplicityRuleRule()); 
>+ pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule936);
>+ iv_ruleMultiplicityRule=ruleMultiplicityRule();
> 
>-	// $ANTLR end entryRuleTypeRule
>+ state._fsp--;
> 
>+ current =iv_ruleMultiplicityRule; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule946); 
> 
>-	// $ANTLR start ruleTypeRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:541:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) ;
>-	public final EObject ruleTypeRule() throws RecognitionException {
>-		EObject current = null;
>+ }
> 
>-		EObject lv_path_0_0 = null;
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleMultiplicityRule"
> 
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ // $ANTLR start "ruleMultiplicityRule"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:500:1: ruleMultiplicityRule returns [EObject current=null] : (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' ) ;
>+ public final EObject ruleMultiplicityRule() throws RecognitionException {
>+ EObject current = null;
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:546:6: ( ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:547:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:547:1: ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:547:2: ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:547:2: ( (lv_path_0_0= ruleQualifiedName ) )?
>-					int alt6 = 2;
>-					int LA6_0 = input.LA(1);
>+ Token otherlv_0=null;
>+ Token otherlv_2=null;
>+ Token otherlv_4=null;
>+ EObject lv_bounds_1_0 = null;
> 
>-					if((LA6_0 == RULE_ID)) {
>-						int LA6_1 = input.LA(2);
>+ EObject lv_bounds_3_0 = null;
> 
>-						if((LA6_1 == 18)) {
>-							alt6 = 1;
>-						}
>-					}
>-					switch(alt6) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:548:1: (lv_path_0_0= ruleQualifiedName )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:548:1: (lv_path_0_0= ruleQualifiedName )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:549:3: lv_path_0_0= ruleQualifiedName
>-						{
> 
>-							currentNode = createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode);
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:503:28: ( (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:504:1: (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:504:1: (otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:504:3: otherlv_0= '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? otherlv_4= ']'
>+ {
>+ otherlv_0=(Token)match(input,19,FOLLOW_19_in_ruleMultiplicityRule983); 
> 
>-							pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule859);
>-							lv_path_0_0 = ruleQualifiedName();
>-							_fsp--;
>+ 	newLeafNode(otherlv_0, grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0());
>+ 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:508:1: ( (lv_bounds_1_0= ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:509:1: (lv_bounds_1_0= ruleBoundSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:509:1: (lv_bounds_1_0= ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:510:3: lv_bounds_1_0= ruleBoundSpecification
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule1004);
>+ lv_bounds_1_0=ruleBoundSpecification();
> 
>+ state._fsp--;
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								set(current, "path", lv_path_0_0, "QualifiedName", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
>+ 	 }
>+ 		add(
>+ 			current, 
>+ 			"bounds",
>+ 		lv_bounds_1_0, 
>+ 		"BoundSpecification");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-						}
>+ }
> 
> 
>-					}
>-						break;
>+ }
> 
>-					}
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:526:2: (otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )?
>+ int alt7=2;
>+ int LA7_0 = input.LA(1);
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:571:3: ( ( RULE_ID ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:572:1: ( RULE_ID )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:572:1: ( RULE_ID )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:573:3: RULE_ID
>-						{
>+ if ( (LA7_0==20) ) {
>+ alt7=1;
>+ }
>+ switch (alt7) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:526:4: otherlv_2= '..' ( (lv_bounds_3_0= ruleBoundSpecification ) )
>+ {
>+ otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleMultiplicityRule1017); 
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getTypeRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode, current);
>-							}
>+ 	newLeafNode(otherlv_2, grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0());
>+ 
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:530:1: ( (lv_bounds_3_0= ruleBoundSpecification ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:531:1: (lv_bounds_3_0= ruleBoundSpecification )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:531:1: (lv_bounds_3_0= ruleBoundSpecification )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:532:3: lv_bounds_3_0= ruleBoundSpecification
>+ {
>+ 
>+ 	 newCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
>+ 	 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule1038);
>+ lv_bounds_3_0=ruleBoundSpecification();
> 
>-							match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleTypeRule878);
>+ state._fsp--;
> 
>-							createLeafNode(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0(), "type");
> 
>+ 	 if (current==null) {
>+ 	 current = createModelElementForParent(grammarAccess.getMultiplicityRuleRule());
>+ 	 }
>+ 		add(
>+ 			current, 
>+ 			"bounds",
>+ 		lv_bounds_3_0, 
>+ 		"BoundSpecification");
>+ 	 afterParserOrEnumRuleCall();
>+ 	 
> 
>-						}
>+ }
> 
> 
>-					}
>+ }
> 
> 
>-				}
>+ }
>+ break;
> 
>+ }
> 
>-			}
>+ otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleMultiplicityRule1052); 
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ 	newLeafNode(otherlv_4, grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3());
>+ 
> 
>-		}
>+ }
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
> 
>-	// $ANTLR end ruleTypeRule
>+ }
> 
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleMultiplicityRule"
> 
>-	// $ANTLR start entryRuleMultiplicityRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:593:1: entryRuleMultiplicityRule returns [EObject current=null] : iv_ruleMultiplicityRule= ruleMultiplicityRule EOF ;
>-	public final EObject entryRuleMultiplicityRule() throws RecognitionException {
>-		EObject current = null;
> 
>-		EObject iv_ruleMultiplicityRule = null;
>+ // $ANTLR start "entryRuleBoundSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:560:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>+ public final EObject entryRuleBoundSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>+ EObject iv_ruleBoundSpecification = null;
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:594:2: (iv_ruleMultiplicityRule= ruleMultiplicityRule EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:595:2: iv_ruleMultiplicityRule= ruleMultiplicityRule EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleRule(), currentNode);
>-				pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule914);
>-				iv_ruleMultiplicityRule = ruleMultiplicityRule();
>-				_fsp--;
> 
>-				current = iv_ruleMultiplicityRule;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleMultiplicityRule924);
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:561:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:562:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>+ {
>+ newCompositeNode(grammarAccess.getBoundSpecificationRule()); 
>+ pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification1088);
>+ iv_ruleBoundSpecification=ruleBoundSpecification();
> 
>-			}
>+ state._fsp--;
> 
>-		}
>+ current =iv_ruleBoundSpecification; 
>+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification1098); 
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ }
> 
>-	// $ANTLR end entryRuleMultiplicityRule
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "entryRuleBoundSpecification"
> 
> 
>-	// $ANTLR start ruleMultiplicityRule
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:602:1: ruleMultiplicityRule returns [EObject current=null] : ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' ) ;
>-	public final EObject ruleMultiplicityRule() throws RecognitionException {
>-		EObject current = null;
>+ // $ANTLR start "ruleBoundSpecification"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:569:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>+ public final EObject ruleBoundSpecification() throws RecognitionException {
>+ EObject current = null;
> 
>-		EObject lv_bounds_1_0 = null;
>+ Token lv_value_0_0=null;
> 
>-		EObject lv_bounds_3_0 = null;
>+ enterRule(); 
>+ 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:572:28: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:573:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:573:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:574:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:574:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:575:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>+ {
>+ lv_value_0_0=(Token)match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification1139); 
> 
>+ 			newLeafNode(lv_value_0_0, grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
>+ 		
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ 	 if (current==null) {
>+ 	 current = createModelElement(grammarAccess.getBoundSpecificationRule());
>+ 	 }
>+ 		setWithLastConsumed(
>+ 			current, 
>+ 			"value",
>+ 		lv_value_0_0, 
>+ 		"UnlimitedLiteral");
>+ 	 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:607:6: ( ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:608:1: ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:608:1: ( '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']' )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:608:3: '[' ( (lv_bounds_1_0= ruleBoundSpecification ) ) ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )? ']'
>-				{
>-					match(input, 19, FOLLOW_19_in_ruleMultiplicityRule959);
>+ }
> 
>-					createLeafNode(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0(), null);
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:612:1: ( (lv_bounds_1_0= ruleBoundSpecification ) )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:613:1: (lv_bounds_1_0= ruleBoundSpecification )
>-					{
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:613:1: (lv_bounds_1_0= ruleBoundSpecification )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:614:3: lv_bounds_1_0= ruleBoundSpecification
>-						{
>+ }
> 
>-							currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(), currentNode);
> 
>-							pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule980);
>-							lv_bounds_1_0 = ruleBoundSpecification();
>-							_fsp--;
>+ }
> 
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleBoundSpecification"
> 
>-							if(current == null) {
>-								current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>-								associateNodeWithAstElement(currentNode.getParent(), current);
>-							}
>-							try {
>-								add(current, "bounds", lv_bounds_1_0, "BoundSpecification", currentNode);
>-							} catch (ValueConverterException vce) {
>-								handleValueConverterException(vce);
>-							}
>-							currentNode = currentNode.getParent();
> 
>+ // $ANTLR start "ruleModifierKind"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:599:1: ruleModifierKind returns [Enumerator current=null] : ( (enumLiteral_0= 'exception' ) | (enumLiteral_1= 'stream' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) ) ;
>+ public final Enumerator ruleModifierKind() throws RecognitionException {
>+ Enumerator current = null;
> 
>-						}
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
> 
>+ enterRule(); 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:601:28: ( ( (enumLiteral_0= 'exception' ) | (enumLiteral_1= 'stream' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:602:1: ( (enumLiteral_0= 'exception' ) | (enumLiteral_1= 'stream' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:602:1: ( (enumLiteral_0= 'exception' ) | (enumLiteral_1= 'stream' ) | (enumLiteral_2= 'ordered' ) | (enumLiteral_3= 'unique' ) )
>+ int alt8=4;
>+ switch ( input.LA(1) ) {
>+ case 22:
>+ {
>+ alt8=1;
>+ }
>+ break;
>+ case 23:
>+ {
>+ alt8=2;
>+ }
>+ break;
>+ case 24:
>+ {
>+ alt8=3;
>+ }
>+ break;
>+ case 25:
>+ {
>+ alt8=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 8, 0, input);
> 
>-					}
>+ throw nvae;
>+ }
> 
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:636:2: ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )?
>-					int alt7 = 2;
>-					int LA7_0 = input.LA(1);
>+ switch (alt8) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:602:2: (enumLiteral_0= 'exception' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:602:2: (enumLiteral_0= 'exception' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:602:4: enumLiteral_0= 'exception'
>+ {
>+ enumLiteral_0=(Token)match(input,22,FOLLOW_22_in_ruleModifierKind1193); 
> 
>-					if((LA7_0 == 20)) {
>-						alt7 = 1;
>-					}
>-					switch(alt7) {
>-					case 1:
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:636:4: '..' ( (lv_bounds_3_0= ruleBoundSpecification ) )
>-					{
>-						match(input, 20, FOLLOW_20_in_ruleMultiplicityRule991);
>+ current = grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_0, grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0()); 
>+ 
> 
>-						createLeafNode(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0(), null);
>+ }
> 
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:640:1: ( (lv_bounds_3_0= ruleBoundSpecification ) )
>-						// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:641:1: (lv_bounds_3_0= ruleBoundSpecification )
>-						{
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:641:1: (lv_bounds_3_0= ruleBoundSpecification )
>-							// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:642:3: lv_bounds_3_0= ruleBoundSpecification
>-							{
> 
>-								currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(), currentNode);
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:608:6: (enumLiteral_1= 'stream' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:608:6: (enumLiteral_1= 'stream' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:608:8: enumLiteral_1= 'stream'
>+ {
>+ enumLiteral_1=(Token)match(input,23,FOLLOW_23_in_ruleModifierKind1210); 
> 
>-								pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule1012);
>-								lv_bounds_3_0 = ruleBoundSpecification();
>-								_fsp--;
>+ current = grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_1, grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1()); 
>+ 
> 
>+ }
> 
>-								if(current == null) {
>-									current = factory.create(grammarAccess.getMultiplicityRuleRule().getType().getClassifier());
>-									associateNodeWithAstElement(currentNode.getParent(), current);
>-								}
>-								try {
>-									add(current, "bounds", lv_bounds_3_0, "BoundSpecification", currentNode);
>-								} catch (ValueConverterException vce) {
>-									handleValueConverterException(vce);
>-								}
>-								currentNode = currentNode.getParent();
> 
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:614:6: (enumLiteral_2= 'ordered' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:614:6: (enumLiteral_2= 'ordered' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:614:8: enumLiteral_2= 'ordered'
>+ {
>+ enumLiteral_2=(Token)match(input,24,FOLLOW_24_in_ruleModifierKind1227); 
> 
>-							}
>+ current = grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_2, grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2()); 
>+ 
> 
>+ }
> 
>-						}
> 
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:620:6: (enumLiteral_3= 'unique' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:620:6: (enumLiteral_3= 'unique' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:620:8: enumLiteral_3= 'unique'
>+ {
>+ enumLiteral_3=(Token)match(input,25,FOLLOW_25_in_ruleModifierKind1244); 
> 
>-					}
>-						break;
>+ current = grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_3, grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3()); 
>+ 
> 
>-					}
>+ }
> 
>-					match(input, 21, FOLLOW_21_in_ruleMultiplicityRule1024);
> 
>-					createLeafNode(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3(), null);
>+ }
>+ break;
> 
>+ }
> 
>-				}
> 
>+ }
> 
>-			}
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleModifierKind"
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
> 
>-		}
>+ // $ANTLR start "ruleEffectKind"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:630:1: ruleEffectKind returns [Enumerator current=null] : ( (enumLiteral_0= 'create' ) | (enumLiteral_1= 'read' ) | (enumLiteral_2= 'update' ) | (enumLiteral_3= 'delete' ) ) ;
>+ public final Enumerator ruleEffectKind() throws RecognitionException {
>+ Enumerator current = null;
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
> 
>-	// $ANTLR end ruleMultiplicityRule
>+ enterRule(); 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:632:28: ( ( (enumLiteral_0= 'create' ) | (enumLiteral_1= 'read' ) | (enumLiteral_2= 'update' ) | (enumLiteral_3= 'delete' ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:633:1: ( (enumLiteral_0= 'create' ) | (enumLiteral_1= 'read' ) | (enumLiteral_2= 'update' ) | (enumLiteral_3= 'delete' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:633:1: ( (enumLiteral_0= 'create' ) | (enumLiteral_1= 'read' ) | (enumLiteral_2= 'update' ) | (enumLiteral_3= 'delete' ) )
>+ int alt9=4;
>+ switch ( input.LA(1) ) {
>+ case 26:
>+ {
>+ alt9=1;
>+ }
>+ break;
>+ case 27:
>+ {
>+ alt9=2;
>+ }
>+ break;
>+ case 28:
>+ {
>+ alt9=3;
>+ }
>+ break;
>+ case 29:
>+ {
>+ alt9=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 9, 0, input);
> 
>+ throw nvae;
>+ }
> 
>-	// $ANTLR start entryRuleBoundSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:676:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
>-	public final EObject entryRuleBoundSpecification() throws RecognitionException {
>-		EObject current = null;
>+ switch (alt9) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:633:2: (enumLiteral_0= 'create' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:633:2: (enumLiteral_0= 'create' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:633:4: enumLiteral_0= 'create'
>+ {
>+ enumLiteral_0=(Token)match(input,26,FOLLOW_26_in_ruleEffectKind1289); 
> 
>-		EObject iv_ruleBoundSpecification = null;
>+ current = grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_0, grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0()); 
>+ 
> 
>+ }
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:677:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:678:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
>-			{
>-				currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode);
>-				pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification1060);
>-				iv_ruleBoundSpecification = ruleBoundSpecification();
>-				_fsp--;
> 
>-				current = iv_ruleBoundSpecification;
>-				match(input, EOF, FOLLOW_EOF_in_entryRuleBoundSpecification1070);
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:639:6: (enumLiteral_1= 'read' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:639:6: (enumLiteral_1= 'read' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:639:8: enumLiteral_1= 'read'
>+ {
>+ enumLiteral_1=(Token)match(input,27,FOLLOW_27_in_ruleEffectKind1306); 
> 
>-			}
>+ current = grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_1, grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1()); 
>+ 
> 
>-		}
>+ }
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
> 
>-	// $ANTLR end entryRuleBoundSpecification
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:645:6: (enumLiteral_2= 'update' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:645:6: (enumLiteral_2= 'update' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:645:8: enumLiteral_2= 'update'
>+ {
>+ enumLiteral_2=(Token)match(input,28,FOLLOW_28_in_ruleEffectKind1323); 
> 
>+ current = grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_2, grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2()); 
>+ 
> 
>-	// $ANTLR start ruleBoundSpecification
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:685:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
>-	public final EObject ruleBoundSpecification() throws RecognitionException {
>-		EObject current = null;
>+ }
> 
>-		Token lv_value_0_0 = null;
> 
>-		EObject temp = null;
>-		setCurrentLookahead();
>-		resetLookahead();
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:651:6: (enumLiteral_3= 'delete' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:651:6: (enumLiteral_3= 'delete' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:651:8: enumLiteral_3= 'delete'
>+ {
>+ enumLiteral_3=(Token)match(input,29,FOLLOW_29_in_ruleEffectKind1340); 
> 
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:690:6: ( ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:691:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:691:1: ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) )
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:692:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:692:1: (lv_value_0_0= RULE_UNLIMITEDLITERAL )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:693:3: lv_value_0_0= RULE_UNLIMITEDLITERAL
>-					{
>-						lv_value_0_0 = (Token)input.LT(1);
>-						match(input, RULE_UNLIMITEDLITERAL, FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification1111);
>+ current = grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_3, grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3()); 
>+ 
> 
>-						createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value");
>+ }
> 
> 
>-						if(current == null) {
>-							current = factory.create(grammarAccess.getBoundSpecificationRule().getType().getClassifier());
>-							associateNodeWithAstElement(currentNode, current);
>-						}
>-						try {
>-							set(current, "value", lv_value_0_0, "UnlimitedLiteral", lastConsumedNode);
>-						} catch (ValueConverterException vce) {
>-							handleValueConverterException(vce);
>-						}
>+ }
>+ break;
> 
>+ }
> 
>-					}
> 
>+ }
> 
>-				}
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleEffectKind"
> 
> 
>-			}
>+ // $ANTLR start "ruleVisibilityKind"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:661:1: ruleVisibilityKind returns [Enumerator current=null] : ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) ) ;
>+ public final Enumerator ruleVisibilityKind() throws RecognitionException {
>+ Enumerator current = null;
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
> 
>-		}
>+ enterRule(); 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:663:28: ( ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:664:1: ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:664:1: ( (enumLiteral_0= '+' ) | (enumLiteral_1= '-' ) | (enumLiteral_2= '#' ) | (enumLiteral_3= '~' ) )
>+ int alt10=4;
>+ switch ( input.LA(1) ) {
>+ case 30:
>+ {
>+ alt10=1;
>+ }
>+ break;
>+ case 31:
>+ {
>+ alt10=2;
>+ }
>+ break;
>+ case 32:
>+ {
>+ alt10=3;
>+ }
>+ break;
>+ case 33:
>+ {
>+ alt10=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 10, 0, input);
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ throw nvae;
>+ }
> 
>-	// $ANTLR end ruleBoundSpecification
>+ switch (alt10) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:664:2: (enumLiteral_0= '+' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:664:2: (enumLiteral_0= '+' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:664:4: enumLiteral_0= '+'
>+ {
>+ enumLiteral_0=(Token)match(input,30,FOLLOW_30_in_ruleVisibilityKind1385); 
> 
>+ current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_0, grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
>+ 
> 
>-	// $ANTLR start ruleModifierKind
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:723:1: ruleModifierKind returns [Enumerator current=null] : ( ( 'exception' ) | ( 'stream' ) | ( 'ordered' ) | ( 'unique' ) ) ;
>-	public final Enumerator ruleModifierKind() throws RecognitionException {
>-		Enumerator current = null;
>+ }
> 
>-		setCurrentLookahead();
>-		resetLookahead();
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:727:6: ( ( ( 'exception' ) | ( 'stream' ) | ( 'ordered' ) | ( 'unique' ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:1: ( ( 'exception' ) | ( 'stream' ) | ( 'ordered' ) | ( 'unique' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:1: ( ( 'exception' ) | ( 'stream' ) | ( 'ordered' ) | ( 'unique' ) )
>-				int alt8 = 4;
>-				switch(input.LA(1)) {
>-				case 22:
>-				{
>-					alt8 = 1;
>-				}
>-					break;
>-				case 23:
>-				{
>-					alt8 = 2;
>-				}
>-					break;
>-				case 24:
>-				{
>-					alt8 = 3;
>-				}
>-					break;
>-				case 25:
>-				{
>-					alt8 = 4;
>-				}
>-					break;
>-				default:
>-					NoViableAltException nvae = new NoViableAltException("728:1: ( ( 'exception' ) | ( 'stream' ) | ( 'ordered' ) | ( 'unique' ) )", 8, 0, input);
> 
>-					throw nvae;
>-				}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:670:6: (enumLiteral_1= '-' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:670:6: (enumLiteral_1= '-' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:670:8: enumLiteral_1= '-'
>+ {
>+ enumLiteral_1=(Token)match(input,31,FOLLOW_31_in_ruleVisibilityKind1402); 
> 
>-				switch(alt8) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:2: ( 'exception' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:2: ( 'exception' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:728:4: 'exception'
>-					{
>-						match(input, 22, FOLLOW_22_in_ruleModifierKind1163);
>+ current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_1, grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
>+ 
> 
>-						current = grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getModifierKindAccess().getEXCEPTIONEnumLiteralDeclaration_0(), null);
>+ }
> 
> 
>-					}
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:676:6: (enumLiteral_2= '#' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:676:6: (enumLiteral_2= '#' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:676:8: enumLiteral_2= '#'
>+ {
>+ enumLiteral_2=(Token)match(input,32,FOLLOW_32_in_ruleVisibilityKind1419); 
> 
>+ current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_2, grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
>+ 
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:734:6: ( 'stream' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:734:6: ( 'stream' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:734:8: 'stream'
>-					{
>-						match(input, 23, FOLLOW_23_in_ruleModifierKind1178);
>+ }
> 
>-						current = grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getModifierKindAccess().getSTREAMEnumLiteralDeclaration_1(), null);
> 
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:682:6: (enumLiteral_3= '~' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:682:6: (enumLiteral_3= '~' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:682:8: enumLiteral_3= '~'
>+ {
>+ enumLiteral_3=(Token)match(input,33,FOLLOW_33_in_ruleVisibilityKind1436); 
> 
>-					}
>+ current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_3, grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
>+ 
> 
>+ }
> 
>-				}
>-					break;
>-				case 3:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:740:6: ( 'ordered' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:740:6: ( 'ordered' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:740:8: 'ordered'
>-					{
>-						match(input, 24, FOLLOW_24_in_ruleModifierKind1193);
> 
>-						current = grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getModifierKindAccess().getORDEREDEnumLiteralDeclaration_2(), null);
>+ }
>+ break;
> 
>+ }
> 
>-					}
> 
>+ }
> 
>-				}
>-					break;
>-				case 4:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:746:6: ( 'unique' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:746:6: ( 'unique' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:746:8: 'unique'
>-					{
>-						match(input, 25, FOLLOW_25_in_ruleModifierKind1208);
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleVisibilityKind"
> 
>-						current = grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getModifierKindAccess().getUNIQUEEnumLiteralDeclaration_3(), null);
> 
>+ // $ANTLR start "ruleDirection"
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:692:1: ruleDirection returns [Enumerator current=null] : ( (enumLiteral_0= 'in' ) | (enumLiteral_1= 'out' ) | (enumLiteral_2= 'inout' ) | (enumLiteral_3= 'return' ) ) ;
>+ public final Enumerator ruleDirection() throws RecognitionException {
>+ Enumerator current = null;
> 
>-					}
>+ Token enumLiteral_0=null;
>+ Token enumLiteral_1=null;
>+ Token enumLiteral_2=null;
>+ Token enumLiteral_3=null;
> 
>+ enterRule(); 
>+ try {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:694:28: ( ( (enumLiteral_0= 'in' ) | (enumLiteral_1= 'out' ) | (enumLiteral_2= 'inout' ) | (enumLiteral_3= 'return' ) ) )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:695:1: ( (enumLiteral_0= 'in' ) | (enumLiteral_1= 'out' ) | (enumLiteral_2= 'inout' ) | (enumLiteral_3= 'return' ) )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:695:1: ( (enumLiteral_0= 'in' ) | (enumLiteral_1= 'out' ) | (enumLiteral_2= 'inout' ) | (enumLiteral_3= 'return' ) )
>+ int alt11=4;
>+ switch ( input.LA(1) ) {
>+ case 34:
>+ {
>+ alt11=1;
>+ }
>+ break;
>+ case 35:
>+ {
>+ alt11=2;
>+ }
>+ break;
>+ case 36:
>+ {
>+ alt11=3;
>+ }
>+ break;
>+ case 37:
>+ {
>+ alt11=4;
>+ }
>+ break;
>+ default:
>+ NoViableAltException nvae =
>+ new NoViableAltException("", 11, 0, input);
> 
>-				}
>-					break;
>+ throw nvae;
>+ }
> 
>-				}
>+ switch (alt11) {
>+ case 1 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:695:2: (enumLiteral_0= 'in' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:695:2: (enumLiteral_0= 'in' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:695:4: enumLiteral_0= 'in'
>+ {
>+ enumLiteral_0=(Token)match(input,34,FOLLOW_34_in_ruleDirection1481); 
> 
>+ current = grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_0, grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); 
>+ 
> 
>-			}
>+ }
> 
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
> 
>-		}
>+ }
>+ break;
>+ case 2 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:701:6: (enumLiteral_1= 'out' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:701:6: (enumLiteral_1= 'out' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:701:8: enumLiteral_1= 'out'
>+ {
>+ enumLiteral_1=(Token)match(input,35,FOLLOW_35_in_ruleDirection1498); 
> 
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>+ current = grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_1, grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); 
>+ 
> 
>-	// $ANTLR end ruleModifierKind
>+ }
> 
> 
>-	// $ANTLR start ruleEffectKind
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:756:1: ruleEffectKind returns [Enumerator current=null] : ( ( 'create' ) | ( 'read' ) | ( 'update' ) | ( 'delete' ) ) ;
>-	public final Enumerator ruleEffectKind() throws RecognitionException {
>-		Enumerator current = null;
>+ }
>+ break;
>+ case 3 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:707:6: (enumLiteral_2= 'inout' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:707:6: (enumLiteral_2= 'inout' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:707:8: enumLiteral_2= 'inout'
>+ {
>+ enumLiteral_2=(Token)match(input,36,FOLLOW_36_in_ruleDirection1515); 
> 
>-		setCurrentLookahead();
>-		resetLookahead();
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:760:6: ( ( ( 'create' ) | ( 'read' ) | ( 'update' ) | ( 'delete' ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:761:1: ( ( 'create' ) | ( 'read' ) | ( 'update' ) | ( 'delete' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:761:1: ( ( 'create' ) | ( 'read' ) | ( 'update' ) | ( 'delete' ) )
>-				int alt9 = 4;
>-				switch(input.LA(1)) {
>-				case 26:
>-				{
>-					alt9 = 1;
>-				}
>-					break;
>-				case 27:
>-				{
>-					alt9 = 2;
>-				}
>-					break;
>-				case 28:
>-				{
>-					alt9 = 3;
>-				}
>-					break;
>-				case 29:
>-				{
>-					alt9 = 4;
>-				}
>-					break;
>-				default:
>-					NoViableAltException nvae = new NoViableAltException("761:1: ( ( 'create' ) | ( 'read' ) | ( 'update' ) | ( 'delete' ) )", 9, 0, input);
>+ current = grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_2, grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2()); 
>+ 
> 
>-					throw nvae;
>-				}
>+ }
> 
>-				switch(alt9) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:761:2: ( 'create' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:761:2: ( 'create' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:761:4: 'create'
>-					{
>-						match(input, 26, FOLLOW_26_in_ruleEffectKind1251);
> 
>-						current = grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getEffectKindAccess().getCREATEEnumLiteralDeclaration_0(), null);
>+ }
>+ break;
>+ case 4 :
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:713:6: (enumLiteral_3= 'return' )
>+ {
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:713:6: (enumLiteral_3= 'return' )
>+ // ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:713:8: enumLiteral_3= 'return'
>+ {
>+ enumLiteral_3=(Token)match(input,37,FOLLOW_37_in_ruleDirection1532); 
> 
>+ current = grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>+ newLeafNode(enumLiteral_3, grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3()); 
>+ 
> 
>-					}
>+ }
> 
> 
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:767:6: ( 'read' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:767:6: ( 'read' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:767:8: 'read'
>-					{
>-						match(input, 27, FOLLOW_27_in_ruleEffectKind1266);
>+ }
>+ break;
> 
>-						current = grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getEffectKindAccess().getREADEnumLiteralDeclaration_1(), null);
>+ }
> 
> 
>-					}
>+ }
> 
>+ leaveRule(); 
>+ }
>+ 
>+ catch (RecognitionException re) { 
>+ recover(input,re); 
>+ appendSkippedTokens();
>+ } 
>+ finally {
>+ }
>+ return current;
>+ }
>+ // $ANTLR end "ruleDirection"
> 
>-				}
>-					break;
>-				case 3:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:773:6: ( 'update' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:773:6: ( 'update' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:773:8: 'update'
>-					{
>-						match(input, 28, FOLLOW_28_in_ruleEffectKind1281);
>+ // Delegated rules
> 
>-						current = grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getEffectKindAccess().getUPDATEEnumLiteralDeclaration_2(), null);
> 
>+ 
> 
>-					}
>+ public static final BitSet FOLLOW_ruleParameterRule_in_entryRuleParameterRule75 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleParameterRule85 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleVisibilityKind_in_ruleParameterRule131 = new BitSet(new long[]{0x0000003C00000000L});
>+ public static final BitSet FOLLOW_ruleDirection_in_ruleParameterRule152 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleParameterRule169 = new BitSet(new long[]{0x0000000000001000L});
>+ public static final BitSet FOLLOW_12_in_ruleParameterRule186 = new BitSet(new long[]{0x0000000000002010L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_ruleParameterRule208 = new BitSet(new long[]{0x0000000000084000L});
>+ public static final BitSet FOLLOW_13_in_ruleParameterRule226 = new BitSet(new long[]{0x0000000000084000L});
>+ public static final BitSet FOLLOW_ruleMultiplicityRule_in_ruleParameterRule248 = new BitSet(new long[]{0x0000000000084000L});
>+ public static final BitSet FOLLOW_ruleModifiersRule_in_ruleParameterRule270 = new BitSet(new long[]{0x0000000000084000L});
>+ public static final BitSet FOLLOW_ruleEffectRule_in_ruleParameterRule292 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule328 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule338 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_14_in_ruleModifiersRule375 = new BitSet(new long[]{0x0000000003C00000L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule396 = new BitSet(new long[]{0x0000000000018000L});
>+ public static final BitSet FOLLOW_15_in_ruleModifiersRule409 = new BitSet(new long[]{0x0000000003C00000L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule430 = new BitSet(new long[]{0x0000000000018000L});
>+ public static final BitSet FOLLOW_16_in_ruleModifiersRule444 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification480 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification490 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleModifierKind_in_ruleModifierSpecification535 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleEffectRule_in_entryRuleEffectRule570 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleEffectRule580 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_14_in_ruleEffectRule617 = new BitSet(new long[]{0x0000000000020000L});
>+ public static final BitSet FOLLOW_17_in_ruleEffectRule629 = new BitSet(new long[]{0x000000003C000000L});
>+ public static final BitSet FOLLOW_ruleEffectKind_in_ruleEffectRule650 = new BitSet(new long[]{0x0000000000010000L});
>+ public static final BitSet FOLLOW_16_in_ruleEffectRule662 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName698 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName708 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName753 = new BitSet(new long[]{0x0000000000040000L});
>+ public static final BitSet FOLLOW_18_in_ruleQualifiedName765 = new BitSet(new long[]{0x0000000000000012L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName786 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule823 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule833 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule879 = new BitSet(new long[]{0x0000000000000010L});
>+ public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule900 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule936 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule946 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_19_in_ruleMultiplicityRule983 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule1004 = new BitSet(new long[]{0x0000000000300000L});
>+ public static final BitSet FOLLOW_20_in_ruleMultiplicityRule1017 = new BitSet(new long[]{0x0000000000000020L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule1038 = new BitSet(new long[]{0x0000000000200000L});
>+ public static final BitSet FOLLOW_21_in_ruleMultiplicityRule1052 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification1088 = new BitSet(new long[]{0x0000000000000000L});
>+ public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification1098 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification1139 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_22_in_ruleModifierKind1193 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_23_in_ruleModifierKind1210 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_24_in_ruleModifierKind1227 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_25_in_ruleModifierKind1244 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_26_in_ruleEffectKind1289 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_27_in_ruleEffectKind1306 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_28_in_ruleEffectKind1323 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_29_in_ruleEffectKind1340 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_30_in_ruleVisibilityKind1385 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_31_in_ruleVisibilityKind1402 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_32_in_ruleVisibilityKind1419 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_33_in_ruleVisibilityKind1436 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_34_in_ruleDirection1481 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_35_in_ruleDirection1498 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_36_in_ruleDirection1515 = new BitSet(new long[]{0x0000000000000002L});
>+ public static final BitSet FOLLOW_37_in_ruleDirection1532 = new BitSet(new long[]{0x0000000000000002L});
> 
>-
>-				}
>-					break;
>-				case 4:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:779:6: ( 'delete' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:779:6: ( 'delete' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:779:8: 'delete'
>-					{
>-						match(input, 29, FOLLOW_29_in_ruleEffectKind1296);
>-
>-						current = grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getEffectKindAccess().getDELETEEnumLiteralDeclaration_3(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-
>-				}
>-
>-
>-			}
>-
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>-
>-		}
>-
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>-
>-	// $ANTLR end ruleEffectKind
>-
>-
>-	// $ANTLR start ruleVisibilityKind
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:789:1: ruleVisibilityKind returns [Enumerator current=null] : ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) ;
>-	public final Enumerator ruleVisibilityKind() throws RecognitionException {
>-		Enumerator current = null;
>-
>-		setCurrentLookahead();
>-		resetLookahead();
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:793:6: ( ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:794:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:794:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
>-				int alt10 = 4;
>-				switch(input.LA(1)) {
>-				case 30:
>-				{
>-					alt10 = 1;
>-				}
>-					break;
>-				case 31:
>-				{
>-					alt10 = 2;
>-				}
>-					break;
>-				case 32:
>-				{
>-					alt10 = 3;
>-				}
>-					break;
>-				case 33:
>-				{
>-					alt10 = 4;
>-				}
>-					break;
>-				default:
>-					NoViableAltException nvae = new NoViableAltException("794:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )", 10, 0, input);
>-
>-					throw nvae;
>-				}
>-
>-				switch(alt10) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:794:2: ( '+' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:794:2: ( '+' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:794:4: '+'
>-					{
>-						match(input, 30, FOLLOW_30_in_ruleVisibilityKind1339);
>-
>-						current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:800:6: ( '-' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:800:6: ( '-' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:800:8: '-'
>-					{
>-						match(input, 31, FOLLOW_31_in_ruleVisibilityKind1354);
>-
>-						current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-				case 3:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:806:6: ( '#' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:806:6: ( '#' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:806:8: '#'
>-					{
>-						match(input, 32, FOLLOW_32_in_ruleVisibilityKind1369);
>-
>-						current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-				case 4:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:812:6: ( '~' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:812:6: ( '~' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:812:8: '~'
>-					{
>-						match(input, 33, FOLLOW_33_in_ruleVisibilityKind1384);
>-
>-						current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-
>-				}
>-
>-
>-			}
>-
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>-
>-		}
>-
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>-
>-	// $ANTLR end ruleVisibilityKind
>-
>-
>-	// $ANTLR start ruleDirection
>-	// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:822:1: ruleDirection returns [Enumerator current=null] : ( ( 'in' ) | ( 'out' ) | ( 'inout' ) | ( 'return' ) ) ;
>-	public final Enumerator ruleDirection() throws RecognitionException {
>-		Enumerator current = null;
>-
>-		setCurrentLookahead();
>-		resetLookahead();
>-		try {
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:826:6: ( ( ( 'in' ) | ( 'out' ) | ( 'inout' ) | ( 'return' ) ) )
>-			// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:827:1: ( ( 'in' ) | ( 'out' ) | ( 'inout' ) | ( 'return' ) )
>-			{
>-				// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:827:1: ( ( 'in' ) | ( 'out' ) | ( 'inout' ) | ( 'return' ) )
>-				int alt11 = 4;
>-				switch(input.LA(1)) {
>-				case 34:
>-				{
>-					alt11 = 1;
>-				}
>-					break;
>-				case 35:
>-				{
>-					alt11 = 2;
>-				}
>-					break;
>-				case 36:
>-				{
>-					alt11 = 3;
>-				}
>-					break;
>-				case 37:
>-				{
>-					alt11 = 4;
>-				}
>-					break;
>-				default:
>-					NoViableAltException nvae = new NoViableAltException("827:1: ( ( 'in' ) | ( 'out' ) | ( 'inout' ) | ( 'return' ) )", 11, 0, input);
>-
>-					throw nvae;
>-				}
>-
>-				switch(alt11) {
>-				case 1:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:827:2: ( 'in' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:827:2: ( 'in' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:827:4: 'in'
>-					{
>-						match(input, 34, FOLLOW_34_in_ruleDirection1427);
>-
>-						current = grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-				case 2:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:833:6: ( 'out' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:833:6: ( 'out' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:833:8: 'out'
>-					{
>-						match(input, 35, FOLLOW_35_in_ruleDirection1442);
>-
>-						current = grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-				case 3:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:839:6: ( 'inout' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:839:6: ( 'inout' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:839:8: 'inout'
>-					{
>-						match(input, 36, FOLLOW_36_in_ruleDirection1457);
>-
>-						current = grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getDirectionAccess().getINOUTEnumLiteralDeclaration_2(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-				case 4:
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:845:6: ( 'return' )
>-				{
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:845:6: ( 'return' )
>-					// ../org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.g:845:8: 'return'
>-					{
>-						match(input, 37, FOLLOW_37_in_ruleDirection1472);
>-
>-						current = grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
>-						createLeafNode(grammarAccess.getDirectionAccess().getRETURNEnumLiteralDeclaration_3(), null);
>-
>-
>-					}
>-
>-
>-				}
>-					break;
>-
>-				}
>-
>-
>-			}
>-
>-			resetLookahead();
>-			lastConsumedNode = currentNode;
>-
>-		}
>-
>-		catch (RecognitionException re) {
>-			recover(input, re);
>-			appendSkippedTokens();
>-		} finally {
>-		}
>-		return current;
>-	}
>-
>-	// $ANTLR end ruleDirection
>-
>-
>-
>-
>-	public static final BitSet FOLLOW_ruleParameterRule_in_entryRuleParameterRule75 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleParameterRule85 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleVisibilityKind_in_ruleParameterRule131 = new BitSet(new long[]{ 0x0000003C00000000L });
>-
>-	public static final BitSet FOLLOW_ruleDirection_in_ruleParameterRule152 = new BitSet(new long[]{ 0x0000000000000010L });
>-
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleParameterRule169 = new BitSet(new long[]{ 0x0000000000001000L });
>-
>-	public static final BitSet FOLLOW_12_in_ruleParameterRule184 = new BitSet(new long[]{ 0x0000000000002010L });
>-
>-	public static final BitSet FOLLOW_ruleTypeRule_in_ruleParameterRule206 = new BitSet(new long[]{ 0x0000000000084000L });
>-
>-	public static final BitSet FOLLOW_13_in_ruleParameterRule222 = new BitSet(new long[]{ 0x0000000000084000L });
>-
>-	public static final BitSet FOLLOW_ruleMultiplicityRule_in_ruleParameterRule244 = new BitSet(new long[]{ 0x0000000000004000L });
>-
>-	public static final BitSet FOLLOW_ruleModifiersRule_in_ruleParameterRule266 = new BitSet(new long[]{ 0x0000000000004000L });
>-
>-	public static final BitSet FOLLOW_ruleEffectRule_in_ruleParameterRule288 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule324 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule334 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_14_in_ruleModifiersRule369 = new BitSet(new long[]{ 0x0000000003C00000L });
>-
>-	public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule390 = new BitSet(new long[]{ 0x0000000000018000L });
>-
>-	public static final BitSet FOLLOW_15_in_ruleModifiersRule401 = new BitSet(new long[]{ 0x0000000003C00000L });
>-
>-	public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule422 = new BitSet(new long[]{ 0x0000000000018000L });
>-
>-	public static final BitSet FOLLOW_16_in_ruleModifiersRule434 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification470 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification480 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleModifierKind_in_ruleModifierSpecification525 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleEffectRule_in_entryRuleEffectRule560 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleEffectRule570 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_14_in_ruleEffectRule605 = new BitSet(new long[]{ 0x0000000000020000L });
>-
>-	public static final BitSet FOLLOW_17_in_ruleEffectRule615 = new BitSet(new long[]{ 0x000000003C000000L });
>-
>-	public static final BitSet FOLLOW_ruleEffectKind_in_ruleEffectRule636 = new BitSet(new long[]{ 0x0000000000010000L });
>-
>-	public static final BitSet FOLLOW_16_in_ruleEffectRule646 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName682 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName692 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName735 = new BitSet(new long[]{ 0x0000000000040000L });
>-
>-	public static final BitSet FOLLOW_18_in_ruleQualifiedName745 = new BitSet(new long[]{ 0x0000000000000012L });
>-
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName766 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule803 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule813 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule859 = new BitSet(new long[]{ 0x0000000000000010L });
>-
>-	public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule878 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule914 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule924 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_19_in_ruleMultiplicityRule959 = new BitSet(new long[]{ 0x0000000000000020L });
>-
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule980 = new BitSet(new long[]{ 0x0000000000300000L });
>-
>-	public static final BitSet FOLLOW_20_in_ruleMultiplicityRule991 = new BitSet(new long[]{ 0x0000000000000020L });
>-
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule1012 = new BitSet(new long[]{ 0x0000000000200000L });
>-
>-	public static final BitSet FOLLOW_21_in_ruleMultiplicityRule1024 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification1060 = new BitSet(new long[]{ 0x0000000000000000L });
>-
>-	public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification1070 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification1111 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_22_in_ruleModifierKind1163 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_23_in_ruleModifierKind1178 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_24_in_ruleModifierKind1193 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_25_in_ruleModifierKind1208 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_26_in_ruleEffectKind1251 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_27_in_ruleEffectKind1266 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_28_in_ruleEffectKind1281 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_29_in_ruleEffectKind1296 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_30_in_ruleVisibilityKind1339 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_31_in_ruleVisibilityKind1354 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_32_in_ruleVisibilityKind1369 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_33_in_ruleVisibilityKind1384 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_34_in_ruleDirection1427 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_35_in_ruleDirection1442 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_36_in_ruleDirection1457 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-	public static final BitSet FOLLOW_37_in_ruleDirection1472 = new BitSet(new long[]{ 0x0000000000000002L });
>-
>-}
>+}
>\ No newline at end of file
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/UmlParameterParser.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/UmlParameterParser.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/UmlParameterParser.java	(working copy)
>@@ -1,56 +1,39 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.parameter.editor.xtext.parser.antlr;
> 
>-import org.antlr.runtime.CharStream;
>-import org.antlr.runtime.TokenSource;
>-import org.eclipse.xtext.parser.IParseResult;
>-import org.eclipse.xtext.parser.ParseException;
>-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
>-
> import com.google.inject.Inject;
> 
>+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
> import org.eclipse.papyrus.parameter.editor.xtext.services.UmlParameterGrammarAccess;
> 
> public class UmlParameterParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
>-
>+	
> 	@Inject
> 	private UmlParameterGrammarAccess grammarAccess;
>-
>+	
> 	@Override
>-	protected IParseResult parse(String ruleName, CharStream in) {
>-		TokenSource tokenSource = createLexer(in);
>-		XtextTokenStream tokenStream = createTokenStream(tokenSource);
>+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
> 		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
>-		org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal.InternalUmlParameterParser parser = createParser(tokenStream);
>-		parser.setTokenTypeMap(getTokenDefProvider().getTokenDefMap());
>-		parser.setSyntaxErrorProvider(getSyntaxErrorProvider());
>-		parser.setUnorderedGroupHelper(getUnorderedGroupHelper().get());
>-		try {
>-			if(ruleName != null)
>-				return parser.parse(ruleName);
>-			return parser.parse();
>-		} catch (Exception re) {
>-			throw new ParseException(re.getMessage(), re);
>-		}
> 	}
>-
>+	
>+	@Override
> 	protected org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal.InternalUmlParameterParser createParser(XtextTokenStream stream) {
>-		return new org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal.InternalUmlParameterParser(stream, getElementFactory(), getGrammarAccess());
>+		return new org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.internal.InternalUmlParameterParser(stream, getGrammarAccess());
> 	}
>-
>-	@Override
>+	
>+	@Override 
> 	protected String getDefaultRuleName() {
> 		return "ParameterRule";
> 	}
>-
>+	
> 	public UmlParameterGrammarAccess getGrammarAccess() {
> 		return this.grammarAccess;
> 	}
>-
>+	
> 	public void setGrammarAccess(UmlParameterGrammarAccess grammarAccess) {
> 		this.grammarAccess = grammarAccess;
> 	}
>-
>+	
> }
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/UmlParameterAntlrTokenFileProvider.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/UmlParameterAntlrTokenFileProvider.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/UmlParameterAntlrTokenFileProvider.java	(working copy)
>@@ -1,15 +1,15 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.parameter.editor.xtext.parser.antlr;
> 
> import java.io.InputStream;
> import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
> 
> public class UmlParameterAntlrTokenFileProvider implements IAntlrTokenFileProvider {
>-
>+	
> 	public InputStream getAntlrTokenFile() {
> 		ClassLoader classLoader = getClass().getClassLoader();
>-		return classLoader.getResourceAsStream("org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens");
>+ 	return classLoader.getResourceAsStream("org/eclipse/papyrus/parameter/editor/xtext/parser/antlr/internal/InternalUmlParameter.tokens");
> 	}
> }
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/parseTreeConstruction/UmlParameterParsetreeConstructor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/parseTreeConstruction/UmlParameterParsetreeConstructor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/parseTreeConstruction/UmlParameterParsetreeConstructor.java	(working copy)
>@@ -1,6 +1,6 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> package org.eclipse.papyrus.parameter.editor.xtext.parseTreeConstruction;
> 
> import org.eclipse.emf.ecore.*;
>@@ -14,1515 +14,1371 @@
> 
> @SuppressWarnings("all")
> public class UmlParameterParsetreeConstructor extends AbstractParseTreeConstructor {
>-
>+		
> 	@Inject
> 	private UmlParameterGrammarAccess grammarAccess;
>-
>+	
> 	@Override
> 	protected AbstractToken getRootToken(IEObjectConsumer inst) {
>-		return new ThisRootNode(inst);
>+		return new ThisRootNode(inst);	
> 	}
>-
>-	protected class ThisRootNode extends RootToken {
>+	
>+protected class ThisRootNode extends RootToken {
>+	public ThisRootNode(IEObjectConsumer inst) {
>+		super(inst);
>+	}
>+	
>+	@Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_Group(this, this, 0, inst);
>+			case 1: return new ModifiersRule_Group(this, this, 1, inst);
>+			case 2: return new ModifierSpecification_ValueAssignment(this, this, 2, inst);
>+			case 3: return new EffectRule_Group(this, this, 3, inst);
>+			case 4: return new QualifiedName_Group(this, this, 4, inst);
>+			case 5: return new TypeRule_Group(this, this, 5, inst);
>+			case 6: return new MultiplicityRule_Group(this, this, 6, inst);
>+			case 7: return new BoundSpecification_ValueAssignment(this, this, 7, inst);
>+			default: return null;
>+		}	
>+	}	
>+}
>+	
> 
>-		public ThisRootNode(IEObjectConsumer inst) {
>-			super(inst);
>-		}
>+/************ begin Rule ParameterRule ****************
>+ *
>+ * ParameterRule:
>+ * 	visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>")
>+ * 	multiplicity=MultiplicityRule? modifiers=ModifiersRule? effect=EffectRule;
>+ *
>+ **/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_Group(this, this, 0, inst);
>-			case 1:
>-				return new ModifiersRule_Group(this, this, 1, inst);
>-			case 2:
>-				return new ModifierSpecification_ValueAssignment(this, this, 2, inst);
>-			case 3:
>-				return new EffectRule_Group(this, this, 3, inst);
>-			case 4:
>-				return new QualifiedName_Group(this, this, 4, inst);
>-			case 5:
>-				return new TypeRule_Group(this, this, 5, inst);
>-			case 6:
>-				return new MultiplicityRule_Group(this, this, 6, inst);
>-			case 7:
>-				return new BoundSpecification_ValueAssignment(this, this, 7, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
>+// modifiers=ModifiersRule? effect=EffectRule
>+protected class ParameterRule_Group extends GroupToken {
>+	
>+	public ParameterRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getGroup();
>+	}
> 
>-	/************
>-	 * begin Rule ParameterRule ****************
>-	 * 
>-	 * ParameterRule:
>-	 * visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>")
>-	 * multiplicity=MultiplicityRule? modifiers=ModifiersRule? effect=EffectRule;
>-	 * 
>-	 **/
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_EffectAssignment_7(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	// visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
>-	// modifiers=ModifiersRule? effect=EffectRule
>-	protected class ParameterRule_Group extends GroupToken {
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getParameterRuleRule().getType().getClassifier())
>+			return null;
>+		return eObjectConsumer;
>+	}
> 
>-		public ParameterRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getGroup();
>-		}
>+// visibility=VisibilityKind
>+protected class ParameterRule_VisibilityAssignment_0 extends AssignmentToken {
>+	
>+	public ParameterRule_VisibilityAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getVisibilityAssignment_0();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_EffectAssignment_7(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getParameterRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("visibility",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("visibility");
>+		if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), value, null)) { 
>+			type = AssignmentType.ENUM_RULE_CALL;
>+			element = grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0();
>+			return obj;
> 		}
>-
>+		return null;
> 	}
> 
>-	// visibility=VisibilityKind
>-	protected class ParameterRule_VisibilityAssignment_0 extends AssignmentToken {
>-
>-		public ParameterRule_VisibilityAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getVisibilityAssignment_0();
>-		}
>+// direction=Direction
>+protected class ParameterRule_DirectionAssignment_1 extends AssignmentToken {
>+	
>+	public ParameterRule_DirectionAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getDirectionAssignment_1();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_VisibilityAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("visibility", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("visibility");
>-			if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0(), value, null)) {
>-				type = AssignmentType.ENUM_RULE_CALL;
>-				element = grammarAccess.getParameterRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0();
>-				return obj;
>-			}
>-			return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("direction",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("direction");
>+		if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0(), value, null)) { 
>+			type = AssignmentType.ENUM_RULE_CALL;
>+			element = grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0();
>+			return obj;
> 		}
>-
>+		return null;
> 	}
> 
>-	// direction=Direction
>-	protected class ParameterRule_DirectionAssignment_1 extends AssignmentToken {
>+}
> 
>-		public ParameterRule_DirectionAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// name=ID
>+protected class ParameterRule_NameAssignment_2 extends AssignmentToken {
>+	
>+	public ParameterRule_NameAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getNameAssignment_2();
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getDirectionAssignment_1();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_DirectionAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_VisibilityAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("name",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("name");
>+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0(), value, null)) {
>+			type = AssignmentType.TERMINAL_RULE_CALL;
>+			element = grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0();
>+			return obj;
> 		}
>+		return null;
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("direction", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("direction");
>-			if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0(), value, null)) {
>-				type = AssignmentType.ENUM_RULE_CALL;
>-				element = grammarAccess.getParameterRuleAccess().getDirectionDirectionEnumRuleCall_1_0();
>-				return obj;
>-			}
>-			return null;
>-		}
>+}
> 
>+// ":"
>+protected class ParameterRule_ColonKeyword_3 extends KeywordToken {
>+	
>+	public ParameterRule_ColonKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getColonKeyword_3();
> 	}
> 
>-	// name=ID
>-	protected class ParameterRule_NameAssignment_2 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_NameAssignment_2(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		public ParameterRule_NameAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getNameAssignment_2();
>-		}
>+// type=TypeRule | "<Undefined>"
>+protected class ParameterRule_Alternatives_4 extends AlternativesToken {
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_DirectionAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("name", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("name");
>-			if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0(), value, null)) {
>-				type = AssignmentType.TERMINAL_RULE_CALL;
>-				element = grammarAccess.getParameterRuleAccess().getNameIDTerminalRuleCall_2_0();
>-				return obj;
>-			}
>-			return null;
>-		}
>+	public ParameterRule_Alternatives_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Alternatives getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getAlternatives_4();
>+	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_TypeAssignment_4_0(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new ParameterRule_UndefinedKeyword_4_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
> 	}
> 
>-	// ":"
>-	protected class ParameterRule_ColonKeyword_3 extends KeywordToken {
>+}
> 
>-		public ParameterRule_ColonKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// type=TypeRule
>+protected class ParameterRule_TypeAssignment_4_0 extends AssignmentToken {
>+	
>+	public ParameterRule_TypeAssignment_4_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getTypeAssignment_4_0();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getColonKeyword_3();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_NameAssignment_2(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("type",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getTypeRuleRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// type=TypeRule | "<Undefined>"
>-	protected class ParameterRule_Alternatives_4 extends AlternativesToken {
>-
>-		public ParameterRule_Alternatives_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Alternatives getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getAlternatives_4();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_TypeAssignment_4_0(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new ParameterRule_UndefinedKeyword_4_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new ParameterRule_ColonKeyword_3(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>+// "<Undefined>"
>+protected class ParameterRule_UndefinedKeyword_4_1 extends KeywordToken {
>+	
>+	public ParameterRule_UndefinedKeyword_4_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1();
> 	}
> 
>-	// type=TypeRule
>-	protected class ParameterRule_TypeAssignment_4_0 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ParameterRule_ColonKeyword_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		public ParameterRule_TypeAssignment_4_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getTypeAssignment_4_0();
>-		}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// multiplicity=MultiplicityRule?
>+protected class ParameterRule_MultiplicityAssignment_5 extends AssignmentToken {
>+	
>+	public ParameterRule_MultiplicityAssignment_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getMultiplicityAssignment_5();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("type", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getTypeRuleRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getParameterRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_ColonKeyword_3(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("multiplicity",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("multiplicity");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getMultiplicityRuleRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>+		return null;
> 	}
> 
>-	// "<Undefined>"
>-	protected class ParameterRule_UndefinedKeyword_4_1 extends KeywordToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new ParameterRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public ParameterRule_UndefinedKeyword_4_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// modifiers=ModifiersRule?
>+protected class ParameterRule_ModifiersAssignment_6 extends AssignmentToken {
>+	
>+	public ParameterRule_ModifiersAssignment_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getModifiersAssignment_6();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getUndefinedKeyword_4_1();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifiersRule_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_ColonKeyword_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("modifiers",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("modifiers");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getModifiersRuleRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-
>-	// multiplicity=MultiplicityRule?
>-	protected class ParameterRule_MultiplicityAssignment_5 extends AssignmentToken {
>-
>-		public ParameterRule_MultiplicityAssignment_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getMultiplicityAssignment_5();
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new ParameterRule_MultiplicityAssignment_5(lastRuleCallOrigin, next, actIndex, consumed);
>+			case 1: return new ParameterRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// effect=EffectRule
>+protected class ParameterRule_EffectAssignment_7 extends AssignmentToken {
>+	
>+	public ParameterRule_EffectAssignment_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getParameterRuleAccess().getEffectAssignment_7();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("multiplicity", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("multiplicity");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getMultiplicityRuleRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getParameterRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new EffectRule_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("effect",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("effect");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getEffectRuleRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>+		return null;
> 	}
> 
>-	// modifiers=ModifiersRule?
>-	protected class ParameterRule_ModifiersAssignment_6 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new ParameterRule_ModifiersAssignment_6(lastRuleCallOrigin, next, actIndex, consumed);
>+			case 1: return new ParameterRule_MultiplicityAssignment_5(lastRuleCallOrigin, next, actIndex, consumed);
>+			case 2: return new ParameterRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public ParameterRule_ModifiersAssignment_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getModifiersAssignment_6();
>-		}
>+/************ end Rule ParameterRule ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("modifiers", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("modifiers");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getModifiersRuleRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getParameterRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+/************ begin Rule ModifiersRule ****************
>+ *
>+ * ModifiersRule:
>+ * 	"{" values+=ModifierSpecification ("," values+=ModifierSpecification)* "}";
>+ *
>+ **/
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_MultiplicityAssignment_5(lastRuleCallOrigin, next, actIndex, consumed);
>-			case 1:
>-				return new ParameterRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+// "{" values+=ModifierSpecification ("," values+=ModifierSpecification)* "}"
>+protected class ModifiersRule_Group extends GroupToken {
>+	
>+	public ModifiersRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// effect=EffectRule
>-	protected class ParameterRule_EffectAssignment_7 extends AssignmentToken {
>-
>-		public ParameterRule_EffectAssignment_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getParameterRuleAccess().getEffectAssignment_7();
>-		}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new EffectRule_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifiersRule_RightCurlyBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("effect", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("effect");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getEffectRuleRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getParameterRuleAccess().getEffectEffectRuleParserRuleCall_7_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getModifiersRuleRule().getType().getClassifier())
> 			return null;
>-		}
>-
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new ParameterRule_ModifiersAssignment_6(lastRuleCallOrigin, next, actIndex, consumed);
>-			case 1:
>-				return new ParameterRule_MultiplicityAssignment_5(lastRuleCallOrigin, next, actIndex, consumed);
>-			case 2:
>-				return new ParameterRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+		return eObjectConsumer;
> 	}
> 
>-
>-	/************ end Rule ParameterRule ****************/
>-
>-
>-	/************
>-	 * begin Rule ModifiersRule ****************
>-	 * 
>-	 * ModifiersRule:
>-	 * "{" values+=ModifierSpecification ("," values+=ModifierSpecification)* "}";
>-	 * 
>-	 **/
>-
>-	// "{" values+=ModifierSpecification ("," values+=ModifierSpecification)* "}"
>-	protected class ModifiersRule_Group extends GroupToken {
>-
>-		public ModifiersRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getGroup();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_RightCurlyBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getModifiersRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>+// "{"
>+protected class ModifiersRule_LeftCurlyBracketKeyword_0 extends KeywordToken {
>+	
>+	public ModifiersRule_LeftCurlyBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0();
>+	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
> 	}
> 
>-	// "{"
>-	protected class ModifiersRule_LeftCurlyBracketKeyword_0 extends KeywordToken {
>+}
> 
>-		public ModifiersRule_LeftCurlyBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// values+=ModifierSpecification
>+protected class ModifiersRule_ValuesAssignment_1 extends AssignmentToken {
>+	
>+	public ModifiersRule_ValuesAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getValuesAssignment_1();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifierSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("values",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("values");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getModifierSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// values+=ModifierSpecification
>-	protected class ModifiersRule_ValuesAssignment_1 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new ModifiersRule_LeftCurlyBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public ModifiersRule_ValuesAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// ("," values+=ModifierSpecification)*
>+protected class ModifiersRule_Group_2 extends GroupToken {
>+	
>+	public ModifiersRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getGroup_2();
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getValuesAssignment_1();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifiersRule_ValuesAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifierSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("values", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("values");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getModifierSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+// ","
>+protected class ModifiersRule_CommaKeyword_2_0 extends KeywordToken {
>+	
>+	public ModifiersRule_CommaKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_LeftCurlyBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifiersRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new ModifiersRule_ValuesAssignment_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
> 	}
> 
>-	// ("," values+=ModifierSpecification)*
>-	protected class ModifiersRule_Group_2 extends GroupToken {
>+}
> 
>-		public ModifiersRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// values+=ModifierSpecification
>+protected class ModifiersRule_ValuesAssignment_2_1 extends AssignmentToken {
>+	
>+	public ModifiersRule_ValuesAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getGroup_2();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifierSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_ValuesAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("values",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("values");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getModifierSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// ","
>-	protected class ModifiersRule_CommaKeyword_2_0 extends KeywordToken {
>-
>-		public ModifiersRule_CommaKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new ModifiersRule_CommaKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0();
>-		}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new ModifiersRule_ValuesAssignment_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// "}"
>+protected class ModifiersRule_RightCurlyBracketKeyword_3 extends KeywordToken {
>+	
>+	public ModifiersRule_RightCurlyBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3();
>+	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new ModifiersRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new ModifiersRule_ValuesAssignment_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
> 	}
> 
>-	// values+=ModifierSpecification
>-	protected class ModifiersRule_ValuesAssignment_2_1 extends AssignmentToken {
>+}
> 
>-		public ModifiersRule_ValuesAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1();
>-		}
>+/************ end Rule ModifiersRule ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifierSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("values", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("values");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getModifierSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+/************ begin Rule ModifierSpecification ****************
>+ *
>+ * ModifierSpecification:
>+ * 	value=ModifierKind;
>+ *
>+ **/
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_CommaKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+// value=ModifierKind
>+protected class ModifierSpecification_ValueAssignment extends AssignmentToken {
>+	
>+	public ModifierSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-
>-	// "}"
>-	protected class ModifiersRule_RightCurlyBracketKeyword_3 extends KeywordToken {
>-
>-		public ModifiersRule_RightCurlyBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getModifierSpecificationAccess().getValueAssignment();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new ModifiersRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new ModifiersRule_ValuesAssignment_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getModifierSpecificationRule().getType().getClassifier())
>+			return null;
>+		if((value = eObjectConsumer.getConsumable("value",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>+		if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0(), value, null)) { 
>+			type = AssignmentType.ENUM_RULE_CALL;
>+			element = grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0();
>+			return obj;
> 		}
>-
>+		return null;
> 	}
> 
>-
>-	/************ end Rule ModifiersRule ****************/
>-
>+}
> 
>-	/************
>-	 * begin Rule ModifierSpecification ****************
>-	 * 
>-	 * ModifierSpecification:
>-	 * value=ModifierKind;
>-	 * 
>-	 **/
>+/************ end Rule ModifierSpecification ****************/
> 
>-	// value=ModifierKind
>-	protected class ModifierSpecification_ValueAssignment extends AssignmentToken {
> 
>-		public ModifierSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+/************ begin Rule EffectRule ****************
>+ *
>+ * EffectRule:
>+ * 	"{" "effect: " effectKind=EffectKind "}";
>+ *
>+ **/
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getModifierSpecificationAccess().getValueAssignment();
>-		}
>+// "{" "effect: " effectKind=EffectKind "}"
>+protected class EffectRule_Group extends GroupToken {
>+	
>+	public EffectRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getEffectRuleAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new EffectRule_RightCurlyBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getModifierSpecificationRule().getType().getClassifier())
>-				return null;
>-			if((value = eObjectConsumer.getConsumable("value", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>-			if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0(), value, null)) {
>-				type = AssignmentType.ENUM_RULE_CALL;
>-				element = grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0();
>-				return obj;
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getEffectRuleRule().getType().getClassifier())
> 			return null;
>-		}
>-
>+		return eObjectConsumer;
> 	}
> 
>-	/************ end Rule ModifierSpecification ****************/
>-
>+}
> 
>-	/************
>-	 * begin Rule EffectRule ****************
>-	 * 
>-	 * EffectRule:
>-	 * "{" "effect: " effectKind=EffectKind "}";
>-	 * 
>-	 **/
>+// "{"
>+protected class EffectRule_LeftCurlyBracketKeyword_0 extends KeywordToken {
>+	
>+	public EffectRule_LeftCurlyBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0();
>+	}
> 
>-	// "{" "effect: " effectKind=EffectKind "}"
>-	protected class EffectRule_Group extends GroupToken {
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		public EffectRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getEffectRuleAccess().getGroup();
>-		}
>+// "effect: "
>+protected class EffectRule_EffectKeyword_1 extends KeywordToken {
>+	
>+	public EffectRule_EffectKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getEffectRuleAccess().getEffectKeyword_1();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new EffectRule_RightCurlyBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new EffectRule_LeftCurlyBracketKeyword_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getEffectRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>+}
> 
>+// effectKind=EffectKind
>+protected class EffectRule_EffectKindAssignment_2 extends AssignmentToken {
>+	
>+	public EffectRule_EffectKindAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// "{"
>-	protected class EffectRule_LeftCurlyBracketKeyword_0 extends KeywordToken {
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getEffectRuleAccess().getEffectKindAssignment_2();
>+	}
> 
>-		public EffectRule_LeftCurlyBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new EffectRule_EffectKeyword_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getEffectRuleAccess().getLeftCurlyBracketKeyword_0();
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("effectKind",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("effectKind");
>+		if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0(), value, null)) { 
>+			type = AssignmentType.ENUM_RULE_CALL;
>+			element = grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0();
>+			return obj;
> 		}
>+		return null;
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+}
> 
>+// "}"
>+protected class EffectRule_RightCurlyBracketKeyword_3 extends KeywordToken {
>+	
>+	public EffectRule_RightCurlyBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// "effect: "
>-	protected class EffectRule_EffectKeyword_1 extends KeywordToken {
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3();
>+	}
> 
>-		public EffectRule_EffectKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new EffectRule_EffectKindAssignment_2(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getEffectRuleAccess().getEffectKeyword_1();
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new EffectRule_LeftCurlyBracketKeyword_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
> 
>-	}
>+/************ end Rule EffectRule ****************/
> 
>-	// effectKind=EffectKind
>-	protected class EffectRule_EffectKindAssignment_2 extends AssignmentToken {
> 
>-		public EffectRule_EffectKindAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+/************ begin Rule QualifiedName ****************
>+ *
>+ * QualifiedName:
>+ * 	path=[uml::Namespace] "::" remaining=QualifiedName?;
>+ *
>+ **/
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getEffectRuleAccess().getEffectKindAssignment_2();
>-		}
>+// path=[uml::Namespace] "::" remaining=QualifiedName?
>+protected class QualifiedName_Group extends GroupToken {
>+	
>+	public QualifiedName_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getGroup();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new EffectRule_EffectKeyword_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_RemainingAssignment_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("effectKind", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("effectKind");
>-			if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0(), value, null)) {
>-				type = AssignmentType.ENUM_RULE_CALL;
>-				element = grammarAccess.getEffectRuleAccess().getEffectKindEffectKindEnumRuleCall_2_0();
>-				return obj;
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getQualifiedNameRule().getType().getClassifier())
> 			return null;
>-		}
>-
>+		return eObjectConsumer;
> 	}
> 
>-	// "}"
>-	protected class EffectRule_RightCurlyBracketKeyword_3 extends KeywordToken {
>+}
> 
>-		public EffectRule_RightCurlyBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// path=[uml::Namespace]
>+protected class QualifiedName_PathAssignment_0 extends AssignmentToken {
>+	
>+	public QualifiedName_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getPathAssignment_0();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getEffectRuleAccess().getRightCurlyBracketKeyword_3();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new EffectRule_EffectKindAssignment_2(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("path",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0().getType().getClassifier())) {
>+				type = AssignmentType.CROSS_REFERENCE;
>+				element = grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(); 
>+				return obj;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-
>-	/************ end Rule EffectRule ****************/
>+}
> 
>+// "::"
>+protected class QualifiedName_ColonColonKeyword_1 extends KeywordToken {
>+	
>+	public QualifiedName_ColonColonKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1();
>+	}
> 
>-	/************
>-	 * begin Rule QualifiedName ****************
>-	 * 
>-	 * QualifiedName:
>-	 * path=[uml::Namespace] "::" remaining=QualifiedName?;
>-	 * 
>-	 **/
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	// path=[uml::Namespace] "::" remaining=QualifiedName?
>-	protected class QualifiedName_Group extends GroupToken {
>+}
> 
>-		public QualifiedName_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// remaining=QualifiedName?
>+protected class QualifiedName_RemainingAssignment_2 extends AssignmentToken {
>+	
>+	public QualifiedName_RemainingAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getGroup();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_RemainingAssignment_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("remaining",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("remaining");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getQualifiedNameRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+		return null;
> 	}
> 
>-	// path=[uml::Namespace]
>-	protected class QualifiedName_PathAssignment_0 extends AssignmentToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public QualifiedName_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getPathAssignment_0();
>-		}
>+/************ end Rule QualifiedName ****************/
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("path", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0().getType().getClassifier())) {
>-					type = AssignmentType.CROSS_REFERENCE;
>-					element = grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0();
>-					return obj;
>-				}
>-			}
>-			return null;
>-		}
>+/************ begin Rule TypeRule ****************
>+ *
>+ * TypeRule:
>+ * 	path=QualifiedName? type=[uml::Type];
>+ *
>+ **/
> 
>+// path=QualifiedName? type=[uml::Type]
>+protected class TypeRule_Group extends GroupToken {
>+	
>+	public TypeRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// "::"
>-	protected class QualifiedName_ColonColonKeyword_1 extends KeywordToken {
>-
>-		public QualifiedName_ColonColonKeyword_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getGroup();
> 	}
> 
>-	// remaining=QualifiedName?
>-	protected class QualifiedName_RemainingAssignment_2 extends AssignmentToken {
>-
>-		public QualifiedName_RemainingAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_TypeAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("remaining", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("remaining");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getTypeRuleRule().getType().getClassifier())
> 			return null;
>-		}
>-
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_ColonColonKeyword_1(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+		return eObjectConsumer;
> 	}
> 
>-
>-	/************ end Rule QualifiedName ****************/
>-
>-
>-	/************
>-	 * begin Rule TypeRule ****************
>-	 * 
>-	 * TypeRule:
>-	 * path=QualifiedName? type=[uml::Type];
>-	 * 
>-	 **/
>-
>-	// path=QualifiedName? type=[uml::Type]
>-	protected class TypeRule_Group extends GroupToken {
>-
>-		public TypeRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getGroup();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_TypeAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getTypeRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>+}
> 
>+// path=QualifiedName?
>+protected class TypeRule_PathAssignment_0 extends AssignmentToken {
>+	
>+	public TypeRule_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// path=QualifiedName?
>-	protected class TypeRule_PathAssignment_0 extends AssignmentToken {
>-
>-		public TypeRule_PathAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getPathAssignment_0();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new QualifiedName_Group(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getPathAssignment_0();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("path", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new QualifiedName_Group(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex, index, consumed);
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("path",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("path");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getQualifiedNameRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>+		return null;
> 	}
> 
>-	// type=[uml::Type]
>-	protected class TypeRule_TypeAssignment_1 extends AssignmentToken {
>-
>-		public TypeRule_TypeAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex , index, consumed);
>+		}	
>+	}	
>+}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getTypeRuleAccess().getTypeAssignment_1();
>-		}
>+// type=[uml::Type]
>+protected class TypeRule_TypeAssignment_1 extends AssignmentToken {
>+	
>+	public TypeRule_TypeAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getTypeRuleAccess().getTypeAssignment_1();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new TypeRule_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index - 1, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new TypeRule_PathAssignment_0(lastRuleCallOrigin, this, 0, inst);
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index - 1, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("type", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0().getType().getClassifier())) {
>-					type = AssignmentType.CROSS_REFERENCE;
>-					element = grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0();
>-					return obj;
>-				}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("type",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("type");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0().getType().getClassifier())) {
>+				type = AssignmentType.CROSS_REFERENCE;
>+				element = grammarAccess.getTypeRuleAccess().getTypeTypeCrossReference_1_0(); 
>+				return obj;
> 			}
>-			return null;
> 		}
>-
>+		return null;
> 	}
> 
>-
>-	/************ end Rule TypeRule ****************/
>+}
> 
> 
>-	/************
>-	 * begin Rule MultiplicityRule ****************
>-	 * 
>-	 * MultiplicityRule:
>-	 * "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>-	 * 
>-	 **/
>+/************ end Rule TypeRule ****************/
> 
>-	// "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>-	protected class MultiplicityRule_Group extends GroupToken {
> 
>-		public MultiplicityRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+/************ begin Rule MultiplicityRule ****************
>+ *
>+ * MultiplicityRule:
>+ * 	"[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]";
>+ *
>+ **/
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getGroup();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_RightSquareBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getMultiplicityRuleRule().getType().getClassifier())
>-				return null;
>-			return eObjectConsumer;
>-		}
>-
>+// "[" bounds+=BoundSpecification (".." bounds+=BoundSpecification)? "]"
>+protected class MultiplicityRule_Group extends GroupToken {
>+	
>+	public MultiplicityRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// "["
>-	protected class MultiplicityRule_LeftSquareBracketKeyword_0 extends KeywordToken {
>-
>-		public MultiplicityRule_LeftSquareBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>-
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0();
>-		}
>-
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>-
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getGroup();
> 	}
> 
>-	// bounds+=BoundSpecification
>-	protected class MultiplicityRule_BoundsAssignment_1 extends AssignmentToken {
>-
>-		public MultiplicityRule_BoundsAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_RightSquareBracketKeyword_3(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1();
>-		}
>+ @Override
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getMultiplicityRuleRule().getType().getClassifier())
>+			return null;
>+		return eObjectConsumer;
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("bounds", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+// "["
>+protected class MultiplicityRule_LeftSquareBracketKeyword_0 extends KeywordToken {
>+	
>+	public MultiplicityRule_LeftSquareBracketKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_LeftSquareBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
> 	}
> 
>-	// (".." bounds+=BoundSpecification)?
>-	protected class MultiplicityRule_Group_2 extends GroupToken {
>+}
> 
>-		public MultiplicityRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// bounds+=BoundSpecification
>+protected class MultiplicityRule_BoundsAssignment_1 extends AssignmentToken {
>+	
>+	public MultiplicityRule_BoundsAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1();
>+	}
> 
>-		@Override
>-		public Group getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getGroup_2();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_BoundsAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("bounds",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>-
>+		return null;
> 	}
> 
>-	// ".."
>-	protected class MultiplicityRule_FullStopFullStopKeyword_2_0 extends KeywordToken {
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new MultiplicityRule_LeftSquareBracketKeyword_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		public MultiplicityRule_FullStopFullStopKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+// (".." bounds+=BoundSpecification)?
>+protected class MultiplicityRule_Group_2 extends GroupToken {
>+	
>+	public MultiplicityRule_Group_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Group getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getGroup_2();
>+	}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0();
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_BoundsAssignment_2_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+}
> 
>+// ".."
>+protected class MultiplicityRule_FullStopFullStopKeyword_2_0 extends KeywordToken {
>+	
>+	public MultiplicityRule_FullStopFullStopKeyword_2_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
> 	}
>-
>-	// bounds+=BoundSpecification
>-	protected class MultiplicityRule_BoundsAssignment_2_1 extends AssignmentToken {
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0();
>+	}
> 
>-		public MultiplicityRule_BoundsAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1();
>-		}
>+}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>-			default:
>-				return null;
>-			}
>-		}
>+// bounds+=BoundSpecification
>+protected class MultiplicityRule_BoundsAssignment_2_1 extends AssignmentToken {
>+	
>+	public MultiplicityRule_BoundsAssignment_2_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1();
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if((value = eObjectConsumer.getConsumable("bounds", false)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>-			if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>-				IEObjectConsumer param = createEObjectConsumer((EObject)value);
>-				if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>-					type = AssignmentType.PARSER_RULE_CALL;
>-					element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0();
>-					consumed = obj;
>-					return param;
>-				}
>-			}
>-			return null;
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new BoundSpecification_ValueAssignment(this, this, 0, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-		@Override
>-		public AbstractToken createFollowerAfterReturn(AbstractToken next, int actIndex, int index, IEObjectConsumer inst) {
>-			if(value == inst.getEObject() && !inst.isConsumed())
>-				return null;
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_FullStopFullStopKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>-			default:
>-				return null;
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if((value = eObjectConsumer.getConsumable("bounds",false)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("bounds");
>+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
>+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
>+			if(param.isInstanceOf(grammarAccess.getBoundSpecificationRule().getType().getClassifier())) {
>+				type = AssignmentType.PARSER_RULE_CALL;
>+				element = grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(); 
>+				consumed = obj;
>+				return param;
> 			}
> 		}
>+		return null;
> 	}
> 
>-
>-	// "]"
>-	protected class MultiplicityRule_RightSquareBracketKeyword_3 extends KeywordToken {
>-
>-		public MultiplicityRule_RightSquareBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+ @Override
>+	public AbstractToken createFollowerAfterReturn(AbstractToken next,	int actIndex, int index, IEObjectConsumer inst) {
>+		if(value == inst.getEObject() && !inst.isConsumed()) return null;
>+		switch(index) {
>+			case 0: return new MultiplicityRule_FullStopFullStopKeyword_2_0(lastRuleCallOrigin, next, actIndex, consumed);
>+			default: return null;
>+		}	
>+	}	
>+}
> 
>-		@Override
>-		public Keyword getGrammarElement() {
>-			return grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3();
>-		}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			case 0:
>-				return new MultiplicityRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>-			case 1:
>-				return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 1, inst);
>-			default:
>-				return null;
>-			}
>-		}
>-
>+// "]"
>+protected class MultiplicityRule_RightSquareBracketKeyword_3 extends KeywordToken {
>+	
>+	public MultiplicityRule_RightSquareBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Keyword getGrammarElement() {
>+		return grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3();
> 	}
> 
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			case 0: return new MultiplicityRule_Group_2(lastRuleCallOrigin, this, 0, inst);
>+			case 1: return new MultiplicityRule_BoundsAssignment_1(lastRuleCallOrigin, this, 1, inst);
>+			default: return null;
>+		}	
>+	}
> 
>-	/************ end Rule MultiplicityRule ****************/
>+}
> 
> 
>-	/************
>-	 * begin Rule BoundSpecification ****************
>-	 * 
>-	 * BoundSpecification:
>-	 * value=UnlimitedLiteral;
>-	 * 
>-	 **/
>+/************ end Rule MultiplicityRule ****************/
> 
>-	// value=UnlimitedLiteral
>-	protected class BoundSpecification_ValueAssignment extends AssignmentToken {
> 
>-		public BoundSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>-			super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>-		}
>+/************ begin Rule BoundSpecification ****************
>+ *
>+ * BoundSpecification:
>+ * 	value=UnlimitedLiteral;
>+ *
>+ **/
> 
>-		@Override
>-		public Assignment getGrammarElement() {
>-			return grammarAccess.getBoundSpecificationAccess().getValueAssignment();
>-		}
>+// value=UnlimitedLiteral
>+protected class BoundSpecification_ValueAssignment extends AssignmentToken {
>+	
>+	public BoundSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
>+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
>+	}
>+	
>+	@Override
>+	public Assignment getGrammarElement() {
>+		return grammarAccess.getBoundSpecificationAccess().getValueAssignment();
>+	}
> 
>-		@Override
>-		public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>-			switch(index) {
>-			default:
>-				return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>-			}
>-		}
>+ @Override
>+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
>+		switch(index) {
>+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
>+		}	
>+	}
> 
>-		@Override
>-		public IEObjectConsumer tryConsume() {
>-			if(getEObject().eClass() != grammarAccess.getBoundSpecificationRule().getType().getClassifier())
>-				return null;
>-			if((value = eObjectConsumer.getConsumable("value", true)) == null)
>-				return null;
>-			IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>-			if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), value, null)) {
>-				type = AssignmentType.TERMINAL_RULE_CALL;
>-				element = grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0();
>-				return obj;
>-			}
>+ @Override	
>+	public IEObjectConsumer tryConsume() {
>+		if(getEObject().eClass() != grammarAccess.getBoundSpecificationRule().getType().getClassifier())
> 			return null;
>+		if((value = eObjectConsumer.getConsumable("value",true)) == null) return null;
>+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
>+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), value, null)) {
>+			type = AssignmentType.TERMINAL_RULE_CALL;
>+			element = grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0();
>+			return obj;
> 		}
>-
>+		return null;
> 	}
> 
>-	/************ end Rule BoundSpecification ****************/
>+}
>+
>+/************ end Rule BoundSpecification ****************/
> 
> }
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ModifierSpecificationImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ModifierSpecificationImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ModifierSpecificationImpl.java	(working copy)
>@@ -24,158 +24,159 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl#getValue Value}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl#getValue Value}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container implements ModifierSpecification {
>+public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container implements ModifierSpecification
>+{
>+ /**
>+ * The default value of the '{@link #getValue() Value}' attribute.
>+ * 
>+ * 
>+ * @see #getValue()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final ModifierKind VALUE_EDEFAULT = ModifierKind.EXCEPTION;
> 
>-	/**
>-	 * The default value of the '{@link #getValue() Value}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getValue()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final ModifierKind VALUE_EDEFAULT = ModifierKind.EXCEPTION;
>+ /**
>+ * The cached value of the '{@link #getValue() Value}' attribute.
>+ * 
>+ * 
>+ * @see #getValue()
>+ * @generated
>+ * @ordered
>+ */
>+ protected ModifierKind value = VALUE_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getValue() Value}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getValue()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected ModifierKind value = VALUE_EDEFAULT;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected ModifierSpecificationImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected ModifierSpecificationImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlParameterPackage.Literals.MODIFIER_SPECIFICATION;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlParameterPackage.Literals.MODIFIER_SPECIFICATION;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public ModifierKind getValue()
>+ {
>+ return value;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public ModifierKind getValue() {
>-		return value;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setValue(ModifierKind newValue)
>+ {
>+ ModifierKind oldValue = value;
>+ value = newValue == null ? VALUE_EDEFAULT : newValue;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE, oldValue, value));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setValue(ModifierKind newValue) {
>-		ModifierKind oldValue = value;
>-		value = newValue == null ? VALUE_EDEFAULT : newValue;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE, oldValue, value));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>+ return getValue();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>-			return getValue();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>+ setValue((ModifierKind)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>-			setValue((ModifierKind)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>+ setValue(VALUE_EDEFAULT);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>-			setValue(VALUE_EDEFAULT);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>+ return value != VALUE_EDEFAULT;
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIER_SPECIFICATION__VALUE:
>-			return value != VALUE_EDEFAULT;
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy()) return super.toString();
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		if(eIsProxy())
>-			return super.toString();
>-
>-		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (value: ");
>-		result.append(value);
>-		result.append(')');
>-		return result.toString();
>-	}
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (value: ");
>+ result.append(value);
>+ result.append(')');
>+ return result.toString();
>+ }
> 
> } //ModifierSpecificationImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ParameterRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ParameterRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ParameterRuleImpl.java	(working copy)
>@@ -32,579 +32,569 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getVisibility Visibility}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getDirection Direction}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getName Name}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getType Type}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getMultiplicity Multiplicity}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getModifiers Modifiers}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getEffect Effect}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getVisibility Visibility}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getDirection Direction}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getType Type}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getMultiplicity Multiplicity}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getModifiers Modifiers}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl#getEffect Effect}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class ParameterRuleImpl extends MinimalEObjectImpl.Container implements ParameterRule {
>+public class ParameterRuleImpl extends MinimalEObjectImpl.Container implements ParameterRule
>+{
>+ /**
>+ * The default value of the '{@link #getVisibility() Visibility}' attribute.
>+ * 
>+ * 
>+ * @see #getVisibility()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PUBLIC;
> 
>-	/**
>-	 * The default value of the '{@link #getVisibility() Visibility}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getVisibility()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PUBLIC;
>+ /**
>+ * The cached value of the '{@link #getVisibility() Visibility}' attribute.
>+ * 
>+ * 
>+ * @see #getVisibility()
>+ * @generated
>+ * @ordered
>+ */
>+ protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getVisibility() Visibility}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getVisibility()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
>+ /**
>+ * The default value of the '{@link #getDirection() Direction}' attribute.
>+ * 
>+ * 
>+ * @see #getDirection()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final Direction DIRECTION_EDEFAULT = Direction.IN;
> 
>-	/**
>-	 * The default value of the '{@link #getDirection() Direction}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getDirection()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final Direction DIRECTION_EDEFAULT = Direction.IN;
>+ /**
>+ * The cached value of the '{@link #getDirection() Direction}' attribute.
>+ * 
>+ * 
>+ * @see #getDirection()
>+ * @generated
>+ * @ordered
>+ */
>+ protected Direction direction = DIRECTION_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getDirection() Direction}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getDirection()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected Direction direction = DIRECTION_EDEFAULT;
>+ /**
>+ * The default value of the '{@link #getName() Name}' attribute.
>+ * 
>+ * 
>+ * @see #getName()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String NAME_EDEFAULT = null;
> 
>-	/**
>-	 * The default value of the '{@link #getName() Name}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String NAME_EDEFAULT = null;
>+ /**
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ * 
>+ * 
>+ * @see #getName()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String name = NAME_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getName() Name}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected String name = NAME_EDEFAULT;
>+ /**
>+ * The cached value of the '{@link #getType() Type}' containment reference.
>+ * 
>+ * 
>+ * @see #getType()
>+ * @generated
>+ * @ordered
>+ */
>+ protected TypeRule type;
> 
>-	/**
>-	 * The cached value of the '{@link #getType() Type}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getType()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected TypeRule type;
>+ /**
>+ * The cached value of the '{@link #getMultiplicity() Multiplicity}' containment reference.
>+ * 
>+ * 
>+ * @see #getMultiplicity()
>+ * @generated
>+ * @ordered
>+ */
>+ protected MultiplicityRule multiplicity;
> 
>-	/**
>-	 * The cached value of the '{@link #getMultiplicity() Multiplicity}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getMultiplicity()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected MultiplicityRule multiplicity;
>+ /**
>+ * The cached value of the '{@link #getModifiers() Modifiers}' containment reference.
>+ * 
>+ * 
>+ * @see #getModifiers()
>+ * @generated
>+ * @ordered
>+ */
>+ protected ModifiersRule modifiers;
> 
>-	/**
>-	 * The cached value of the '{@link #getModifiers() Modifiers}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getModifiers()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected ModifiersRule modifiers;
>+ /**
>+ * The cached value of the '{@link #getEffect() Effect}' containment reference.
>+ * 
>+ * 
>+ * @see #getEffect()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EffectRule effect;
> 
>-	/**
>-	 * The cached value of the '{@link #getEffect() Effect}' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getEffect()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected EffectRule effect;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected ParameterRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected ParameterRuleImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlParameterPackage.Literals.PARAMETER_RULE;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlParameterPackage.Literals.PARAMETER_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public VisibilityKind getVisibility()
>+ {
>+ return visibility;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public VisibilityKind getVisibility() {
>-		return visibility;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setVisibility(VisibilityKind newVisibility)
>+ {
>+ VisibilityKind oldVisibility = visibility;
>+ visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__VISIBILITY, oldVisibility, visibility));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setVisibility(VisibilityKind newVisibility) {
>-		VisibilityKind oldVisibility = visibility;
>-		visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__VISIBILITY, oldVisibility, visibility));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Direction getDirection()
>+ {
>+ return direction;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Direction getDirection() {
>-		return direction;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setDirection(Direction newDirection)
>+ {
>+ Direction oldDirection = direction;
>+ direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__DIRECTION, oldDirection, direction));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setDirection(Direction newDirection) {
>-		Direction oldDirection = direction;
>-		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__DIRECTION, oldDirection, direction));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getName() {
>-		return name;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setName(String newName)
>+ {
>+ String oldName = name;
>+ name = newName;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__NAME, oldName, name));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setName(String newName) {
>-		String oldName = name;
>-		name = newName;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__NAME, oldName, name));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TypeRule getType()
>+ {
>+ return type;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public TypeRule getType() {
>-		return type;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetType(TypeRule newType, NotificationChain msgs)
>+ {
>+ TypeRule oldType = type;
>+ type = newType;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__TYPE, oldType, newType);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetType(TypeRule newType, NotificationChain msgs) {
>-		TypeRule oldType = type;
>-		type = newType;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__TYPE, oldType, newType);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setType(TypeRule newType)
>+ {
>+ if (newType != type)
>+ {
>+ NotificationChain msgs = null;
>+ if (type != null)
>+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__TYPE, null, msgs);
>+ if (newType != null)
>+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__TYPE, null, msgs);
>+ msgs = basicSetType(newType, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__TYPE, newType, newType));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setType(TypeRule newType) {
>-		if(newType != type) {
>-			NotificationChain msgs = null;
>-			if(type != null)
>-				msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__TYPE, null, msgs);
>-			if(newType != null)
>-				msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__TYPE, null, msgs);
>-			msgs = basicSetType(newType, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__TYPE, newType, newType));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public MultiplicityRule getMultiplicity()
>+ {
>+ return multiplicity;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public MultiplicityRule getMultiplicity() {
>-		return multiplicity;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetMultiplicity(MultiplicityRule newMultiplicity, NotificationChain msgs)
>+ {
>+ MultiplicityRule oldMultiplicity = multiplicity;
>+ multiplicity = newMultiplicity;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, oldMultiplicity, newMultiplicity);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetMultiplicity(MultiplicityRule newMultiplicity, NotificationChain msgs) {
>-		MultiplicityRule oldMultiplicity = multiplicity;
>-		multiplicity = newMultiplicity;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, oldMultiplicity, newMultiplicity);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setMultiplicity(MultiplicityRule newMultiplicity)
>+ {
>+ if (newMultiplicity != multiplicity)
>+ {
>+ NotificationChain msgs = null;
>+ if (multiplicity != null)
>+ msgs = ((InternalEObject)multiplicity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, null, msgs);
>+ if (newMultiplicity != null)
>+ msgs = ((InternalEObject)newMultiplicity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, null, msgs);
>+ msgs = basicSetMultiplicity(newMultiplicity, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, newMultiplicity, newMultiplicity));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setMultiplicity(MultiplicityRule newMultiplicity) {
>-		if(newMultiplicity != multiplicity) {
>-			NotificationChain msgs = null;
>-			if(multiplicity != null)
>-				msgs = ((InternalEObject)multiplicity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, null, msgs);
>-			if(newMultiplicity != null)
>-				msgs = ((InternalEObject)newMultiplicity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, null, msgs);
>-			msgs = basicSetMultiplicity(newMultiplicity, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY, newMultiplicity, newMultiplicity));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public ModifiersRule getModifiers()
>+ {
>+ return modifiers;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public ModifiersRule getModifiers() {
>-		return modifiers;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetModifiers(ModifiersRule newModifiers, NotificationChain msgs)
>+ {
>+ ModifiersRule oldModifiers = modifiers;
>+ modifiers = newModifiers;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MODIFIERS, oldModifiers, newModifiers);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetModifiers(ModifiersRule newModifiers, NotificationChain msgs) {
>-		ModifiersRule oldModifiers = modifiers;
>-		modifiers = newModifiers;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MODIFIERS, oldModifiers, newModifiers);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setModifiers(ModifiersRule newModifiers)
>+ {
>+ if (newModifiers != modifiers)
>+ {
>+ NotificationChain msgs = null;
>+ if (modifiers != null)
>+ msgs = ((InternalEObject)modifiers).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MODIFIERS, null, msgs);
>+ if (newModifiers != null)
>+ msgs = ((InternalEObject)newModifiers).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MODIFIERS, null, msgs);
>+ msgs = basicSetModifiers(newModifiers, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MODIFIERS, newModifiers, newModifiers));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setModifiers(ModifiersRule newModifiers) {
>-		if(newModifiers != modifiers) {
>-			NotificationChain msgs = null;
>-			if(modifiers != null)
>-				msgs = ((InternalEObject)modifiers).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MODIFIERS, null, msgs);
>-			if(newModifiers != null)
>-				msgs = ((InternalEObject)newModifiers).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__MODIFIERS, null, msgs);
>-			msgs = basicSetModifiers(newModifiers, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__MODIFIERS, newModifiers, newModifiers));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EffectRule getEffect()
>+ {
>+ return effect;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EffectRule getEffect() {
>-		return effect;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetEffect(EffectRule newEffect, NotificationChain msgs)
>+ {
>+ EffectRule oldEffect = effect;
>+ effect = newEffect;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__EFFECT, oldEffect, newEffect);
>+ if (msgs == null) msgs = notification; else msgs.add(notification);
>+ }
>+ return msgs;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetEffect(EffectRule newEffect, NotificationChain msgs) {
>-		EffectRule oldEffect = effect;
>-		effect = newEffect;
>-		if(eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__EFFECT, oldEffect, newEffect);
>-			if(msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setEffect(EffectRule newEffect)
>+ {
>+ if (newEffect != effect)
>+ {
>+ NotificationChain msgs = null;
>+ if (effect != null)
>+ msgs = ((InternalEObject)effect).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__EFFECT, null, msgs);
>+ if (newEffect != null)
>+ msgs = ((InternalEObject)newEffect).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__EFFECT, null, msgs);
>+ msgs = basicSetEffect(newEffect, msgs);
>+ if (msgs != null) msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__EFFECT, newEffect, newEffect));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setEffect(EffectRule newEffect) {
>-		if(newEffect != effect) {
>-			NotificationChain msgs = null;
>-			if(effect != null)
>-				msgs = ((InternalEObject)effect).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__EFFECT, null, msgs);
>-			if(newEffect != null)
>-				msgs = ((InternalEObject)newEffect).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlParameterPackage.PARAMETER_RULE__EFFECT, null, msgs);
>-			msgs = basicSetEffect(newEffect, msgs);
>-			if(msgs != null)
>-				msgs.dispatch();
>-		} else if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.PARAMETER_RULE__EFFECT, newEffect, newEffect));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE__TYPE:
>+ return basicSetType(null, msgs);
>+ case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>+ return basicSetMultiplicity(null, msgs);
>+ case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>+ return basicSetModifiers(null, msgs);
>+ case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>+ return basicSetEffect(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>-		switch(featureID) {
>-		case UmlParameterPackage.PARAMETER_RULE__TYPE:
>-			return basicSetType(null, msgs);
>-		case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>-			return basicSetMultiplicity(null, msgs);
>-		case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>-			return basicSetModifiers(null, msgs);
>-		case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>-			return basicSetEffect(null, msgs);
>-		}
>-		return super.eInverseRemove(otherEnd, featureID, msgs);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>+ return getVisibility();
>+ case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>+ return getDirection();
>+ case UmlParameterPackage.PARAMETER_RULE__NAME:
>+ return getName();
>+ case UmlParameterPackage.PARAMETER_RULE__TYPE:
>+ return getType();
>+ case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>+ return getMultiplicity();
>+ case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>+ return getModifiers();
>+ case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>+ return getEffect();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>-			return getVisibility();
>-		case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>-			return getDirection();
>-		case UmlParameterPackage.PARAMETER_RULE__NAME:
>-			return getName();
>-		case UmlParameterPackage.PARAMETER_RULE__TYPE:
>-			return getType();
>-		case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>-			return getMultiplicity();
>-		case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>-			return getModifiers();
>-		case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>-			return getEffect();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>+ setVisibility((VisibilityKind)newValue);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>+ setDirection((Direction)newValue);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__NAME:
>+ setName((String)newValue);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__TYPE:
>+ setType((TypeRule)newValue);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>+ setMultiplicity((MultiplicityRule)newValue);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>+ setModifiers((ModifiersRule)newValue);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>+ setEffect((EffectRule)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>-			setVisibility((VisibilityKind)newValue);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>-			setDirection((Direction)newValue);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__NAME:
>-			setName((String)newValue);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__TYPE:
>-			setType((TypeRule)newValue);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>-			setMultiplicity((MultiplicityRule)newValue);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>-			setModifiers((ModifiersRule)newValue);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>-			setEffect((EffectRule)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>+ setVisibility(VISIBILITY_EDEFAULT);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>+ setDirection(DIRECTION_EDEFAULT);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__NAME:
>+ setName(NAME_EDEFAULT);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__TYPE:
>+ setType((TypeRule)null);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>+ setMultiplicity((MultiplicityRule)null);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>+ setModifiers((ModifiersRule)null);
>+ return;
>+ case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>+ setEffect((EffectRule)null);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>-			setVisibility(VISIBILITY_EDEFAULT);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>-			setDirection(DIRECTION_EDEFAULT);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__NAME:
>-			setName(NAME_EDEFAULT);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__TYPE:
>-			setType((TypeRule)null);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>-			setMultiplicity((MultiplicityRule)null);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>-			setModifiers((ModifiersRule)null);
>-			return;
>-		case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>-			setEffect((EffectRule)null);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>+ return visibility != VISIBILITY_EDEFAULT;
>+ case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>+ return direction != DIRECTION_EDEFAULT;
>+ case UmlParameterPackage.PARAMETER_RULE__NAME:
>+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
>+ case UmlParameterPackage.PARAMETER_RULE__TYPE:
>+ return type != null;
>+ case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>+ return multiplicity != null;
>+ case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>+ return modifiers != null;
>+ case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>+ return effect != null;
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.PARAMETER_RULE__VISIBILITY:
>-			return visibility != VISIBILITY_EDEFAULT;
>-		case UmlParameterPackage.PARAMETER_RULE__DIRECTION:
>-			return direction != DIRECTION_EDEFAULT;
>-		case UmlParameterPackage.PARAMETER_RULE__NAME:
>-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
>-		case UmlParameterPackage.PARAMETER_RULE__TYPE:
>-			return type != null;
>-		case UmlParameterPackage.PARAMETER_RULE__MULTIPLICITY:
>-			return multiplicity != null;
>-		case UmlParameterPackage.PARAMETER_RULE__MODIFIERS:
>-			return modifiers != null;
>-		case UmlParameterPackage.PARAMETER_RULE__EFFECT:
>-			return effect != null;
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy()) return super.toString();
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		if(eIsProxy())
>-			return super.toString();
>-
>-		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (visibility: ");
>-		result.append(visibility);
>-		result.append(", direction: ");
>-		result.append(direction);
>-		result.append(", name: ");
>-		result.append(name);
>-		result.append(')');
>-		return result.toString();
>-	}
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (visibility: ");
>+ result.append(visibility);
>+ result.append(", direction: ");
>+ result.append(direction);
>+ result.append(", name: ");
>+ result.append(name);
>+ result.append(')');
>+ return result.toString();
>+ }
> 
> } //ParameterRuleImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/UmlParameterFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/UmlParameterFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/UmlParameterFactoryImpl.java	(working copy)
>@@ -21,209 +21,209 @@
> * 
> * An implementation of the model Factory.
> * 
>- * 
> * @generated
> */
>-public class UmlParameterFactoryImpl extends EFactoryImpl implements UmlParameterFactory {
>+public class UmlParameterFactoryImpl extends EFactoryImpl implements UmlParameterFactory
>+{
>+ /**
>+ * Creates the default factory implementation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static UmlParameterFactory init()
>+ {
>+ try
>+ {
>+ UmlParameterFactory theUmlParameterFactory = (UmlParameterFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter"); 
>+ if (theUmlParameterFactory != null)
>+ {
>+ return theUmlParameterFactory;
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ EcorePlugin.INSTANCE.log(exception);
>+ }
>+ return new UmlParameterFactoryImpl();
>+ }
> 
>-	/**
>-	 * Creates the default factory implementation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static UmlParameterFactory init() {
>-		try {
>-			UmlParameterFactory theUmlParameterFactory = (UmlParameterFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter");
>-			if(theUmlParameterFactory != null) {
>-				return theUmlParameterFactory;
>-			}
>-		} catch (Exception exception) {
>-			EcorePlugin.INSTANCE.log(exception);
>-		}
>-		return new UmlParameterFactoryImpl();
>-	}
>+ /**
>+ * Creates an instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterFactoryImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * Creates an instance of the factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterFactoryImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public EObject create(EClass eClass)
>+ {
>+ switch (eClass.getClassifierID())
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE: return createParameterRule();
>+ case UmlParameterPackage.MODIFIERS_RULE: return createModifiersRule();
>+ case UmlParameterPackage.MODIFIER_SPECIFICATION: return createModifierSpecification();
>+ case UmlParameterPackage.EFFECT_RULE: return createEffectRule();
>+ default:
>+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public EObject create(EClass eClass) {
>-		switch(eClass.getClassifierID()) {
>-		case UmlParameterPackage.PARAMETER_RULE:
>-			return createParameterRule();
>-		case UmlParameterPackage.MODIFIERS_RULE:
>-			return createModifiersRule();
>-		case UmlParameterPackage.MODIFIER_SPECIFICATION:
>-			return createModifierSpecification();
>-		case UmlParameterPackage.EFFECT_RULE:
>-			return createEffectRule();
>-		default:
>-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object createFromString(EDataType eDataType, String initialValue)
>+ {
>+ switch (eDataType.getClassifierID())
>+ {
>+ case UmlParameterPackage.MODIFIER_KIND:
>+ return createModifierKindFromString(eDataType, initialValue);
>+ case UmlParameterPackage.EFFECT_KIND:
>+ return createEffectKindFromString(eDataType, initialValue);
>+ default:
>+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object createFromString(EDataType eDataType, String initialValue) {
>-		switch(eDataType.getClassifierID()) {
>-		case UmlParameterPackage.MODIFIER_KIND:
>-			return createModifierKindFromString(eDataType, initialValue);
>-		case UmlParameterPackage.EFFECT_KIND:
>-			return createEffectKindFromString(eDataType, initialValue);
>-		default:
>-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String convertToString(EDataType eDataType, Object instanceValue)
>+ {
>+ switch (eDataType.getClassifierID())
>+ {
>+ case UmlParameterPackage.MODIFIER_KIND:
>+ return convertModifierKindToString(eDataType, instanceValue);
>+ case UmlParameterPackage.EFFECT_KIND:
>+ return convertEffectKindToString(eDataType, instanceValue);
>+ default:
>+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>+ }
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String convertToString(EDataType eDataType, Object instanceValue) {
>-		switch(eDataType.getClassifierID()) {
>-		case UmlParameterPackage.MODIFIER_KIND:
>-			return convertModifierKindToString(eDataType, instanceValue);
>-		case UmlParameterPackage.EFFECT_KIND:
>-			return convertEffectKindToString(eDataType, instanceValue);
>-		default:
>-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>-		}
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public ParameterRule createParameterRule()
>+ {
>+ ParameterRuleImpl parameterRule = new ParameterRuleImpl();
>+ return parameterRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public ParameterRule createParameterRule() {
>-		ParameterRuleImpl parameterRule = new ParameterRuleImpl();
>-		return parameterRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public ModifiersRule createModifiersRule()
>+ {
>+ ModifiersRuleImpl modifiersRule = new ModifiersRuleImpl();
>+ return modifiersRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public ModifiersRule createModifiersRule() {
>-		ModifiersRuleImpl modifiersRule = new ModifiersRuleImpl();
>-		return modifiersRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public ModifierSpecification createModifierSpecification()
>+ {
>+ ModifierSpecificationImpl modifierSpecification = new ModifierSpecificationImpl();
>+ return modifierSpecification;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public ModifierSpecification createModifierSpecification() {
>-		ModifierSpecificationImpl modifierSpecification = new ModifierSpecificationImpl();
>-		return modifierSpecification;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EffectRule createEffectRule()
>+ {
>+ EffectRuleImpl effectRule = new EffectRuleImpl();
>+ return effectRule;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EffectRule createEffectRule() {
>-		EffectRuleImpl effectRule = new EffectRuleImpl();
>-		return effectRule;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public ModifierKind createModifierKindFromString(EDataType eDataType, String initialValue)
>+ {
>+ ModifierKind result = ModifierKind.get(initialValue);
>+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+ return result;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public ModifierKind createModifierKindFromString(EDataType eDataType, String initialValue) {
>-		ModifierKind result = ModifierKind.get(initialValue);
>-		if(result == null)
>-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>-		return result;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String convertModifierKindToString(EDataType eDataType, Object instanceValue)
>+ {
>+ return instanceValue == null ? null : instanceValue.toString();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String convertModifierKindToString(EDataType eDataType, Object instanceValue) {
>-		return instanceValue == null ? null : instanceValue.toString();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EffectKind createEffectKindFromString(EDataType eDataType, String initialValue)
>+ {
>+ EffectKind result = EffectKind.get(initialValue);
>+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+ return result;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EffectKind createEffectKindFromString(EDataType eDataType, String initialValue) {
>-		EffectKind result = EffectKind.get(initialValue);
>-		if(result == null)
>-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>-		return result;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String convertEffectKindToString(EDataType eDataType, Object instanceValue)
>+ {
>+ return instanceValue == null ? null : instanceValue.toString();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String convertEffectKindToString(EDataType eDataType, Object instanceValue) {
>-		return instanceValue == null ? null : instanceValue.toString();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterPackage getUmlParameterPackage()
>+ {
>+ return (UmlParameterPackage)getEPackage();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterPackage getUmlParameterPackage() {
>-		return (UmlParameterPackage)getEPackage();
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @deprecated
>-	 * @generated
>-	 */
>-	@Deprecated
>-	public static UmlParameterPackage getPackage() {
>-		return UmlParameterPackage.eINSTANCE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @deprecated
>+ * @generated
>+ */
>+ @Deprecated
>+ public static UmlParameterPackage getPackage()
>+ {
>+ return UmlParameterPackage.eINSTANCE;
>+ }
> 
> } //UmlParameterFactoryImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/EffectRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/EffectRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/EffectRuleImpl.java	(working copy)
>@@ -24,158 +24,159 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl#getEffectKind Effect Kind}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl#getEffectKind Effect Kind}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class EffectRuleImpl extends MinimalEObjectImpl.Container implements EffectRule {
>+public class EffectRuleImpl extends MinimalEObjectImpl.Container implements EffectRule
>+{
>+ /**
>+ * The default value of the '{@link #getEffectKind() Effect Kind}' attribute.
>+ * 
>+ * 
>+ * @see #getEffectKind()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final EffectKind EFFECT_KIND_EDEFAULT = EffectKind.CREATE;
> 
>-	/**
>-	 * The default value of the '{@link #getEffectKind() Effect Kind}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getEffectKind()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final EffectKind EFFECT_KIND_EDEFAULT = EffectKind.CREATE;
>+ /**
>+ * The cached value of the '{@link #getEffectKind() Effect Kind}' attribute.
>+ * 
>+ * 
>+ * @see #getEffectKind()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EffectKind effectKind = EFFECT_KIND_EDEFAULT;
> 
>-	/**
>-	 * The cached value of the '{@link #getEffectKind() Effect Kind}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getEffectKind()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected EffectKind effectKind = EFFECT_KIND_EDEFAULT;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected EffectRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected EffectRuleImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlParameterPackage.Literals.EFFECT_RULE;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlParameterPackage.Literals.EFFECT_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EffectKind getEffectKind()
>+ {
>+ return effectKind;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EffectKind getEffectKind() {
>-		return effectKind;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setEffectKind(EffectKind newEffectKind)
>+ {
>+ EffectKind oldEffectKind = effectKind;
>+ effectKind = newEffectKind == null ? EFFECT_KIND_EDEFAULT : newEffectKind;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.EFFECT_RULE__EFFECT_KIND, oldEffectKind, effectKind));
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setEffectKind(EffectKind newEffectKind) {
>-		EffectKind oldEffectKind = effectKind;
>-		effectKind = newEffectKind == null ? EFFECT_KIND_EDEFAULT : newEffectKind;
>-		if(eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, UmlParameterPackage.EFFECT_RULE__EFFECT_KIND, oldEffectKind, effectKind));
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>+ return getEffectKind();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>-			return getEffectKind();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>+ setEffectKind((EffectKind)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>-			setEffectKind((EffectKind)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>+ setEffectKind(EFFECT_KIND_EDEFAULT);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>-			setEffectKind(EFFECT_KIND_EDEFAULT);
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>+ return effectKind != EFFECT_KIND_EDEFAULT;
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.EFFECT_RULE__EFFECT_KIND:
>-			return effectKind != EFFECT_KIND_EDEFAULT;
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy()) return super.toString();
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		if(eIsProxy())
>-			return super.toString();
>-
>-		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (effectKind: ");
>-		result.append(effectKind);
>-		result.append(')');
>-		return result.toString();
>-	}
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (effectKind: ");
>+ result.append(effectKind);
>+ result.append(')');
>+ return result.toString();
>+ }
> 
> } //EffectRuleImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/UmlParameterPackageImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/UmlParameterPackageImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/UmlParameterPackageImpl.java	(working copy)
>@@ -29,407 +29,398 @@
> * 
> * An implementation of the model Package.
> * 
>- * 
> * @generated
> */
>-public class UmlParameterPackageImpl extends EPackageImpl implements UmlParameterPackage {
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass parameterRuleEClass = null;
>+public class UmlParameterPackageImpl extends EPackageImpl implements UmlParameterPackage
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass parameterRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass modifiersRuleEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass modifiersRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass modifierSpecificationEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass modifierSpecificationEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EClass effectRuleEClass = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass effectRuleEClass = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EEnum modifierKindEEnum = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EEnum modifierKindEEnum = null;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EEnum effectKindEEnum = null;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EEnum effectKindEEnum = null;
> 
>-	/**
>-	 * Creates an instance of the model Package, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
>-	 * package
>-	 * package URI value.
>-	 * 
>-	 * 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.  
>-	 * 
>-	 * @see org.eclipse.emf.ecore.EPackage.Registry
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#eNS_URI
>-	 * @see #init()
>-	 * @generated
>-	 */
>-	private UmlParameterPackageImpl() {
>-		super(eNS_URI, UmlParameterFactory.eINSTANCE);
>-	}
>+ /**
>+ * Creates an instance of the model Package, registered with
>+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+ * package URI value.
>+ * 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.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.ecore.EPackage.Registry
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#eNS_URI
>+ * @see #init()
>+ * @generated
>+ */
>+ private UmlParameterPackageImpl()
>+ {
>+ super(eNS_URI, UmlParameterFactory.eINSTANCE);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static boolean isInited = false;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static boolean isInited = false;
> 
>-	/**
>-	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>-	 * 
>-	 * 
>-	 * This method is used to initialize {@link UmlParameterPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.
>-	 * Instead, they should simply access that field to obtain the package.  
>-	 * 
>-	 * @see #eNS_URI
>-	 * @see #createPackageContents()
>-	 * @see #initializePackageContents()
>-	 * @generated
>-	 */
>-	public static UmlParameterPackage init() {
>-		if(isInited)
>-			return (UmlParameterPackage)EPackage.Registry.INSTANCE.getEPackage(UmlParameterPackage.eNS_URI);
>+ /**
>+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+ * 
>+ * This method is used to initialize {@link UmlParameterPackage#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
>+ * @see #eNS_URI
>+ * @see #createPackageContents()
>+ * @see #initializePackageContents()
>+ * @generated
>+ */
>+ public static UmlParameterPackage init()
>+ {
>+ if (isInited) return (UmlParameterPackage)EPackage.Registry.INSTANCE.getEPackage(UmlParameterPackage.eNS_URI);
> 
>-		// Obtain or create and register package
>-		UmlParameterPackageImpl theUmlParameterPackage = (UmlParameterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlParameterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlParameterPackageImpl());
>+ // Obtain or create and register package
>+ UmlParameterPackageImpl theUmlParameterPackage = (UmlParameterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UmlParameterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UmlParameterPackageImpl());
> 
>-		isInited = true;
>+ isInited = true;
> 
>-		// Initialize simple dependencies
>-		UmlCommonPackage.eINSTANCE.eClass();
>+ // Initialize simple dependencies
>+ UmlCommonPackage.eINSTANCE.eClass();
> 
>-		// Create package meta-data objects
>-		theUmlParameterPackage.createPackageContents();
>+ // Create package meta-data objects
>+ theUmlParameterPackage.createPackageContents();
> 
>-		// Initialize created meta-data
>-		theUmlParameterPackage.initializePackageContents();
>+ // Initialize created meta-data
>+ theUmlParameterPackage.initializePackageContents();
> 
>-		// Mark meta-data to indicate it can't be changed
>-		theUmlParameterPackage.freeze();
>+ // Mark meta-data to indicate it can't be changed
>+ theUmlParameterPackage.freeze();
> 
>+ 
>+ // Update the registry and return the package
>+ EPackage.Registry.INSTANCE.put(UmlParameterPackage.eNS_URI, theUmlParameterPackage);
>+ return theUmlParameterPackage;
>+ }
> 
>-		// Update the registry and return the package
>-		EPackage.Registry.INSTANCE.put(UmlParameterPackage.eNS_URI, theUmlParameterPackage);
>-		return theUmlParameterPackage;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getParameterRule()
>+ {
>+ return parameterRuleEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getParameterRule() {
>-		return parameterRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getParameterRule_Visibility()
>+ {
>+ return (EAttribute)parameterRuleEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getParameterRule_Visibility() {
>-		return (EAttribute)parameterRuleEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getParameterRule_Direction()
>+ {
>+ return (EAttribute)parameterRuleEClass.getEStructuralFeatures().get(1);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getParameterRule_Direction() {
>-		return (EAttribute)parameterRuleEClass.getEStructuralFeatures().get(1);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getParameterRule_Name()
>+ {
>+ return (EAttribute)parameterRuleEClass.getEStructuralFeatures().get(2);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getParameterRule_Name() {
>-		return (EAttribute)parameterRuleEClass.getEStructuralFeatures().get(2);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getParameterRule_Type()
>+ {
>+ return (EReference)parameterRuleEClass.getEStructuralFeatures().get(3);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getParameterRule_Type() {
>-		return (EReference)parameterRuleEClass.getEStructuralFeatures().get(3);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getParameterRule_Multiplicity()
>+ {
>+ return (EReference)parameterRuleEClass.getEStructuralFeatures().get(4);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getParameterRule_Multiplicity() {
>-		return (EReference)parameterRuleEClass.getEStructuralFeatures().get(4);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getParameterRule_Modifiers()
>+ {
>+ return (EReference)parameterRuleEClass.getEStructuralFeatures().get(5);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getParameterRule_Modifiers() {
>-		return (EReference)parameterRuleEClass.getEStructuralFeatures().get(5);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getParameterRule_Effect()
>+ {
>+ return (EReference)parameterRuleEClass.getEStructuralFeatures().get(6);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getParameterRule_Effect() {
>-		return (EReference)parameterRuleEClass.getEStructuralFeatures().get(6);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getModifiersRule()
>+ {
>+ return modifiersRuleEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getModifiersRule() {
>-		return modifiersRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getModifiersRule_Values()
>+ {
>+ return (EReference)modifiersRuleEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EReference getModifiersRule_Values() {
>-		return (EReference)modifiersRuleEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getModifierSpecification()
>+ {
>+ return modifierSpecificationEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getModifierSpecification() {
>-		return modifierSpecificationEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getModifierSpecification_Value()
>+ {
>+ return (EAttribute)modifierSpecificationEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getModifierSpecification_Value() {
>-		return (EAttribute)modifierSpecificationEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getEffectRule()
>+ {
>+ return effectRuleEClass;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EClass getEffectRule() {
>-		return effectRuleEClass;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getEffectRule_EffectKind()
>+ {
>+ return (EAttribute)effectRuleEClass.getEStructuralFeatures().get(0);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getEffectRule_EffectKind() {
>-		return (EAttribute)effectRuleEClass.getEStructuralFeatures().get(0);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EEnum getModifierKind()
>+ {
>+ return modifierKindEEnum;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EEnum getModifierKind() {
>-		return modifierKindEEnum;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EEnum getEffectKind()
>+ {
>+ return effectKindEEnum;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EEnum getEffectKind() {
>-		return effectKindEEnum;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterFactory getUmlParameterFactory()
>+ {
>+ return (UmlParameterFactory)getEFactoryInstance();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterFactory getUmlParameterFactory() {
>-		return (UmlParameterFactory)getEFactoryInstance();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private boolean isCreated = false;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private boolean isCreated = false;
>+ /**
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void createPackageContents()
>+ {
>+ if (isCreated) return;
>+ isCreated = true;
> 
>-	/**
>-	 * Creates the meta-model objects for the package. This method is
>-	 * guarded to have no affect on any invocation but its first.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void createPackageContents() {
>-		if(isCreated)
>-			return;
>-		isCreated = true;
>+ // Create classes and their features
>+ parameterRuleEClass = createEClass(PARAMETER_RULE);
>+ createEAttribute(parameterRuleEClass, PARAMETER_RULE__VISIBILITY);
>+ createEAttribute(parameterRuleEClass, PARAMETER_RULE__DIRECTION);
>+ createEAttribute(parameterRuleEClass, PARAMETER_RULE__NAME);
>+ createEReference(parameterRuleEClass, PARAMETER_RULE__TYPE);
>+ createEReference(parameterRuleEClass, PARAMETER_RULE__MULTIPLICITY);
>+ createEReference(parameterRuleEClass, PARAMETER_RULE__MODIFIERS);
>+ createEReference(parameterRuleEClass, PARAMETER_RULE__EFFECT);
> 
>-		// Create classes and their features
>-		parameterRuleEClass = createEClass(PARAMETER_RULE);
>-		createEAttribute(parameterRuleEClass, PARAMETER_RULE__VISIBILITY);
>-		createEAttribute(parameterRuleEClass, PARAMETER_RULE__DIRECTION);
>-		createEAttribute(parameterRuleEClass, PARAMETER_RULE__NAME);
>-		createEReference(parameterRuleEClass, PARAMETER_RULE__TYPE);
>-		createEReference(parameterRuleEClass, PARAMETER_RULE__MULTIPLICITY);
>-		createEReference(parameterRuleEClass, PARAMETER_RULE__MODIFIERS);
>-		createEReference(parameterRuleEClass, PARAMETER_RULE__EFFECT);
>+ modifiersRuleEClass = createEClass(MODIFIERS_RULE);
>+ createEReference(modifiersRuleEClass, MODIFIERS_RULE__VALUES);
> 
>-		modifiersRuleEClass = createEClass(MODIFIERS_RULE);
>-		createEReference(modifiersRuleEClass, MODIFIERS_RULE__VALUES);
>+ modifierSpecificationEClass = createEClass(MODIFIER_SPECIFICATION);
>+ createEAttribute(modifierSpecificationEClass, MODIFIER_SPECIFICATION__VALUE);
> 
>-		modifierSpecificationEClass = createEClass(MODIFIER_SPECIFICATION);
>-		createEAttribute(modifierSpecificationEClass, MODIFIER_SPECIFICATION__VALUE);
>+ effectRuleEClass = createEClass(EFFECT_RULE);
>+ createEAttribute(effectRuleEClass, EFFECT_RULE__EFFECT_KIND);
> 
>-		effectRuleEClass = createEClass(EFFECT_RULE);
>-		createEAttribute(effectRuleEClass, EFFECT_RULE__EFFECT_KIND);
>+ // Create enums
>+ modifierKindEEnum = createEEnum(MODIFIER_KIND);
>+ effectKindEEnum = createEEnum(EFFECT_KIND);
>+ }
> 
>-		// Create enums
>-		modifierKindEEnum = createEEnum(MODIFIER_KIND);
>-		effectKindEEnum = createEEnum(EFFECT_KIND);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private boolean isInitialized = false;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private boolean isInitialized = false;
>+ /**
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void initializePackageContents()
>+ {
>+ if (isInitialized) return;
>+ isInitialized = true;
> 
>-	/**
>-	 * Complete the initialization of the package and its meta-model. This
>-	 * method is guarded to have no affect on any invocation but its first.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void initializePackageContents() {
>-		if(isInitialized)
>-			return;
>-		isInitialized = true;
>+ // Initialize package
>+ setName(eNAME);
>+ setNsPrefix(eNS_PREFIX);
>+ setNsURI(eNS_URI);
> 
>-		// Initialize package
>-		setName(eNAME);
>-		setNsPrefix(eNS_PREFIX);
>-		setNsURI(eNS_URI);
>+ // Obtain other dependent packages
>+ UmlCommonPackage theUmlCommonPackage = (UmlCommonPackage)EPackage.Registry.INSTANCE.getEPackage(UmlCommonPackage.eNS_URI);
> 
>-		// Obtain other dependent packages
>-		UmlCommonPackage theUmlCommonPackage = (UmlCommonPackage)EPackage.Registry.INSTANCE.getEPackage(UmlCommonPackage.eNS_URI);
>+ // Create type parameters
> 
>-		// Create type parameters
>+ // Set bounds for type parameters
> 
>-		// Set bounds for type parameters
>+ // Add supertypes to classes
> 
>-		// Add supertypes to classes
>+ // Initialize classes and features; add operations and parameters
>+ initEClass(parameterRuleEClass, ParameterRule.class, "ParameterRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getParameterRule_Visibility(), theUmlCommonPackage.getVisibilityKind(), "visibility", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getParameterRule_Direction(), theUmlCommonPackage.getDirection(), "direction", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getParameterRule_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getParameterRule_Type(), theUmlCommonPackage.getTypeRule(), null, "type", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getParameterRule_Multiplicity(), theUmlCommonPackage.getMultiplicityRule(), null, "multiplicity", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getParameterRule_Modifiers(), this.getModifiersRule(), null, "modifiers", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getParameterRule_Effect(), this.getEffectRule(), null, "effect", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		// Initialize classes and features; add operations and parameters
>-		initEClass(parameterRuleEClass, ParameterRule.class, "ParameterRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEAttribute(getParameterRule_Visibility(), theUmlCommonPackage.getVisibilityKind(), "visibility", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEAttribute(getParameterRule_Direction(), theUmlCommonPackage.getDirection(), "direction", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEAttribute(getParameterRule_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEReference(getParameterRule_Type(), theUmlCommonPackage.getTypeRule(), null, "type", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEReference(getParameterRule_Multiplicity(), theUmlCommonPackage.getMultiplicityRule(), null, "multiplicity", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEReference(getParameterRule_Modifiers(), this.getModifiersRule(), null, "modifiers", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>-		initEReference(getParameterRule_Effect(), this.getEffectRule(), null, "effect", null, 0, 1, ParameterRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEClass(modifiersRuleEClass, ModifiersRule.class, "ModifiersRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEReference(getModifiersRule_Values(), this.getModifierSpecification(), null, "values", null, 0, -1, ModifiersRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		initEClass(modifiersRuleEClass, ModifiersRule.class, "ModifiersRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEReference(getModifiersRule_Values(), this.getModifierSpecification(), null, "values", null, 0, -1, ModifiersRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEClass(modifierSpecificationEClass, ModifierSpecification.class, "ModifierSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getModifierSpecification_Value(), this.getModifierKind(), "value", null, 0, 1, ModifierSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		initEClass(modifierSpecificationEClass, ModifierSpecification.class, "ModifierSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEAttribute(getModifierSpecification_Value(), this.getModifierKind(), "value", null, 0, 1, ModifierSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEClass(effectRuleEClass, EffectRule.class, "EffectRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getEffectRule_EffectKind(), this.getEffectKind(), "effectKind", null, 0, 1, EffectRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>-		initEClass(effectRuleEClass, EffectRule.class, "EffectRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>-		initEAttribute(getEffectRule_EffectKind(), this.getEffectKind(), "effectKind", null, 0, 1, EffectRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ // Initialize enums and add enum literals
>+ initEEnum(modifierKindEEnum, ModifierKind.class, "ModifierKind");
>+ addEEnumLiteral(modifierKindEEnum, ModifierKind.EXCEPTION);
>+ addEEnumLiteral(modifierKindEEnum, ModifierKind.STREAM);
>+ addEEnumLiteral(modifierKindEEnum, ModifierKind.ORDERED);
>+ addEEnumLiteral(modifierKindEEnum, ModifierKind.UNIQUE);
> 
>-		// Initialize enums and add enum literals
>-		initEEnum(modifierKindEEnum, ModifierKind.class, "ModifierKind");
>-		addEEnumLiteral(modifierKindEEnum, ModifierKind.EXCEPTION);
>-		addEEnumLiteral(modifierKindEEnum, ModifierKind.STREAM);
>-		addEEnumLiteral(modifierKindEEnum, ModifierKind.ORDERED);
>-		addEEnumLiteral(modifierKindEEnum, ModifierKind.UNIQUE);
>+ initEEnum(effectKindEEnum, EffectKind.class, "EffectKind");
>+ addEEnumLiteral(effectKindEEnum, EffectKind.CREATE);
>+ addEEnumLiteral(effectKindEEnum, EffectKind.READ);
>+ addEEnumLiteral(effectKindEEnum, EffectKind.UPDATE);
>+ addEEnumLiteral(effectKindEEnum, EffectKind.DELETE);
> 
>-		initEEnum(effectKindEEnum, EffectKind.class, "EffectKind");
>-		addEEnumLiteral(effectKindEEnum, EffectKind.CREATE);
>-		addEEnumLiteral(effectKindEEnum, EffectKind.READ);
>-		addEEnumLiteral(effectKindEEnum, EffectKind.UPDATE);
>-		addEEnumLiteral(effectKindEEnum, EffectKind.DELETE);
>-
>-		// Create resource
>-		createResource(eNS_URI);
>-	}
>+ // Create resource
>+ createResource(eNS_URI);
>+ }
> 
> } //UmlParameterPackageImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ModifiersRuleImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ModifiersRuleImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/impl/ModifiersRuleImpl.java	(working copy)
>@@ -31,136 +31,141 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl#getValues Values}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl#getValues Values}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
>-public class ModifiersRuleImpl extends MinimalEObjectImpl.Container implements ModifiersRule {
>+public class ModifiersRuleImpl extends MinimalEObjectImpl.Container implements ModifiersRule
>+{
>+ /**
>+ * The cached value of the '{@link #getValues() Values}' containment reference list.
>+ * 
>+ * 
>+ * @see #getValues()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<ModifierSpecification> values;
> 
>-	/**
>-	 * The cached value of the '{@link #getValues() Values}' containment reference list.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #getValues()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected EList<ModifierSpecification> values;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected ModifiersRuleImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected ModifiersRuleImpl() {
>-		super();
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return UmlParameterPackage.Literals.MODIFIERS_RULE;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected EClass eStaticClass() {
>-		return UmlParameterPackage.Literals.MODIFIERS_RULE;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<ModifierSpecification> getValues()
>+ {
>+ if (values == null)
>+ {
>+ values = new EObjectContainmentEList<ModifierSpecification>(ModifierSpecification.class, this, UmlParameterPackage.MODIFIERS_RULE__VALUES);
>+ }
>+ return values;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EList<ModifierSpecification> getValues() {
>-		if(values == null) {
>-			values = new EObjectContainmentEList<ModifierSpecification>(ModifierSpecification.class, this, UmlParameterPackage.MODIFIERS_RULE__VALUES);
>-		}
>-		return values;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>+ return ((InternalEList<?>)getValues()).basicRemove(otherEnd, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>-			return ((InternalEList<?>)getValues()).basicRemove(otherEnd, msgs);
>-		}
>-		return super.eInverseRemove(otherEnd, featureID, msgs);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>+ return getValues();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>-			return getValues();
>-		}
>-		return super.eGet(featureID, resolve, coreType);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>+ getValues().clear();
>+ getValues().addAll((Collection<? extends ModifierSpecification>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@SuppressWarnings("unchecked")
>-	@Override
>-	public void eSet(int featureID, Object newValue) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>-			getValues().clear();
>-			getValues().addAll((Collection<? extends ModifierSpecification>)newValue);
>-			return;
>-		}
>-		super.eSet(featureID, newValue);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>+ getValues().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public void eUnset(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>-			getValues().clear();
>-			return;
>-		}
>-		super.eUnset(featureID);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean eIsSet(int featureID) {
>-		switch(featureID) {
>-		case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>-			return values != null && !values.isEmpty();
>-		}
>-		return super.eIsSet(featureID);
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case UmlParameterPackage.MODIFIERS_RULE__VALUES:
>+ return values != null && !values.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
> 
> } //ModifiersRuleImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/EffectRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/EffectRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/EffectRule.java	(working copy)
>@@ -12,50 +12,47 @@
> * 
> * A representation of the model object 'Effect Rule'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind Effect Kind}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind Effect Kind}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getEffectRule()
> * @model
> * @generated
> */
>-public interface EffectRule extends EObject {
>+public interface EffectRule extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Effect Kind' attribute.
>+ * The literals are from the enumeration {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind}.
>+ * 
>+ * 
>+ * If the meaning of the 'Effect Kind' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Effect Kind' attribute.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>+ * @see #setEffectKind(EffectKind)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getEffectRule_EffectKind()
>+ * @model
>+ * @generated
>+ */
>+ EffectKind getEffectKind();
> 
>-	/**
>-	 * Returns the value of the 'Effect Kind' attribute.
>-	 * The literals are from the enumeration {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Effect Kind' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Effect Kind' attribute.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>-	 * @see #setEffectKind(EffectKind)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getEffectRule_EffectKind()
>-	 * @model
>-	 * @generated
>-	 */
>-	EffectKind getEffectKind();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind Effect Kind}'
>-	 * attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Effect Kind' attribute.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>-	 * @see #getEffectKind()
>-	 * @generated
>-	 */
>-	void setEffectKind(EffectKind value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind Effect Kind}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Effect Kind' attribute.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>+ * @see #getEffectKind()
>+ * @generated
>+ */
>+ void setEffectKind(EffectKind value);
> 
> } // EffectRule
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifierKind.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifierKind.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifierKind.java	(working copy)
>@@ -17,266 +17,265 @@
> * A representation of the literals of the enumeration 'Modifier Kind',
> * and utility methods for working with them.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifierKind()
> * @model
> * @generated
> */
>-public enum ModifierKind implements Enumerator {
>-	/**
>-	 * The 'EXCEPTION' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #EXCEPTION_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	EXCEPTION(0, "EXCEPTION", "exception"),
>+public enum ModifierKind implements Enumerator
>+{
>+ /**
>+ * The 'EXCEPTION' literal object.
>+ * 
>+ * 
>+ * @see #EXCEPTION_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ EXCEPTION(0, "EXCEPTION", "exception"),
> 
>-	/**
>-	 * The 'STREAM' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #STREAM_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	STREAM(1, "STREAM", "stream"),
>+ /**
>+ * The 'STREAM' literal object.
>+ * 
>+ * 
>+ * @see #STREAM_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ STREAM(1, "STREAM", "stream"),
> 
>-	/**
>-	 * The 'ORDERED' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #ORDERED_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	ORDERED(2, "ORDERED", "ordered"),
>+ /**
>+ * The 'ORDERED' literal object.
>+ * 
>+ * 
>+ * @see #ORDERED_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ ORDERED(2, "ORDERED", "ordered"),
> 
>-	/**
>-	 * The 'UNIQUE' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #UNIQUE_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	UNIQUE(3, "UNIQUE", "unique");
>+ /**
>+ * The 'UNIQUE' literal object.
>+ * 
>+ * 
>+ * @see #UNIQUE_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ UNIQUE(3, "UNIQUE", "unique");
> 
>-	/**
>-	 * The 'EXCEPTION' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'EXCEPTION' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #EXCEPTION
>-	 * @model literal="exception"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int EXCEPTION_VALUE = 0;
>+ /**
>+ * The 'EXCEPTION' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'EXCEPTION' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #EXCEPTION
>+ * @model literal="exception"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int EXCEPTION_VALUE = 0;
> 
>-	/**
>-	 * The 'STREAM' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'STREAM' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #STREAM
>-	 * @model literal="stream"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int STREAM_VALUE = 1;
>+ /**
>+ * The 'STREAM' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'STREAM' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #STREAM
>+ * @model literal="stream"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int STREAM_VALUE = 1;
> 
>-	/**
>-	 * The 'ORDERED' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'ORDERED' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #ORDERED
>-	 * @model literal="ordered"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int ORDERED_VALUE = 2;
>+ /**
>+ * The 'ORDERED' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'ORDERED' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #ORDERED
>+ * @model literal="ordered"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int ORDERED_VALUE = 2;
> 
>-	/**
>-	 * The 'UNIQUE' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'UNIQUE' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #UNIQUE
>-	 * @model literal="unique"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int UNIQUE_VALUE = 3;
>+ /**
>+ * The 'UNIQUE' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'UNIQUE' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #UNIQUE
>+ * @model literal="unique"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int UNIQUE_VALUE = 3;
> 
>-	/**
>-	 * An array of all the 'Modifier Kind' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static final ModifierKind[] VALUES_ARRAY = new ModifierKind[]{ EXCEPTION, STREAM, ORDERED, UNIQUE, };
>+ /**
>+ * An array of all the 'Modifier Kind' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static final ModifierKind[] VALUES_ARRAY =
>+ new ModifierKind[]
>+ {
>+ EXCEPTION,
>+ STREAM,
>+ ORDERED,
>+ UNIQUE,
>+ };
> 
>-	/**
>-	 * A public read-only list of all the 'Modifier Kind' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static final List<ModifierKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+ /**
>+ * A public read-only list of all the 'Modifier Kind' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final List<ModifierKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
>-	/**
>-	 * Returns the 'Modifier Kind' literal with the specified literal value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static ModifierKind get(String literal) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			ModifierKind result = VALUES_ARRAY[i];
>-			if(result.toString().equals(literal)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Modifier Kind' literal with the specified literal value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static ModifierKind get(String literal)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ ModifierKind result = VALUES_ARRAY[i];
>+ if (result.toString().equals(literal))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Modifier Kind' literal with the specified name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static ModifierKind getByName(String name) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			ModifierKind result = VALUES_ARRAY[i];
>-			if(result.getName().equals(name)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Modifier Kind' literal with the specified name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static ModifierKind getByName(String name)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ ModifierKind result = VALUES_ARRAY[i];
>+ if (result.getName().equals(name))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Modifier Kind' literal with the specified integer value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static ModifierKind get(int value) {
>-		switch(value) {
>-		case EXCEPTION_VALUE:
>-			return EXCEPTION;
>-		case STREAM_VALUE:
>-			return STREAM;
>-		case ORDERED_VALUE:
>-			return ORDERED;
>-		case UNIQUE_VALUE:
>-			return UNIQUE;
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Modifier Kind' literal with the specified integer value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static ModifierKind get(int value)
>+ {
>+ switch (value)
>+ {
>+ case EXCEPTION_VALUE: return EXCEPTION;
>+ case STREAM_VALUE: return STREAM;
>+ case ORDERED_VALUE: return ORDERED;
>+ case UNIQUE_VALUE: return UNIQUE;
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final int value;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String name;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String literal;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
> 
>-	/**
>-	 * Only this class can construct instances.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private ModifierKind(int value, String name, String literal) {
>-		this.value = value;
>-		this.name = name;
>-		this.literal = literal;
>-	}
>+ /**
>+ * Only this class can construct instances.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private ModifierKind(int value, String name, String literal)
>+ {
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public int getValue() {
>-		return value;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getName() {
>-		return name;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getLiteral() {
>-		return literal;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
> 
>-	/**
>-	 * Returns the literal value of the enumerator, which is its string representation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		return literal;
>-	}
>-
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+ 
> } //ModifierKind
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterResourceFactoryImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterResourceFactoryImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterResourceFactoryImpl.java	(working copy)
>@@ -18,43 +18,42 @@
> * 
> * The Resource Factory associated with the package.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.util.UmlParameterResourceImpl
> * @generated
> */
>-public class UmlParameterResourceFactoryImpl extends ResourceFactoryImpl {
>+public class UmlParameterResourceFactoryImpl extends ResourceFactoryImpl
>+{
>+ /**
>+ * Creates an instance of the resource factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterResourceFactoryImpl()
>+ {
>+ super();
>+ }
> 
>-	/**
>-	 * Creates an instance of the resource factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterResourceFactoryImpl() {
>-		super();
>-	}
>+ /**
>+ * Creates an instance of the resource.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Resource createResource(URI uri)
>+ {
>+ XMLResource result = new UmlParameterResourceImpl(uri);
>+ result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
>+ result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
> 
>-	/**
>-	 * Creates an instance of the resource.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public Resource createResource(URI uri) {
>-		XMLResource result = new UmlParameterResourceImpl(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.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_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;
>-	}
>+ result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
>+ return result;
>+ }
> 
> } //UmlParameterResourceFactoryImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterSwitch.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterSwitch.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterSwitch.java	(working copy)
>@@ -6,209 +6,187 @@
> */
> package org.eclipse.papyrus.parameter.editor.xtext.umlParameter.util;
> 
>-import java.util.List;
>-
>-import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+
>+import org.eclipse.emf.ecore.util.Switch;
> 
> import org.eclipse.papyrus.parameter.editor.xtext.umlParameter.*;
> 
> /**
> * 
> * The Switch 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.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage
> * @generated
> */
>-public class UmlParameterSwitch<T> {
>-
>-	/**
>-	 * The cached model package
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected static UmlParameterPackage modelPackage;
>+public class UmlParameterSwitch<T> extends Switch<T>
>+{
>+ /**
>+ * The cached model package
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static UmlParameterPackage modelPackage;
> 
>-	/**
>-	 * Creates an instance of the switch.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterSwitch() {
>-		if(modelPackage == null) {
>-			modelPackage = UmlParameterPackage.eINSTANCE;
>-		}
>-	}
>+ /**
>+ * Creates an instance of the switch.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterSwitch()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = UmlParameterPackage.eINSTANCE;
>+ }
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	public T doSwitch(EObject theEObject) {
>-		return doSwitch(theEObject.eClass(), theEObject);
>-	}
>+ /**
>+ * Checks whether this is a switch for the given package.
>+ * 
>+ * 
>+ * @parameter ePackage the package in question.
>+ * @return whether this is a switch for the given package.
>+ * @generated
>+ */
>+ @Override
>+ protected boolean isSwitchFor(EPackage ePackage)
>+ {
>+ return ePackage == modelPackage;
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	protected T doSwitch(EClass theEClass, EObject theEObject) {
>-		if(theEClass.eContainer() == modelPackage) {
>-			return doSwitch(theEClass.getClassifierID(), theEObject);
>-		} else {
>-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
>-			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
>-		}
>-	}
>+ /**
>+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * 
>+ * 
>+ * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @generated
>+ */
>+ @Override
>+ protected T doSwitch(int classifierID, EObject theEObject)
>+ {
>+ switch (classifierID)
>+ {
>+ case UmlParameterPackage.PARAMETER_RULE:
>+ {
>+ ParameterRule parameterRule = (ParameterRule)theEObject;
>+ T result = caseParameterRule(parameterRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlParameterPackage.MODIFIERS_RULE:
>+ {
>+ ModifiersRule modifiersRule = (ModifiersRule)theEObject;
>+ T result = caseModifiersRule(modifiersRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlParameterPackage.MODIFIER_SPECIFICATION:
>+ {
>+ ModifierSpecification modifierSpecification = (ModifierSpecification)theEObject;
>+ T result = caseModifierSpecification(modifierSpecification);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case UmlParameterPackage.EFFECT_RULE:
>+ {
>+ EffectRule effectRule = (EffectRule)theEObject;
>+ T result = caseEffectRule(effectRule);
>+ if (result == null) result = defaultCase(theEObject);
>+ return result;
>+ }
>+ default: return defaultCase(theEObject);
>+ }
>+ }
> 
>-	/**
>-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
>-	 * @generated
>-	 */
>-	protected T doSwitch(int classifierID, EObject theEObject) {
>-		switch(classifierID) {
>-		case UmlParameterPackage.PARAMETER_RULE:
>-		{
>-			ParameterRule parameterRule = (ParameterRule)theEObject;
>-			T result = caseParameterRule(parameterRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlParameterPackage.MODIFIERS_RULE:
>-		{
>-			ModifiersRule modifiersRule = (ModifiersRule)theEObject;
>-			T result = caseModifiersRule(modifiersRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlParameterPackage.MODIFIER_SPECIFICATION:
>-		{
>-			ModifierSpecification modifierSpecification = (ModifierSpecification)theEObject;
>-			T result = caseModifierSpecification(modifierSpecification);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		case UmlParameterPackage.EFFECT_RULE:
>-		{
>-			EffectRule effectRule = (EffectRule)theEObject;
>-			T result = caseEffectRule(effectRule);
>-			if(result == null)
>-				result = defaultCase(theEObject);
>-			return result;
>-		}
>-		default:
>-			return defaultCase(theEObject);
>-		}
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Parameter Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Parameter Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseParameterRule(ParameterRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Parameter Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Parameter Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseParameterRule(ParameterRule object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Modifiers Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Modifiers Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseModifiersRule(ModifiersRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Modifiers Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Modifiers Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseModifiersRule(ModifiersRule object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Modifier Specification'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Modifier Specification'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseModifierSpecification(ModifierSpecification object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Modifier Specification'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Modifier Specification'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseModifierSpecification(ModifierSpecification object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Effect Rule'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Effect Rule'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseEffectRule(EffectRule object)
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'Effect Rule'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Effect Rule'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>-	 * @generated
>-	 */
>-	public T caseEffectRule(EffectRule object) {
>-		return null;
>-	}
>-
>-	/**
>-	 * Returns the result of interpreting the object as an instance of 'EObject'.
>-	 * 
>-	 * This implementation returns null;
>-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
>-	 * 
>-	 * 
>-	 * @param object
>-	 * the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'EObject'.
>-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>-	 * @generated
>-	 */
>-	public T defaultCase(EObject object) {
>-		return null;
>-	}
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch, but this is the last case anyway.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'EObject'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>+ * @generated
>+ */
>+ @Override
>+ public T defaultCase(EObject object)
>+ {
>+ return null;
>+ }
> 
> } //UmlParameterSwitch
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterXMLProcessor.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterXMLProcessor.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterXMLProcessor.java	(working copy)
>@@ -20,38 +20,39 @@
> * This class contains helper methods to serialize and deserialize XML documents
> * 
> * 
>- * 
> * @generated
> */
>-public class UmlParameterXMLProcessor extends XMLProcessor {
>+public class UmlParameterXMLProcessor extends XMLProcessor
>+{
> 
>-	/**
>-	 * Public constructor to instantiate the helper.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterXMLProcessor() {
>-		super((EPackage.Registry.INSTANCE));
>-		UmlParameterPackage.eINSTANCE.eClass();
>-	}
>-
>-	/**
>-	 * Register for "*" and "xml" file extensions the UmlParameterResourceFactoryImpl factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected Map<String, Resource.Factory> getRegistrations() {
>-		if(registrations == null) {
>-			super.getRegistrations();
>-			registrations.put(XML_EXTENSION, new UmlParameterResourceFactoryImpl());
>-			registrations.put(STAR_EXTENSION, new UmlParameterResourceFactoryImpl());
>-		}
>-		return registrations;
>-	}
>+ /**
>+ * Public constructor to instantiate the helper.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterXMLProcessor()
>+ {
>+ super((EPackage.Registry.INSTANCE));
>+ UmlParameterPackage.eINSTANCE.eClass();
>+ }
>+ 
>+ /**
>+ * Register for "*" and "xml" file extensions the UmlParameterResourceFactoryImpl factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected Map<String, Resource.Factory> getRegistrations()
>+ {
>+ if (registrations == null)
>+ {
>+ super.getRegistrations();
>+ registrations.put(XML_EXTENSION, new UmlParameterResourceFactoryImpl());
>+ registrations.put(STAR_EXTENSION, new UmlParameterResourceFactoryImpl());
>+ }
>+ return registrations;
>+ }
> 
> } //UmlParameterXMLProcessor
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterResourceImpl.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterResourceImpl.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterResourceImpl.java	(working copy)
>@@ -14,23 +14,21 @@
> * 
> * The Resource associated with the package.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.util.UmlParameterResourceFactoryImpl
> * @generated
> */
>-public class UmlParameterResourceImpl extends XMLResourceImpl {
>-
>-	/**
>-	 * Creates an instance of the resource.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param uri
>-	 * the URI of the new resource.
>-	 * @generated
>-	 */
>-	public UmlParameterResourceImpl(URI uri) {
>-		super(uri);
>-	}
>+public class UmlParameterResourceImpl extends XMLResourceImpl
>+{
>+ /**
>+ * Creates an instance of the resource.
>+ * 
>+ * 
>+ * @param uri the URI of the new resource.
>+ * @generated
>+ */
>+ public UmlParameterResourceImpl(URI uri)
>+ {
>+ super(uri);
>+ }
> 
> } //UmlParameterResourceImpl
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterAdapterFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterAdapterFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/util/UmlParameterAdapterFactory.java	(working copy)
>@@ -20,179 +20,177 @@
> * The Adapter Factory for the model.
> * It provides an adapter <code>createXXX</code> method for each class of the model.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage
> * @generated
> */
>-public class UmlParameterAdapterFactory extends AdapterFactoryImpl {
>-
>-	/**
>-	 * The cached model package.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected static UmlParameterPackage modelPackage;
>-
>-	/**
>-	 * Creates an instance of the adapter factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public UmlParameterAdapterFactory() {
>-		if(modelPackage == null) {
>-			modelPackage = UmlParameterPackage.eINSTANCE;
>-		}
>-	}
>-
>-	/**
>-	 * Returns whether this factory is applicable for the type of the object.
>-	 * 
>-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>-	 * 
>-	 * 
>-	 * @return whether this factory is applicable for the type of the object.
>-	 * @generated
>-	 */
>-	@Override
>-	public boolean isFactoryForType(Object object) {
>-		if(object == modelPackage) {
>-			return true;
>-		}
>-		if(object instanceof EObject) {
>-			return ((EObject)object).eClass().getEPackage() == modelPackage;
>-		}
>-		return false;
>-	}
>-
>-	/**
>-	 * The switch that delegates to the <code>createXXX</code> methods.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected UmlParameterSwitch<Adapter> modelSwitch = new UmlParameterSwitch<Adapter>() {
>+public class UmlParameterAdapterFactory extends AdapterFactoryImpl
>+{
>+ /**
>+ * The cached model package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static UmlParameterPackage modelPackage;
> 
>-		@Override
>-		public Adapter caseParameterRule(ParameterRule object) {
>-			return createParameterRuleAdapter();
>-		}
>+ /**
>+ * Creates an instance of the adapter factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public UmlParameterAdapterFactory()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = UmlParameterPackage.eINSTANCE;
>+ }
>+ }
> 
>-		@Override
>-		public Adapter caseModifiersRule(ModifiersRule object) {
>-			return createModifiersRuleAdapter();
>-		}
>+ /**
>+ * Returns whether this factory is applicable for the type of the object.
>+ * 
>+ * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>+ * 
>+ * @return whether this factory is applicable for the type of the object.
>+ * @generated
>+ */
>+ @Override
>+ public boolean isFactoryForType(Object object)
>+ {
>+ if (object == modelPackage)
>+ {
>+ return true;
>+ }
>+ if (object instanceof EObject)
>+ {
>+ return ((EObject)object).eClass().getEPackage() == modelPackage;
>+ }
>+ return false;
>+ }
> 
>-		@Override
>-		public Adapter caseModifierSpecification(ModifierSpecification object) {
>-			return createModifierSpecificationAdapter();
>-		}
>+ /**
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected UmlParameterSwitch<Adapter> modelSwitch =
>+ new UmlParameterSwitch<Adapter>()
>+ {
>+ @Override
>+ public Adapter caseParameterRule(ParameterRule object)
>+ {
>+ return createParameterRuleAdapter();
>+ }
>+ @Override
>+ public Adapter caseModifiersRule(ModifiersRule object)
>+ {
>+ return createModifiersRuleAdapter();
>+ }
>+ @Override
>+ public Adapter caseModifierSpecification(ModifierSpecification object)
>+ {
>+ return createModifierSpecificationAdapter();
>+ }
>+ @Override
>+ public Adapter caseEffectRule(EffectRule object)
>+ {
>+ return createEffectRuleAdapter();
>+ }
>+ @Override
>+ public Adapter defaultCase(EObject object)
>+ {
>+ return createEObjectAdapter();
>+ }
>+ };
> 
>-		@Override
>-		public Adapter caseEffectRule(EffectRule object) {
>-			return createEffectRuleAdapter();
>-		}
>+ /**
>+ * Creates an adapter for the <code>target</code>.
>+ * 
>+ * 
>+ * @param target the object to adapt.
>+ * @return the adapter for the <code>target</code>.
>+ * @generated
>+ */
>+ @Override
>+ public Adapter createAdapter(Notifier target)
>+ {
>+ return modelSwitch.doSwitch((EObject)target);
>+ }
> 
>-		@Override
>-		public Adapter defaultCase(EObject object) {
>-			return createEObjectAdapter();
>-		}
>-	};
> 
>-	/**
>-	 * Creates an adapter for the <code>target</code>.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param target
>-	 * the object to adapt.
>-	 * @return the adapter for the <code>target</code>.
>-	 * @generated
>-	 */
>-	@Override
>-	public Adapter createAdapter(Notifier target) {
>-		return modelSwitch.doSwitch((EObject)target);
>-	}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule Parameter Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule
>+ * @generated
>+ */
>+ public Adapter createParameterRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule Modifiers Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule
>+ * @generated
>+ */
>+ public Adapter createModifiersRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule
>-	 * Parameter Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule
>-	 * @generated
>-	 */
>-	public Adapter createParameterRuleAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification Modifier Specification}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification
>+ * @generated
>+ */
>+ public Adapter createModifierSpecificationAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule
>-	 * Modifiers Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule
>-	 * @generated
>-	 */
>-	public Adapter createModifiersRuleAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule Effect Rule}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule
>+ * @generated
>+ */
>+ public Adapter createEffectRuleAdapter()
>+ {
>+ return null;
>+ }
> 
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification
>-	 * Modifier Specification}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification
>-	 * @generated
>-	 */
>-	public Adapter createModifierSpecificationAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule Effect Rule}'.
>-	 * 
>-	 * 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.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule
>-	 * @generated
>-	 */
>-	public Adapter createEffectRuleAdapter() {
>-		return null;
>-	}
>-
>-	/**
>-	 * Creates a new adapter for the default case.
>-	 * 
>-	 * This default implementation returns null.
>-	 * 
>-	 * 
>-	 * @return the new adapter.
>-	 * @generated
>-	 */
>-	public Adapter createEObjectAdapter() {
>-		return null;
>-	}
>+ /**
>+ * Creates a new adapter for the default case.
>+ * 
>+ * This default implementation returns null.
>+ * 
>+ * @return the new adapter.
>+ * @generated
>+ */
>+ public Adapter createEObjectAdapter()
>+ {
>+ return null;
>+ }
> 
> } //UmlParameterAdapterFactory
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifierSpecification.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifierSpecification.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifierSpecification.java	(working copy)
>@@ -12,50 +12,47 @@
> * 
> * A representation of the model object 'Modifier Specification'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue Value}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue Value}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifierSpecification()
> * @model
> * @generated
> */
>-public interface ModifierSpecification extends EObject {
>+public interface ModifierSpecification extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Value' attribute.
>+ * The literals are from the enumeration {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind}.
>+ * 
>+ * 
>+ * If the meaning of the 'Value' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Value' attribute.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>+ * @see #setValue(ModifierKind)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifierSpecification_Value()
>+ * @model
>+ * @generated
>+ */
>+ ModifierKind getValue();
> 
>-	/**
>-	 * Returns the value of the 'Value' attribute.
>-	 * The literals are from the enumeration {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Value' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Value' attribute.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>-	 * @see #setValue(ModifierKind)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifierSpecification_Value()
>-	 * @model
>-	 * @generated
>-	 */
>-	ModifierKind getValue();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue Value}'
>-	 * attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Value' attribute.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>-	 * @see #getValue()
>-	 * @generated
>-	 */
>-	void setValue(ModifierKind value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue Value}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Value' attribute.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>+ * @see #getValue()
>+ * @generated
>+ */
>+ void setValue(ModifierKind value);
> 
> } // ModifierSpecification
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ParameterRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ParameterRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ParameterRule.java	(working copy)
>@@ -17,232 +17,212 @@
> * 
> * A representation of the model object 'Parameter Rule'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility Visibility}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection Direction}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName Name}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType Type}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity Multiplicity}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers Modifiers}</li>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect Effect}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility Visibility}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection Direction}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName Name}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType Type}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity Multiplicity}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers Modifiers}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect Effect}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule()
> * @model
> * @generated
> */
>-public interface ParameterRule extends EObject {
>+public interface ParameterRule extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Visibility' attribute.
>+ * The literals are from the enumeration {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind}.
>+ * 
>+ * 
>+ * If the meaning of the 'Visibility' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Visibility' attribute.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @see #setVisibility(VisibilityKind)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Visibility()
>+ * @model
>+ * @generated
>+ */
>+ VisibilityKind getVisibility();
> 
>-	/**
>-	 * Returns the value of the 'Visibility' attribute.
>-	 * The literals are from the enumeration {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Visibility' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Visibility' attribute.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-	 * @see #setVisibility(VisibilityKind)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Visibility()
>-	 * @model
>-	 * @generated
>-	 */
>-	VisibilityKind getVisibility();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility Visibility}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Visibility' attribute.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>+ * @see #getVisibility()
>+ * @generated
>+ */
>+ void setVisibility(VisibilityKind value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility Visibility}'
>-	 * attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Visibility' attribute.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.VisibilityKind
>-	 * @see #getVisibility()
>-	 * @generated
>-	 */
>-	void setVisibility(VisibilityKind value);
>+ /**
>+ * Returns the value of the 'Direction' attribute.
>+ * The literals are from the enumeration {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction}.
>+ * 
>+ * 
>+ * If the meaning of the 'Direction' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Direction' attribute.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>+ * @see #setDirection(Direction)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Direction()
>+ * @model
>+ * @generated
>+ */
>+ Direction getDirection();
> 
>-	/**
>-	 * Returns the value of the 'Direction' attribute.
>-	 * The literals are from the enumeration {@link org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Direction' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Direction' attribute.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>-	 * @see #setDirection(Direction)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Direction()
>-	 * @model
>-	 * @generated
>-	 */
>-	Direction getDirection();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection Direction}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Direction' attribute.
>+ * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>+ * @see #getDirection()
>+ * @generated
>+ */
>+ void setDirection(Direction value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection Direction}'
>-	 * attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Direction' attribute.
>-	 * @see org.eclipse.papyrus.common.editor.xtext.umlCommon.Direction
>-	 * @see #getDirection()
>-	 * @generated
>-	 */
>-	void setDirection(Direction value);
>+ /**
>+ * Returns the value of the 'Name' attribute.
>+ * 
>+ * 
>+ * If the meaning of the 'Name' attribute isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Name' attribute.
>+ * @see #setName(String)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Name()
>+ * @model
>+ * @generated
>+ */
>+ String getName();
> 
>-	/**
>-	 * Returns the value of the 'Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Name' attribute.
>-	 * @see #setName(String)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Name()
>-	 * @model
>-	 * @generated
>-	 */
>-	String getName();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName Name}' attribute.
>+ * 
>+ * 
>+ * @param value the new value of the 'Name' attribute.
>+ * @see #getName()
>+ * @generated
>+ */
>+ void setName(String value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName Name}' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Name' attribute.
>-	 * @see #getName()
>-	 * @generated
>-	 */
>-	void setName(String value);
>+ /**
>+ * Returns the value of the 'Type' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Type' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Type' containment reference.
>+ * @see #setType(TypeRule)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Type()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ TypeRule getType();
> 
>-	/**
>-	 * Returns the value of the 'Type' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Type' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Type' containment reference.
>-	 * @see #setType(TypeRule)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Type()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	TypeRule getType();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType Type}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Type' containment reference.
>+ * @see #getType()
>+ * @generated
>+ */
>+ void setType(TypeRule value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType Type}' containment
>-	 * reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Type' containment reference.
>-	 * @see #getType()
>-	 * @generated
>-	 */
>-	void setType(TypeRule value);
>+ /**
>+ * Returns the value of the 'Multiplicity' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Multiplicity' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Multiplicity' containment reference.
>+ * @see #setMultiplicity(MultiplicityRule)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Multiplicity()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ MultiplicityRule getMultiplicity();
> 
>-	/**
>-	 * Returns the value of the 'Multiplicity' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Multiplicity' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Multiplicity' containment reference.
>-	 * @see #setMultiplicity(MultiplicityRule)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Multiplicity()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	MultiplicityRule getMultiplicity();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity Multiplicity}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Multiplicity' containment reference.
>+ * @see #getMultiplicity()
>+ * @generated
>+ */
>+ void setMultiplicity(MultiplicityRule value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity Multiplicity}'
>-	 * containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Multiplicity' containment reference.
>-	 * @see #getMultiplicity()
>-	 * @generated
>-	 */
>-	void setMultiplicity(MultiplicityRule value);
>+ /**
>+ * Returns the value of the 'Modifiers' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Modifiers' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Modifiers' containment reference.
>+ * @see #setModifiers(ModifiersRule)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Modifiers()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ ModifiersRule getModifiers();
> 
>-	/**
>-	 * Returns the value of the 'Modifiers' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Modifiers' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Modifiers' containment reference.
>-	 * @see #setModifiers(ModifiersRule)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Modifiers()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	ModifiersRule getModifiers();
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers Modifiers}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Modifiers' containment reference.
>+ * @see #getModifiers()
>+ * @generated
>+ */
>+ void setModifiers(ModifiersRule value);
> 
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers Modifiers}'
>-	 * containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Modifiers' containment reference.
>-	 * @see #getModifiers()
>-	 * @generated
>-	 */
>-	void setModifiers(ModifiersRule value);
>+ /**
>+ * Returns the value of the 'Effect' containment reference.
>+ * 
>+ * 
>+ * If the meaning of the 'Effect' containment reference isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Effect' containment reference.
>+ * @see #setEffect(EffectRule)
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Effect()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ EffectRule getEffect();
> 
>-	/**
>-	 * Returns the value of the 'Effect' containment reference.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Effect' containment reference isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Effect' containment reference.
>-	 * @see #setEffect(EffectRule)
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getParameterRule_Effect()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	EffectRule getEffect();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect Effect}' containment
>-	 * reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @param value
>-	 * the new value of the 'Effect' containment reference.
>-	 * @see #getEffect()
>-	 * @generated
>-	 */
>-	void setEffect(EffectRule value);
>+ /**
>+ * Sets the value of the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect Effect}' containment reference.
>+ * 
>+ * 
>+ * @param value the new value of the 'Effect' containment reference.
>+ * @see #getEffect()
>+ * @generated
>+ */
>+ void setEffect(EffectRule value);
> 
> } // ParameterRule
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/EffectKind.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/EffectKind.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/EffectKind.java	(working copy)
>@@ -17,266 +17,265 @@
> * A representation of the literals of the enumeration 'Effect Kind',
> * and utility methods for working with them.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getEffectKind()
> * @model
> * @generated
> */
>-public enum EffectKind implements Enumerator {
>-	/**
>-	 * The 'CREATE' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #CREATE_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	CREATE(0, "CREATE", "create"),
>+public enum EffectKind implements Enumerator
>+{
>+ /**
>+ * The 'CREATE' literal object.
>+ * 
>+ * 
>+ * @see #CREATE_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ CREATE(0, "CREATE", "create"),
> 
>-	/**
>-	 * The 'READ' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #READ_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	READ(1, "READ", "read"),
>+ /**
>+ * The 'READ' literal object.
>+ * 
>+ * 
>+ * @see #READ_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ READ(1, "READ", "read"),
> 
>-	/**
>-	 * The 'UPDATE' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #UPDATE_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	UPDATE(2, "UPDATE", "update"),
>+ /**
>+ * The 'UPDATE' literal object.
>+ * 
>+ * 
>+ * @see #UPDATE_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ UPDATE(2, "UPDATE", "update"),
> 
>-	/**
>-	 * The 'DELETE' literal object.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #DELETE_VALUE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	DELETE(3, "DELETE", "delete");
>+ /**
>+ * The 'DELETE' literal object.
>+ * 
>+ * 
>+ * @see #DELETE_VALUE
>+ * @generated
>+ * @ordered
>+ */
>+ DELETE(3, "DELETE", "delete");
> 
>-	/**
>-	 * The 'CREATE' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'CREATE' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #CREATE
>-	 * @model literal="create"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int CREATE_VALUE = 0;
>+ /**
>+ * The 'CREATE' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'CREATE' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #CREATE
>+ * @model literal="create"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int CREATE_VALUE = 0;
> 
>-	/**
>-	 * The 'READ' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'READ' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #READ
>-	 * @model literal="read"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int READ_VALUE = 1;
>+ /**
>+ * The 'READ' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'READ' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #READ
>+ * @model literal="read"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int READ_VALUE = 1;
> 
>-	/**
>-	 * The 'UPDATE' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'UPDATE' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #UPDATE
>-	 * @model literal="update"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int UPDATE_VALUE = 2;
>+ /**
>+ * The 'UPDATE' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'UPDATE' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #UPDATE
>+ * @model literal="update"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int UPDATE_VALUE = 2;
> 
>-	/**
>-	 * The 'DELETE' literal value.
>-	 * 
>-	 * 
>-	 * If the meaning of 'DELETE' literal object isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @see #DELETE
>-	 * @model literal="delete"
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final int DELETE_VALUE = 3;
>+ /**
>+ * The 'DELETE' literal value.
>+ * 
>+ * 
>+ * If the meaning of 'DELETE' literal object isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @see #DELETE
>+ * @model literal="delete"
>+ * @generated
>+ * @ordered
>+ */
>+ public static final int DELETE_VALUE = 3;
> 
>-	/**
>-	 * An array of all the 'Effect Kind' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private static final EffectKind[] VALUES_ARRAY = new EffectKind[]{ CREATE, READ, UPDATE, DELETE, };
>+ /**
>+ * An array of all the 'Effect Kind' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static final EffectKind[] VALUES_ARRAY =
>+ new EffectKind[]
>+ {
>+ CREATE,
>+ READ,
>+ UPDATE,
>+ DELETE,
>+ };
> 
>-	/**
>-	 * A public read-only list of all the 'Effect Kind' enumerators.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static final List<EffectKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+ /**
>+ * A public read-only list of all the 'Effect Kind' enumerators.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final List<EffectKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
>-	/**
>-	 * Returns the 'Effect Kind' literal with the specified literal value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static EffectKind get(String literal) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			EffectKind result = VALUES_ARRAY[i];
>-			if(result.toString().equals(literal)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Effect Kind' literal with the specified literal value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static EffectKind get(String literal)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ EffectKind result = VALUES_ARRAY[i];
>+ if (result.toString().equals(literal))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Effect Kind' literal with the specified name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static EffectKind getByName(String name) {
>-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
>-			EffectKind result = VALUES_ARRAY[i];
>-			if(result.getName().equals(name)) {
>-				return result;
>-			}
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Effect Kind' literal with the specified name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static EffectKind getByName(String name)
>+ {
>+ for (int i = 0; i < VALUES_ARRAY.length; ++i)
>+ {
>+ EffectKind result = VALUES_ARRAY[i];
>+ if (result.getName().equals(name))
>+ {
>+ return result;
>+ }
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * Returns the 'Effect Kind' literal with the specified integer value.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static EffectKind get(int value) {
>-		switch(value) {
>-		case CREATE_VALUE:
>-			return CREATE;
>-		case READ_VALUE:
>-			return READ;
>-		case UPDATE_VALUE:
>-			return UPDATE;
>-		case DELETE_VALUE:
>-			return DELETE;
>-		}
>-		return null;
>-	}
>+ /**
>+ * Returns the 'Effect Kind' literal with the specified integer value.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static EffectKind get(int value)
>+ {
>+ switch (value)
>+ {
>+ case CREATE_VALUE: return CREATE;
>+ case READ_VALUE: return READ;
>+ case UPDATE_VALUE: return UPDATE;
>+ case DELETE_VALUE: return DELETE;
>+ }
>+ return null;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final int value;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String name;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private final String literal;
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
> 
>-	/**
>-	 * Only this class can construct instances.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	private EffectKind(int value, String name, String literal) {
>-		this.value = value;
>-		this.name = name;
>-		this.literal = literal;
>-	}
>+ /**
>+ * Only this class can construct instances.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EffectKind(int value, String name, String literal)
>+ {
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public int getValue() {
>-		return value;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getName() {
>-		return name;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public String getLiteral() {
>-		return literal;
>-	}
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
> 
>-	/**
>-	 * Returns the literal value of the enumerator, which is its string representation.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		return literal;
>-	}
>-
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+ 
> } //EffectKind
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/UmlParameterFactory.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/UmlParameterFactory.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/UmlParameterFactory.java	(working copy)
>@@ -13,69 +13,62 @@
> * The Factory for the model.
> * It provides a create method for each non-abstract class of the model.
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage
> * @generated
> */
>-public interface UmlParameterFactory extends EFactory {
>+public interface UmlParameterFactory extends EFactory
>+{
>+ /**
>+ * The singleton instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ UmlParameterFactory eINSTANCE = org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterFactoryImpl.init();
> 
>-	/**
>-	 * The singleton instance of the factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	UmlParameterFactory eINSTANCE = org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterFactoryImpl.init();
>+ /**
>+ * Returns a new object of class 'Parameter Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Parameter Rule'.
>+ * @generated
>+ */
>+ ParameterRule createParameterRule();
> 
>-	/**
>-	 * Returns a new object of class 'Parameter Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Parameter Rule'.
>-	 * @generated
>-	 */
>-	ParameterRule createParameterRule();
>+ /**
>+ * Returns a new object of class 'Modifiers Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Modifiers Rule'.
>+ * @generated
>+ */
>+ ModifiersRule createModifiersRule();
> 
>-	/**
>-	 * Returns a new object of class 'Modifiers Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Modifiers Rule'.
>-	 * @generated
>-	 */
>-	ModifiersRule createModifiersRule();
>+ /**
>+ * Returns a new object of class 'Modifier Specification'.
>+ * 
>+ * 
>+ * @return a new object of class 'Modifier Specification'.
>+ * @generated
>+ */
>+ ModifierSpecification createModifierSpecification();
> 
>-	/**
>-	 * Returns a new object of class 'Modifier Specification'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Modifier Specification'.
>-	 * @generated
>-	 */
>-	ModifierSpecification createModifierSpecification();
>+ /**
>+ * Returns a new object of class 'Effect Rule'.
>+ * 
>+ * 
>+ * @return a new object of class 'Effect Rule'.
>+ * @generated
>+ */
>+ EffectRule createEffectRule();
> 
>-	/**
>-	 * Returns a new object of class 'Effect Rule'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return a new object of class 'Effect Rule'.
>-	 * @generated
>-	 */
>-	EffectRule createEffectRule();
>-
>-	/**
>-	 * Returns the package supported by this factory.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the package supported by this factory.
>-	 * @generated
>-	 */
>-	UmlParameterPackage getUmlParameterPackage();
>+ /**
>+ * Returns the package supported by this factory.
>+ * 
>+ * 
>+ * @return the package supported by this factory.
>+ * @generated
>+ */
>+ UmlParameterPackage getUmlParameterPackage();
> 
> } //UmlParameterFactory
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/UmlParameterPackage.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/UmlParameterPackage.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/UmlParameterPackage.java	(working copy)
>@@ -17,647 +17,570 @@
> * The Package for the model.
> * It contains accessors for the meta objects to represent
> * <ul>
>- * <li>each class,</li>
>- * <li>each feature of each class,</li>
>- * <li>each enum,</li>
>- * <li>and each data type</li>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterFactory
> * @model kind="package"
> * @generated
> */
>-public interface UmlParameterPackage extends EPackage {
>-
>-	/**
>-	 * The package name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNAME = "umlParameter";
>+public interface UmlParameterPackage extends EPackage
>+{
>+ /**
>+ * The package name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNAME = "umlParameter";
> 
>-	/**
>-	 * The package namespace URI.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNS_URI = "http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter";
>+ /**
>+ * The package namespace URI.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_URI = "http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter";
> 
>-	/**
>-	 * The package namespace name.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	String eNS_PREFIX = "umlParameter";
>+ /**
>+ * The package namespace name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_PREFIX = "umlParameter";
> 
>-	/**
>-	 * The singleton instance of the package.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	UmlParameterPackage eINSTANCE = org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl.init();
>+ /**
>+ * The singleton instance of the package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ UmlParameterPackage eINSTANCE = org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl.init();
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl Parameter Rule}'
>-	 * class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getParameterRule()
>-	 * @generated
>-	 */
>-	int PARAMETER_RULE = 0;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl Parameter Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getParameterRule()
>+ * @generated
>+ */
>+ int PARAMETER_RULE = 0;
> 
>-	/**
>-	 * The feature id for the 'Visibility' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__VISIBILITY = 0;
>+ /**
>+ * The feature id for the 'Visibility' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__VISIBILITY = 0;
> 
>-	/**
>-	 * The feature id for the 'Direction' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__DIRECTION = 1;
>+ /**
>+ * The feature id for the 'Direction' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__DIRECTION = 1;
> 
>-	/**
>-	 * The feature id for the 'Name' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__NAME = 2;
>+ /**
>+ * The feature id for the 'Name' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__NAME = 2;
> 
>-	/**
>-	 * The feature id for the 'Type' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__TYPE = 3;
>+ /**
>+ * The feature id for the 'Type' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__TYPE = 3;
> 
>-	/**
>-	 * The feature id for the 'Multiplicity' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__MULTIPLICITY = 4;
>+ /**
>+ * The feature id for the 'Multiplicity' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__MULTIPLICITY = 4;
> 
>-	/**
>-	 * The feature id for the 'Modifiers' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__MODIFIERS = 5;
>+ /**
>+ * The feature id for the 'Modifiers' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__MODIFIERS = 5;
> 
>-	/**
>-	 * The feature id for the 'Effect' containment reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE__EFFECT = 6;
>+ /**
>+ * The feature id for the 'Effect' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE__EFFECT = 6;
> 
>-	/**
>-	 * The number of structural features of the 'Parameter Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETER_RULE_FEATURE_COUNT = 7;
>+ /**
>+ * The number of structural features of the 'Parameter Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PARAMETER_RULE_FEATURE_COUNT = 7;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl Modifiers Rule}'
>-	 * class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifiersRule()
>-	 * @generated
>-	 */
>-	int MODIFIERS_RULE = 1;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl Modifiers Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifiersRule()
>+ * @generated
>+ */
>+ int MODIFIERS_RULE = 1;
> 
>-	/**
>-	 * The feature id for the 'Values' containment reference list.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int MODIFIERS_RULE__VALUES = 0;
>+ /**
>+ * The feature id for the 'Values' containment reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MODIFIERS_RULE__VALUES = 0;
> 
>-	/**
>-	 * The number of structural features of the 'Modifiers Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int MODIFIERS_RULE_FEATURE_COUNT = 1;
>+ /**
>+ * The number of structural features of the 'Modifiers Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MODIFIERS_RULE_FEATURE_COUNT = 1;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl
>-	 * Modifier Specification}' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierSpecification()
>-	 * @generated
>-	 */
>-	int MODIFIER_SPECIFICATION = 2;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl Modifier Specification}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierSpecification()
>+ * @generated
>+ */
>+ int MODIFIER_SPECIFICATION = 2;
> 
>-	/**
>-	 * The feature id for the 'Value' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int MODIFIER_SPECIFICATION__VALUE = 0;
>+ /**
>+ * The feature id for the 'Value' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MODIFIER_SPECIFICATION__VALUE = 0;
> 
>-	/**
>-	 * The number of structural features of the 'Modifier Specification' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int MODIFIER_SPECIFICATION_FEATURE_COUNT = 1;
>+ /**
>+ * The number of structural features of the 'Modifier Specification' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MODIFIER_SPECIFICATION_FEATURE_COUNT = 1;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl Effect Rule}' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectRule()
>-	 * @generated
>-	 */
>-	int EFFECT_RULE = 3;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl Effect Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectRule()
>+ * @generated
>+ */
>+ int EFFECT_RULE = 3;
> 
>-	/**
>-	 * The feature id for the 'Effect Kind' attribute.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int EFFECT_RULE__EFFECT_KIND = 0;
>+ /**
>+ * The feature id for the 'Effect Kind' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int EFFECT_RULE__EFFECT_KIND = 0;
> 
>-	/**
>-	 * The number of structural features of the 'Effect Rule' class.
>-	 * 
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int EFFECT_RULE_FEATURE_COUNT = 1;
>+ /**
>+ * The number of structural features of the 'Effect Rule' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int EFFECT_RULE_FEATURE_COUNT = 1;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind Modifier Kind}' enum.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierKind()
>-	 * @generated
>-	 */
>-	int MODIFIER_KIND = 4;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind Modifier Kind}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierKind()
>+ * @generated
>+ */
>+ int MODIFIER_KIND = 4;
> 
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind Effect Kind}' enum.
>-	 * 
>-	 * 
>-	 * 
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectKind()
>-	 * @generated
>-	 */
>-	int EFFECT_KIND = 5;
>+ /**
>+ * The meta object id for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind Effect Kind}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectKind()
>+ * @generated
>+ */
>+ int EFFECT_KIND = 5;
> 
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule Parameter Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Parameter Rule'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule
>-	 * @generated
>-	 */
>-	EClass getParameterRule();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule Parameter Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Parameter Rule'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule
>+ * @generated
>+ */
>+ EClass getParameterRule();
> 
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility
>-	 * Visibility}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Visibility'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EAttribute getParameterRule_Visibility();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility Visibility}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Visibility'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getVisibility()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EAttribute getParameterRule_Visibility();
> 
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection
>-	 * Direction}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Direction'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EAttribute getParameterRule_Direction();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection Direction}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Direction'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getDirection()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EAttribute getParameterRule_Direction();
> 
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName Name}
>-	 * '.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Name'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EAttribute getParameterRule_Name();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName Name}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Name'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getName()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EAttribute getParameterRule_Name();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType
>-	 * Type}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Type'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EReference getParameterRule_Type();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType Type}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Type'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getType()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EReference getParameterRule_Type();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '
>-	 * {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity Multiplicity}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Multiplicity'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EReference getParameterRule_Multiplicity();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity Multiplicity}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Multiplicity'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getMultiplicity()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EReference getParameterRule_Multiplicity();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '
>-	 * {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers Modifiers}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Modifiers'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EReference getParameterRule_Modifiers();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers Modifiers}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Modifiers'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getModifiers()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EReference getParameterRule_Modifiers();
> 
>-	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect
>-	 * Effect}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference 'Effect'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect()
>-	 * @see #getParameterRule()
>-	 * @generated
>-	 */
>-	EReference getParameterRule_Effect();
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect Effect}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Effect'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ParameterRule#getEffect()
>+ * @see #getParameterRule()
>+ * @generated
>+ */
>+ EReference getParameterRule_Effect();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule Modifiers Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Modifiers Rule'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule
>-	 * @generated
>-	 */
>-	EClass getModifiersRule();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule Modifiers Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Modifiers Rule'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule
>+ * @generated
>+ */
>+ EClass getModifiersRule();
> 
>-	/**
>-	 * Returns the meta object for the containment reference list '
>-	 * {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule#getValues Values}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the containment reference list 'Values'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule#getValues()
>-	 * @see #getModifiersRule()
>-	 * @generated
>-	 */
>-	EReference getModifiersRule_Values();
>+ /**
>+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule#getValues Values}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference list 'Values'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule#getValues()
>+ * @see #getModifiersRule()
>+ * @generated
>+ */
>+ EReference getModifiersRule_Values();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification
>-	 * Modifier Specification}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Modifier Specification'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification
>-	 * @generated
>-	 */
>-	EClass getModifierSpecification();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification Modifier Specification}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Modifier Specification'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification
>+ * @generated
>+ */
>+ EClass getModifierSpecification();
> 
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue
>-	 * Value}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Value'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue()
>-	 * @see #getModifierSpecification()
>-	 * @generated
>-	 */
>-	EAttribute getModifierSpecification_Value();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue Value}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Value'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification#getValue()
>+ * @see #getModifierSpecification()
>+ * @generated
>+ */
>+ EAttribute getModifierSpecification_Value();
> 
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule Effect Rule}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for class 'Effect Rule'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule
>-	 * @generated
>-	 */
>-	EClass getEffectRule();
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule Effect Rule}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Effect Rule'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule
>+ * @generated
>+ */
>+ EClass getEffectRule();
> 
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind
>-	 * Effect Kind}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Effect Kind'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind()
>-	 * @see #getEffectRule()
>-	 * @generated
>-	 */
>-	EAttribute getEffectRule_EffectKind();
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind Effect Kind}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Effect Kind'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectRule#getEffectKind()
>+ * @see #getEffectRule()
>+ * @generated
>+ */
>+ EAttribute getEffectRule_EffectKind();
> 
>-	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind Modifier Kind}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for enum 'Modifier Kind'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>-	 * @generated
>-	 */
>-	EEnum getModifierKind();
>+ /**
>+ * Returns the meta object for enum '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind Modifier Kind}'.
>+ * 
>+ * 
>+ * @return the meta object for enum 'Modifier Kind'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>+ * @generated
>+ */
>+ EEnum getModifierKind();
> 
>-	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind Effect Kind}'.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the meta object for enum 'Effect Kind'.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>-	 * @generated
>-	 */
>-	EEnum getEffectKind();
>+ /**
>+ * Returns the meta object for enum '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind Effect Kind}'.
>+ * 
>+ * 
>+ * @return the meta object for enum 'Effect Kind'.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>+ * @generated
>+ */
>+ EEnum getEffectKind();
> 
>-	/**
>-	 * Returns the factory that creates the instances of the model.
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the factory that creates the instances of the model.
>-	 * @generated
>-	 */
>-	UmlParameterFactory getUmlParameterFactory();
>+ /**
>+ * Returns the factory that creates the instances of the model.
>+ * 
>+ * 
>+ * @return the factory that creates the instances of the model.
>+ * @generated
>+ */
>+ UmlParameterFactory getUmlParameterFactory();
> 
>-	/**
>-	 * 
>-	 * Defines literals for the meta objects that represent
>-	 * <ul>
>-	 * <li>each class,</li>
>-	 * <li>each feature of each class,</li>
>-	 * <li>each enum,</li>
>-	 * <li>and each data type</li>
>-	 * </ul>
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	interface Literals {
>+ /**
>+ * 
>+ * Defines literals for the meta objects that represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @generated
>+ */
>+ interface Literals
>+ {
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl Parameter Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getParameterRule()
>+ * @generated
>+ */
>+ EClass PARAMETER_RULE = eINSTANCE.getParameterRule();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl
>-		 * Parameter Rule}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ParameterRuleImpl
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getParameterRule()
>-		 * @generated
>-		 */
>-		EClass PARAMETER_RULE = eINSTANCE.getParameterRule();
>+ /**
>+ * The meta object literal for the 'Visibility' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute PARAMETER_RULE__VISIBILITY = eINSTANCE.getParameterRule_Visibility();
> 
>-		/**
>-		 * The meta object literal for the 'Visibility' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER_RULE__VISIBILITY = eINSTANCE.getParameterRule_Visibility();
>+ /**
>+ * The meta object literal for the 'Direction' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute PARAMETER_RULE__DIRECTION = eINSTANCE.getParameterRule_Direction();
> 
>-		/**
>-		 * The meta object literal for the 'Direction' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER_RULE__DIRECTION = eINSTANCE.getParameterRule_Direction();
>+ /**
>+ * The meta object literal for the 'Name' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute PARAMETER_RULE__NAME = eINSTANCE.getParameterRule_Name();
> 
>-		/**
>-		 * The meta object literal for the 'Name' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER_RULE__NAME = eINSTANCE.getParameterRule_Name();
>+ /**
>+ * The meta object literal for the 'Type' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference PARAMETER_RULE__TYPE = eINSTANCE.getParameterRule_Type();
> 
>-		/**
>-		 * The meta object literal for the 'Type' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER_RULE__TYPE = eINSTANCE.getParameterRule_Type();
>+ /**
>+ * The meta object literal for the 'Multiplicity' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference PARAMETER_RULE__MULTIPLICITY = eINSTANCE.getParameterRule_Multiplicity();
> 
>-		/**
>-		 * The meta object literal for the 'Multiplicity' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER_RULE__MULTIPLICITY = eINSTANCE.getParameterRule_Multiplicity();
>+ /**
>+ * The meta object literal for the 'Modifiers' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference PARAMETER_RULE__MODIFIERS = eINSTANCE.getParameterRule_Modifiers();
> 
>-		/**
>-		 * The meta object literal for the 'Modifiers' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER_RULE__MODIFIERS = eINSTANCE.getParameterRule_Modifiers();
>+ /**
>+ * The meta object literal for the 'Effect' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference PARAMETER_RULE__EFFECT = eINSTANCE.getParameterRule_Effect();
> 
>-		/**
>-		 * The meta object literal for the 'Effect' containment reference feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER_RULE__EFFECT = eINSTANCE.getParameterRule_Effect();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl Modifiers Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifiersRule()
>+ * @generated
>+ */
>+ EClass MODIFIERS_RULE = eINSTANCE.getModifiersRule();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl
>-		 * Modifiers Rule}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifiersRuleImpl
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifiersRule()
>-		 * @generated
>-		 */
>-		EClass MODIFIERS_RULE = eINSTANCE.getModifiersRule();
>+ /**
>+ * The meta object literal for the 'Values' containment reference list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference MODIFIERS_RULE__VALUES = eINSTANCE.getModifiersRule_Values();
> 
>-		/**
>-		 * The meta object literal for the 'Values' containment reference list feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference MODIFIERS_RULE__VALUES = eINSTANCE.getModifiersRule_Values();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl Modifier Specification}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierSpecification()
>+ * @generated
>+ */
>+ EClass MODIFIER_SPECIFICATION = eINSTANCE.getModifierSpecification();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl
>-		 * Modifier Specification}' class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.ModifierSpecificationImpl
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierSpecification()
>-		 * @generated
>-		 */
>-		EClass MODIFIER_SPECIFICATION = eINSTANCE.getModifierSpecification();
>+ /**
>+ * The meta object literal for the 'Value' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute MODIFIER_SPECIFICATION__VALUE = eINSTANCE.getModifierSpecification_Value();
> 
>-		/**
>-		 * The meta object literal for the 'Value' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute MODIFIER_SPECIFICATION__VALUE = eINSTANCE.getModifierSpecification_Value();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl Effect Rule}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectRule()
>+ * @generated
>+ */
>+ EClass EFFECT_RULE = eINSTANCE.getEffectRule();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl Effect Rule}'
>-		 * class.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.EffectRuleImpl
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectRule()
>-		 * @generated
>-		 */
>-		EClass EFFECT_RULE = eINSTANCE.getEffectRule();
>+ /**
>+ * The meta object literal for the 'Effect Kind' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute EFFECT_RULE__EFFECT_KIND = eINSTANCE.getEffectRule_EffectKind();
> 
>-		/**
>-		 * The meta object literal for the 'Effect Kind' attribute feature.
>-		 * 
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute EFFECT_RULE__EFFECT_KIND = eINSTANCE.getEffectRule_EffectKind();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind Modifier Kind}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierKind()
>+ * @generated
>+ */
>+ EEnum MODIFIER_KIND = eINSTANCE.getModifierKind();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind Modifier Kind}' enum.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierKind
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getModifierKind()
>-		 * @generated
>-		 */
>-		EEnum MODIFIER_KIND = eINSTANCE.getModifierKind();
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind Effect Kind}' enum.
>+ * 
>+ * 
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectKind()
>+ * @generated
>+ */
>+ EEnum EFFECT_KIND = eINSTANCE.getEffectKind();
> 
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind Effect Kind}' enum.
>-		 * 
>-		 * 
>-		 * 
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.EffectKind
>-		 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.impl.UmlParameterPackageImpl#getEffectKind()
>-		 * @generated
>-		 */
>-		EEnum EFFECT_KIND = eINSTANCE.getEffectKind();
>-
>-	}
>+ }
> 
> } //UmlParameterPackage
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifiersRule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifiersRule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/umlParameter/ModifiersRule.java	(working copy)
>@@ -14,34 +14,34 @@
> * 
> * A representation of the model object 'Modifiers Rule'.
> * 
>- * 
>+ *
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule#getValues Values}</li>
>+ * <li>{@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifiersRule#getValues Values}</li>
> * </ul>
> * 
>- * 
>+ *
> * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifiersRule()
> * @model
> * @generated
> */
>-public interface ModifiersRule extends EObject {
>-
>-	/**
>-	 * Returns the value of the 'Values' containment reference list.
>-	 * The list contents are of type {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification}.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Values' containment reference list isn't clear, there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * 
>-	 * @return the value of the 'Values' containment reference list.
>-	 * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifiersRule_Values()
>-	 * @model containment="true"
>-	 * @generated
>-	 */
>-	EList<ModifierSpecification> getValues();
>+public interface ModifiersRule extends EObject
>+{
>+ /**
>+ * Returns the value of the 'Values' containment reference list.
>+ * The list contents are of type {@link org.eclipse.papyrus.parameter.editor.xtext.umlParameter.ModifierSpecification}.
>+ * 
>+ * 
>+ * If the meaning of the 'Values' containment reference list isn't clear,
>+ * there really should be more of a description here...
>+ * 
>+ * 
>+ * @return the value of the 'Values' containment reference list.
>+ * @see org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage#getModifiersRule_Values()
>+ * @model containment="true"
>+ * @generated
>+ */
>+ EList<ModifierSpecification> getValues();
> 
> } // ModifiersRule
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/validation/AbstractUmlParameterJavaValidator.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/validation/AbstractUmlParameterJavaValidator.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/validation/AbstractUmlParameterJavaValidator.java	(working copy)
>@@ -1,18 +1,5 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> package org.eclipse.papyrus.parameter.editor.xtext.validation;
>-
>+ 
> import java.util.ArrayList;
> import java.util.List;
> 
>@@ -20,13 +7,13 @@
> import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
> import org.eclipse.xtext.validation.ComposedChecks;
> 
>-@ComposedChecks(validators = { org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class })
>+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
> public class AbstractUmlParameterJavaValidator extends AbstractDeclarativeValidator {
> 
> 	@Override
> 	protected List<EPackage> getEPackages() {
>-		List<EPackage> result = new ArrayList<EPackage>();
>-		result.add(org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage.eINSTANCE);
>+	 List<EPackage> result = new ArrayList<EPackage>();
>+	 result.add(org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage.eINSTANCE);
> 		return result;
> 	}
> 
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.xmi
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.xmi	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.xmi	(working copy)
>@@ -323,6 +323,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>@@ -348,6 +349,7 @@
> <elements xsi:type="xtext:Keyword" value="n"/>
> <elements xsi:type="xtext:Keyword" value="f"/>
> <elements xsi:type="xtext:Keyword" value="r"/>
>+ <elements xsi:type="xtext:Keyword" value="u"/>
> <elements xsi:type="xtext:Keyword" value="&quot;"/>
> <elements xsi:type="xtext:Keyword" value="'"/>
> <elements xsi:type="xtext:Keyword" value="\"/>
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore	(working copy)
>@@ -4,24 +4,25 @@
> xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="umlParameter"
> nsURI="http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter" nsPrefix="umlParameter">
> <eClassifiers xsi:type="ecore:EClass" name="ParameterRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="ecore:EEnum ../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="ecore:EEnum ../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//VisibilityKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//Direction"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//TypeRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="ecore:EClass ../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//MultiplicityRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UmlCommon.ecore#//MultiplicityRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="modifiers" eType="#//ModifiersRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="modifiers" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifiersRule"
> containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="effect" eType="#//EffectRule"
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="effect" eType="ecore:EClass platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectRule"
> containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ModifiersRule">
> <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
>- eType="#//ModifierSpecification" containment="true"/>
>+ eType="ecore:EClass platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierSpecification"
>+ containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ModifierSpecification">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//ModifierKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierKind"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="ModifierKind">
> <eLiterals name="EXCEPTION" literal="exception"/>
>@@ -36,6 +37,6 @@
> <eLiterals name="DELETE" value="3" literal="delete"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="EffectRule">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="effectKind" eType="#//EffectKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="effectKind" eType="ecore:EEnum platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectKind"/>
> </eClassifiers>
> </ecore:EPackage>
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/services/UmlParameterGrammarAccess.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/services/UmlParameterGrammarAccess.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/services/UmlParameterGrammarAccess.java	(working copy)
>@@ -1,6 +1,6 @@
> /*
>- * generated by Xtext
>- */
>+* generated by Xtext
>+*/
> 
> package org.eclipse.papyrus.parameter.editor.xtext.services;
> 
>@@ -15,487 +15,306 @@
> 
> @Singleton
> public class UmlParameterGrammarAccess extends AbstractGrammarElementFinder {
>-
>-
>+	
>+	
> 	public class ParameterRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "ParameterRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ParameterRule");
> 		private final Group cGroup = (Group)rule.eContents().get(1);
>-
> 		private final Assignment cVisibilityAssignment_0 = (Assignment)cGroup.eContents().get(0);
>-
> 		private final RuleCall cVisibilityVisibilityKindEnumRuleCall_0_0 = (RuleCall)cVisibilityAssignment_0.eContents().get(0);
>-
> 		private final Assignment cDirectionAssignment_1 = (Assignment)cGroup.eContents().get(1);
>-
> 		private final RuleCall cDirectionDirectionEnumRuleCall_1_0 = (RuleCall)cDirectionAssignment_1.eContents().get(0);
>-
> 		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
>-
> 		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
>-
> 		private final Keyword cColonKeyword_3 = (Keyword)cGroup.eContents().get(3);
>-
> 		private final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);
>-
> 		private final Assignment cTypeAssignment_4_0 = (Assignment)cAlternatives_4.eContents().get(0);
>-
> 		private final RuleCall cTypeTypeRuleParserRuleCall_4_0_0 = (RuleCall)cTypeAssignment_4_0.eContents().get(0);
>-
> 		private final Keyword cUndefinedKeyword_4_1 = (Keyword)cAlternatives_4.eContents().get(1);
>-
> 		private final Assignment cMultiplicityAssignment_5 = (Assignment)cGroup.eContents().get(5);
>-
> 		private final RuleCall cMultiplicityMultiplicityRuleParserRuleCall_5_0 = (RuleCall)cMultiplicityAssignment_5.eContents().get(0);
>-
> 		private final Assignment cModifiersAssignment_6 = (Assignment)cGroup.eContents().get(6);
>-
> 		private final RuleCall cModifiersModifiersRuleParserRuleCall_6_0 = (RuleCall)cModifiersAssignment_6.eContents().get(0);
>-
> 		private final Assignment cEffectAssignment_7 = (Assignment)cGroup.eContents().get(7);
>-
> 		private final RuleCall cEffectEffectRuleParserRuleCall_7_0 = (RuleCall)cEffectAssignment_7.eContents().get(0);
>-
>+		
> 		//ParameterRule:
> 		//	visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>")
> 		//	multiplicity=MultiplicityRule? modifiers=ModifiersRule? effect=EffectRule;
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
> 		//modifiers=ModifiersRule? effect=EffectRule
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//visibility=VisibilityKind
>-		public Assignment getVisibilityAssignment_0() {
>-			return cVisibilityAssignment_0;
>-		}
>+		public Assignment getVisibilityAssignment_0() { return cVisibilityAssignment_0; }
> 
> 		//VisibilityKind
>-		public RuleCall getVisibilityVisibilityKindEnumRuleCall_0_0() {
>-			return cVisibilityVisibilityKindEnumRuleCall_0_0;
>-		}
>+		public RuleCall getVisibilityVisibilityKindEnumRuleCall_0_0() { return cVisibilityVisibilityKindEnumRuleCall_0_0; }
> 
> 		//direction=Direction
>-		public Assignment getDirectionAssignment_1() {
>-			return cDirectionAssignment_1;
>-		}
>+		public Assignment getDirectionAssignment_1() { return cDirectionAssignment_1; }
> 
> 		//Direction
>-		public RuleCall getDirectionDirectionEnumRuleCall_1_0() {
>-			return cDirectionDirectionEnumRuleCall_1_0;
>-		}
>+		public RuleCall getDirectionDirectionEnumRuleCall_1_0() { return cDirectionDirectionEnumRuleCall_1_0; }
> 
> 		//name=ID
>-		public Assignment getNameAssignment_2() {
>-			return cNameAssignment_2;
>-		}
>+		public Assignment getNameAssignment_2() { return cNameAssignment_2; }
> 
> 		//ID
>-		public RuleCall getNameIDTerminalRuleCall_2_0() {
>-			return cNameIDTerminalRuleCall_2_0;
>-		}
>+		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
> 
> 		//":"
>-		public Keyword getColonKeyword_3() {
>-			return cColonKeyword_3;
>-		}
>+		public Keyword getColonKeyword_3() { return cColonKeyword_3; }
> 
> 		//type=TypeRule | "<Undefined>"
>-		public Alternatives getAlternatives_4() {
>-			return cAlternatives_4;
>-		}
>+		public Alternatives getAlternatives_4() { return cAlternatives_4; }
> 
> 		//type=TypeRule
>-		public Assignment getTypeAssignment_4_0() {
>-			return cTypeAssignment_4_0;
>-		}
>+		public Assignment getTypeAssignment_4_0() { return cTypeAssignment_4_0; }
> 
> 		//TypeRule
>-		public RuleCall getTypeTypeRuleParserRuleCall_4_0_0() {
>-			return cTypeTypeRuleParserRuleCall_4_0_0;
>-		}
>+		public RuleCall getTypeTypeRuleParserRuleCall_4_0_0() { return cTypeTypeRuleParserRuleCall_4_0_0; }
> 
> 		//"<Undefined>"
>-		public Keyword getUndefinedKeyword_4_1() {
>-			return cUndefinedKeyword_4_1;
>-		}
>+		public Keyword getUndefinedKeyword_4_1() { return cUndefinedKeyword_4_1; }
> 
> 		//multiplicity=MultiplicityRule?
>-		public Assignment getMultiplicityAssignment_5() {
>-			return cMultiplicityAssignment_5;
>-		}
>+		public Assignment getMultiplicityAssignment_5() { return cMultiplicityAssignment_5; }
> 
> 		//MultiplicityRule
>-		public RuleCall getMultiplicityMultiplicityRuleParserRuleCall_5_0() {
>-			return cMultiplicityMultiplicityRuleParserRuleCall_5_0;
>-		}
>+		public RuleCall getMultiplicityMultiplicityRuleParserRuleCall_5_0() { return cMultiplicityMultiplicityRuleParserRuleCall_5_0; }
> 
> 		//modifiers=ModifiersRule?
>-		public Assignment getModifiersAssignment_6() {
>-			return cModifiersAssignment_6;
>-		}
>+		public Assignment getModifiersAssignment_6() { return cModifiersAssignment_6; }
> 
> 		//ModifiersRule
>-		public RuleCall getModifiersModifiersRuleParserRuleCall_6_0() {
>-			return cModifiersModifiersRuleParserRuleCall_6_0;
>-		}
>+		public RuleCall getModifiersModifiersRuleParserRuleCall_6_0() { return cModifiersModifiersRuleParserRuleCall_6_0; }
> 
> 		//effect=EffectRule
>-		public Assignment getEffectAssignment_7() {
>-			return cEffectAssignment_7;
>-		}
>+		public Assignment getEffectAssignment_7() { return cEffectAssignment_7; }
> 
> 		//EffectRule
>-		public RuleCall getEffectEffectRuleParserRuleCall_7_0() {
>-			return cEffectEffectRuleParserRuleCall_7_0;
>-		}
>+		public RuleCall getEffectEffectRuleParserRuleCall_7_0() { return cEffectEffectRuleParserRuleCall_7_0; }
> 	}
> 
> 	public class ModifiersRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "ModifiersRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ModifiersRule");
> 		private final Group cGroup = (Group)rule.eContents().get(1);
>-
> 		private final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
>-
> 		private final Assignment cValuesAssignment_1 = (Assignment)cGroup.eContents().get(1);
>-
> 		private final RuleCall cValuesModifierSpecificationParserRuleCall_1_0 = (RuleCall)cValuesAssignment_1.eContents().get(0);
>-
> 		private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
>-
> 		private final Keyword cCommaKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
>-
> 		private final Assignment cValuesAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
>-
> 		private final RuleCall cValuesModifierSpecificationParserRuleCall_2_1_0 = (RuleCall)cValuesAssignment_2_1.eContents().get(0);
>-
> 		private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
>-
>+		
> 		//ModifiersRule:
> 		//	"{" values+=ModifierSpecification ("," values+=ModifierSpecification)* "}";
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//"{" values+=ModifierSpecification ("," values+=ModifierSpecification)* "}"
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//"{"
>-		public Keyword getLeftCurlyBracketKeyword_0() {
>-			return cLeftCurlyBracketKeyword_0;
>-		}
>+		public Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }
> 
> 		//values+=ModifierSpecification
>-		public Assignment getValuesAssignment_1() {
>-			return cValuesAssignment_1;
>-		}
>+		public Assignment getValuesAssignment_1() { return cValuesAssignment_1; }
> 
> 		//ModifierSpecification
>-		public RuleCall getValuesModifierSpecificationParserRuleCall_1_0() {
>-			return cValuesModifierSpecificationParserRuleCall_1_0;
>-		}
>+		public RuleCall getValuesModifierSpecificationParserRuleCall_1_0() { return cValuesModifierSpecificationParserRuleCall_1_0; }
> 
> 		//("," values+=ModifierSpecification)*
>-		public Group getGroup_2() {
>-			return cGroup_2;
>-		}
>+		public Group getGroup_2() { return cGroup_2; }
> 
> 		//","
>-		public Keyword getCommaKeyword_2_0() {
>-			return cCommaKeyword_2_0;
>-		}
>+		public Keyword getCommaKeyword_2_0() { return cCommaKeyword_2_0; }
> 
> 		//values+=ModifierSpecification
>-		public Assignment getValuesAssignment_2_1() {
>-			return cValuesAssignment_2_1;
>-		}
>+		public Assignment getValuesAssignment_2_1() { return cValuesAssignment_2_1; }
> 
> 		//ModifierSpecification
>-		public RuleCall getValuesModifierSpecificationParserRuleCall_2_1_0() {
>-			return cValuesModifierSpecificationParserRuleCall_2_1_0;
>-		}
>+		public RuleCall getValuesModifierSpecificationParserRuleCall_2_1_0() { return cValuesModifierSpecificationParserRuleCall_2_1_0; }
> 
> 		//"}"
>-		public Keyword getRightCurlyBracketKeyword_3() {
>-			return cRightCurlyBracketKeyword_3;
>-		}
>+		public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
> 	}
> 
> 	public class ModifierSpecificationElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "ModifierSpecification");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ModifierSpecification");
> 		private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
>-
> 		private final RuleCall cValueModifierKindEnumRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
>-
>+		
> 		//ModifierSpecification:
> 		//	value=ModifierKind;
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//value=ModifierKind
>-		public Assignment getValueAssignment() {
>-			return cValueAssignment;
>-		}
>+		public Assignment getValueAssignment() { return cValueAssignment; }
> 
> 		//ModifierKind
>-		public RuleCall getValueModifierKindEnumRuleCall_0() {
>-			return cValueModifierKindEnumRuleCall_0;
>-		}
>+		public RuleCall getValueModifierKindEnumRuleCall_0() { return cValueModifierKindEnumRuleCall_0; }
> 	}
> 
> 	public class EffectRuleElements extends AbstractParserRuleElementFinder {
>-
>-		private final ParserRule rule = (ParserRule)GrammarUtil.findRuleForName(getGrammar(), "EffectRule");
>-
>+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EffectRule");
> 		private final Group cGroup = (Group)rule.eContents().get(1);
>-
> 		private final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
>-
> 		private final Keyword cEffectKeyword_1 = (Keyword)cGroup.eContents().get(1);
>-
> 		private final Assignment cEffectKindAssignment_2 = (Assignment)cGroup.eContents().get(2);
>-
> 		private final RuleCall cEffectKindEffectKindEnumRuleCall_2_0 = (RuleCall)cEffectKindAssignment_2.eContents().get(0);
>-
> 		private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
>-
>+		
> 		//EffectRule:
> 		//	"{" "effect: " effectKind=EffectKind "}";
>-		public ParserRule getRule() {
>-			return rule;
>-		}
>+		public ParserRule getRule() { return rule; }
> 
> 		//"{" "effect: " effectKind=EffectKind "}"
>-		public Group getGroup() {
>-			return cGroup;
>-		}
>+		public Group getGroup() { return cGroup; }
> 
> 		//"{"
>-		public Keyword getLeftCurlyBracketKeyword_0() {
>-			return cLeftCurlyBracketKeyword_0;
>-		}
>+		public Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }
> 
> 		//"effect: "
>-		public Keyword getEffectKeyword_1() {
>-			return cEffectKeyword_1;
>-		}
>+		public Keyword getEffectKeyword_1() { return cEffectKeyword_1; }
> 
> 		//effectKind=EffectKind
>-		public Assignment getEffectKindAssignment_2() {
>-			return cEffectKindAssignment_2;
>-		}
>+		public Assignment getEffectKindAssignment_2() { return cEffectKindAssignment_2; }
> 
> 		//EffectKind
>-		public RuleCall getEffectKindEffectKindEnumRuleCall_2_0() {
>-			return cEffectKindEffectKindEnumRuleCall_2_0;
>-		}
>+		public RuleCall getEffectKindEffectKindEnumRuleCall_2_0() { return cEffectKindEffectKindEnumRuleCall_2_0; }
> 
> 		//"}"
>-		public Keyword getRightCurlyBracketKeyword_3() {
>-			return cRightCurlyBracketKeyword_3;
>-		}
>+		public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
> 	}
>-
>-
>+	
>+	
> 	public class ModifierKindElements extends AbstractEnumRuleElementFinder {
>-
>-		private final EnumRule rule = (EnumRule)GrammarUtil.findRuleForName(getGrammar(), "ModifierKind");
>-
>+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ModifierKind");
> 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
>-
> 		private final EnumLiteralDeclaration cEXCEPTIONEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
>-
> 		private final Keyword cEXCEPTIONExceptionKeyword_0_0 = (Keyword)cEXCEPTIONEnumLiteralDeclaration_0.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cSTREAMEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
>-
> 		private final Keyword cSTREAMStreamKeyword_1_0 = (Keyword)cSTREAMEnumLiteralDeclaration_1.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cORDEREDEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
>-
> 		private final Keyword cORDEREDOrderedKeyword_2_0 = (Keyword)cORDEREDEnumLiteralDeclaration_2.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cUNIQUEEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
>-
> 		private final Keyword cUNIQUEUniqueKeyword_3_0 = (Keyword)cUNIQUEEnumLiteralDeclaration_3.eContents().get(0);
>-
>+		
> 		//enum ModifierKind:
> 		//	EXCEPTION="exception" | STREAM="stream" | ORDERED="ordered" | UNIQUE="unique";
>-		public EnumRule getRule() {
>-			return rule;
>-		}
>+		public EnumRule getRule() { return rule; }
> 
> 		//EXCEPTION="exception" | STREAM="stream" | ORDERED="ordered" | UNIQUE="unique"
>-		public Alternatives getAlternatives() {
>-			return cAlternatives;
>-		}
>+		public Alternatives getAlternatives() { return cAlternatives; }
> 
> 		//EXCEPTION="exception"
>-		public EnumLiteralDeclaration getEXCEPTIONEnumLiteralDeclaration_0() {
>-			return cEXCEPTIONEnumLiteralDeclaration_0;
>-		}
>+		public EnumLiteralDeclaration getEXCEPTIONEnumLiteralDeclaration_0() { return cEXCEPTIONEnumLiteralDeclaration_0; }
> 
> 		//"exception"
>-		public Keyword getEXCEPTIONExceptionKeyword_0_0() {
>-			return cEXCEPTIONExceptionKeyword_0_0;
>-		}
>+		public Keyword getEXCEPTIONExceptionKeyword_0_0() { return cEXCEPTIONExceptionKeyword_0_0; }
> 
> 		//STREAM="stream"
>-		public EnumLiteralDeclaration getSTREAMEnumLiteralDeclaration_1() {
>-			return cSTREAMEnumLiteralDeclaration_1;
>-		}
>+		public EnumLiteralDeclaration getSTREAMEnumLiteralDeclaration_1() { return cSTREAMEnumLiteralDeclaration_1; }
> 
> 		//"stream"
>-		public Keyword getSTREAMStreamKeyword_1_0() {
>-			return cSTREAMStreamKeyword_1_0;
>-		}
>+		public Keyword getSTREAMStreamKeyword_1_0() { return cSTREAMStreamKeyword_1_0; }
> 
> 		//ORDERED="ordered"
>-		public EnumLiteralDeclaration getORDEREDEnumLiteralDeclaration_2() {
>-			return cORDEREDEnumLiteralDeclaration_2;
>-		}
>+		public EnumLiteralDeclaration getORDEREDEnumLiteralDeclaration_2() { return cORDEREDEnumLiteralDeclaration_2; }
> 
> 		//"ordered"
>-		public Keyword getORDEREDOrderedKeyword_2_0() {
>-			return cORDEREDOrderedKeyword_2_0;
>-		}
>+		public Keyword getORDEREDOrderedKeyword_2_0() { return cORDEREDOrderedKeyword_2_0; }
> 
> 		//UNIQUE="unique"
>-		public EnumLiteralDeclaration getUNIQUEEnumLiteralDeclaration_3() {
>-			return cUNIQUEEnumLiteralDeclaration_3;
>-		}
>+		public EnumLiteralDeclaration getUNIQUEEnumLiteralDeclaration_3() { return cUNIQUEEnumLiteralDeclaration_3; }
> 
> 		//"unique"
>-		public Keyword getUNIQUEUniqueKeyword_3_0() {
>-			return cUNIQUEUniqueKeyword_3_0;
>-		}
>+		public Keyword getUNIQUEUniqueKeyword_3_0() { return cUNIQUEUniqueKeyword_3_0; }
> 	}
> 
> 	public class EffectKindElements extends AbstractEnumRuleElementFinder {
>-
>-		private final EnumRule rule = (EnumRule)GrammarUtil.findRuleForName(getGrammar(), "EffectKind");
>-
>+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "EffectKind");
> 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
>-
> 		private final EnumLiteralDeclaration cCREATEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
>-
> 		private final Keyword cCREATECreateKeyword_0_0 = (Keyword)cCREATEEnumLiteralDeclaration_0.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cREADEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
>-
> 		private final Keyword cREADReadKeyword_1_0 = (Keyword)cREADEnumLiteralDeclaration_1.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cUPDATEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
>-
> 		private final Keyword cUPDATEUpdateKeyword_2_0 = (Keyword)cUPDATEEnumLiteralDeclaration_2.eContents().get(0);
>-
> 		private final EnumLiteralDeclaration cDELETEEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
>-
> 		private final Keyword cDELETEDeleteKeyword_3_0 = (Keyword)cDELETEEnumLiteralDeclaration_3.eContents().get(0);
>-
>+		
> 		//enum EffectKind:
> 		//	CREATE="create" | READ="read" | UPDATE="update" | DELETE="delete";
>-		public EnumRule getRule() {
>-			return rule;
>-		}
>+		public EnumRule getRule() { return rule; }
> 
> 		//CREATE="create" | READ="read" | UPDATE="update" | DELETE="delete"
>-		public Alternatives getAlternatives() {
>-			return cAlternatives;
>-		}
>+		public Alternatives getAlternatives() { return cAlternatives; }
> 
> 		//CREATE="create"
>-		public EnumLiteralDeclaration getCREATEEnumLiteralDeclaration_0() {
>-			return cCREATEEnumLiteralDeclaration_0;
>-		}
>+		public EnumLiteralDeclaration getCREATEEnumLiteralDeclaration_0() { return cCREATEEnumLiteralDeclaration_0; }
> 
> 		//"create"
>-		public Keyword getCREATECreateKeyword_0_0() {
>-			return cCREATECreateKeyword_0_0;
>-		}
>+		public Keyword getCREATECreateKeyword_0_0() { return cCREATECreateKeyword_0_0; }
> 
> 		//READ="read"
>-		public EnumLiteralDeclaration getREADEnumLiteralDeclaration_1() {
>-			return cREADEnumLiteralDeclaration_1;
>-		}
>+		public EnumLiteralDeclaration getREADEnumLiteralDeclaration_1() { return cREADEnumLiteralDeclaration_1; }
> 
> 		//"read"
>-		public Keyword getREADReadKeyword_1_0() {
>-			return cREADReadKeyword_1_0;
>-		}
>+		public Keyword getREADReadKeyword_1_0() { return cREADReadKeyword_1_0; }
> 
> 		//UPDATE="update"
>-		public EnumLiteralDeclaration getUPDATEEnumLiteralDeclaration_2() {
>-			return cUPDATEEnumLiteralDeclaration_2;
>-		}
>+		public EnumLiteralDeclaration getUPDATEEnumLiteralDeclaration_2() { return cUPDATEEnumLiteralDeclaration_2; }
> 
> 		//"update"
>-		public Keyword getUPDATEUpdateKeyword_2_0() {
>-			return cUPDATEUpdateKeyword_2_0;
>-		}
>+		public Keyword getUPDATEUpdateKeyword_2_0() { return cUPDATEUpdateKeyword_2_0; }
> 
> 		//DELETE="delete"
>-		public EnumLiteralDeclaration getDELETEEnumLiteralDeclaration_3() {
>-			return cDELETEEnumLiteralDeclaration_3;
>-		}
>+		public EnumLiteralDeclaration getDELETEEnumLiteralDeclaration_3() { return cDELETEEnumLiteralDeclaration_3; }
> 
> 		//"delete"
>-		public Keyword getDELETEDeleteKeyword_3_0() {
>-			return cDELETEDeleteKeyword_3_0;
>-		}
>+		public Keyword getDELETEDeleteKeyword_3_0() { return cDELETEDeleteKeyword_3_0; }
> 	}
>-
>+	
> 	private ParameterRuleElements pParameterRule;
>-
> 	private ModifiersRuleElements pModifiersRule;
>-
> 	private ModifierSpecificationElements pModifierSpecification;
>-
> 	private ModifierKindElements unknownRuleModifierKind;
>-
> 	private EffectKindElements unknownRuleEffectKind;
>-
> 	private EffectRuleElements pEffectRule;
>-
>+	
> 	private final GrammarProvider grammarProvider;
> 
> 	private UmlCommonGrammarAccess gaUmlCommon;
> 
> 	@Inject
>-	public UmlParameterGrammarAccess(GrammarProvider grammarProvider, UmlCommonGrammarAccess gaUmlCommon) {
>+	public UmlParameterGrammarAccess(GrammarProvider grammarProvider,
>+		UmlCommonGrammarAccess gaUmlCommon) {
> 		this.grammarProvider = grammarProvider;
> 		this.gaUmlCommon = gaUmlCommon;
> 	}
>-
>-	public Grammar getGrammar() {
>+	
>+	public Grammar getGrammar() {	
> 		return grammarProvider.getGrammar(this);
> 	}
>-
>+	
> 
> 	public UmlCommonGrammarAccess getUmlCommonGrammarAccess() {
> 		return gaUmlCommon;
> 	}
> 
>-
>+	
> 	//ParameterRule:
> 	//	visibility=VisibilityKind direction=Direction name=ID ":" (type=TypeRule | "<Undefined>")
> 	//	multiplicity=MultiplicityRule? modifiers=ModifiersRule? effect=EffectRule;
> 	public ParameterRuleElements getParameterRuleAccess() {
> 		return (pParameterRule != null) ? pParameterRule : (pParameterRule = new ParameterRuleElements());
> 	}
>-
>+	
> 	public ParserRule getParameterRuleRule() {
> 		return getParameterRuleAccess().getRule();
> 	}
>@@ -505,7 +324,7 @@
> 	public ModifiersRuleElements getModifiersRuleAccess() {
> 		return (pModifiersRule != null) ? pModifiersRule : (pModifiersRule = new ModifiersRuleElements());
> 	}
>-
>+	
> 	public ParserRule getModifiersRuleRule() {
> 		return getModifiersRuleAccess().getRule();
> 	}
>@@ -515,7 +334,7 @@
> 	public ModifierSpecificationElements getModifierSpecificationAccess() {
> 		return (pModifierSpecification != null) ? pModifierSpecification : (pModifierSpecification = new ModifierSpecificationElements());
> 	}
>-
>+	
> 	public ParserRule getModifierSpecificationRule() {
> 		return getModifierSpecificationAccess().getRule();
> 	}
>@@ -525,7 +344,7 @@
> 	public ModifierKindElements getModifierKindAccess() {
> 		return (unknownRuleModifierKind != null) ? unknownRuleModifierKind : (unknownRuleModifierKind = new ModifierKindElements());
> 	}
>-
>+	
> 	public EnumRule getModifierKindRule() {
> 		return getModifierKindAccess().getRule();
> 	}
>@@ -535,7 +354,7 @@
> 	public EffectKindElements getEffectKindAccess() {
> 		return (unknownRuleEffectKind != null) ? unknownRuleEffectKind : (unknownRuleEffectKind = new EffectKindElements());
> 	}
>-
>+	
> 	public EnumRule getEffectKindRule() {
> 		return getEffectKindAccess().getRule();
> 	}
>@@ -545,7 +364,7 @@
> 	public EffectRuleElements getEffectRuleAccess() {
> 		return (pEffectRule != null) ? pEffectRule : (pEffectRule = new EffectRuleElements());
> 	}
>-
>+	
> 	public ParserRule getEffectRuleRule() {
> 		return getEffectRuleAccess().getRule();
> 	}
>@@ -555,7 +374,7 @@
> 	public UmlCommonGrammarAccess.QualifiedNameElements getQualifiedNameAccess() {
> 		return gaUmlCommon.getQualifiedNameAccess();
> 	}
>-
>+	
> 	public ParserRule getQualifiedNameRule() {
> 		return getQualifiedNameAccess().getRule();
> 	}
>@@ -565,7 +384,7 @@
> 	public UmlCommonGrammarAccess.TypeRuleElements getTypeRuleAccess() {
> 		return gaUmlCommon.getTypeRuleAccess();
> 	}
>-
>+	
> 	public ParserRule getTypeRuleRule() {
> 		return getTypeRuleAccess().getRule();
> 	}
>@@ -575,7 +394,7 @@
> 	public UmlCommonGrammarAccess.VisibilityKindElements getVisibilityKindAccess() {
> 		return gaUmlCommon.getVisibilityKindAccess();
> 	}
>-
>+	
> 	public EnumRule getVisibilityKindRule() {
> 		return getVisibilityKindAccess().getRule();
> 	}
>@@ -585,7 +404,7 @@
> 	public UmlCommonGrammarAccess.MultiplicityRuleElements getMultiplicityRuleAccess() {
> 		return gaUmlCommon.getMultiplicityRuleAccess();
> 	}
>-
>+	
> 	public ParserRule getMultiplicityRuleRule() {
> 		return getMultiplicityRuleAccess().getRule();
> 	}
>@@ -595,7 +414,7 @@
> 	public UmlCommonGrammarAccess.BoundSpecificationElements getBoundSpecificationAccess() {
> 		return gaUmlCommon.getBoundSpecificationAccess();
> 	}
>-
>+	
> 	public ParserRule getBoundSpecificationRule() {
> 		return getBoundSpecificationAccess().getRule();
> 	}
>@@ -604,14 +423,14 @@
> 	//	"0".."9" "0".."9"* | "*";
> 	public TerminalRule getUnlimitedLiteralRule() {
> 		return gaUmlCommon.getUnlimitedLiteralRule();
>-	}
>+	} 
> 
> 	//enum Direction:
> 	//	IN="in" | OUT="out" | INOUT="inout" | RETURN="return";
> 	public UmlCommonGrammarAccess.DirectionElements getDirectionAccess() {
> 		return gaUmlCommon.getDirectionAccess();
> 	}
>-
>+	
> 	public EnumRule getDirectionRule() {
> 		return getDirectionAccess().getRule();
> 	}
>@@ -620,42 +439,42 @@
> 	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
> 	public TerminalRule getIDRule() {
> 		return gaUmlCommon.getIDRule();
>-	}
>+	} 
> 
> 	//terminal INT returns ecore::EInt:
> 	//	"0".."9"+;
> 	public TerminalRule getINTRule() {
> 		return gaUmlCommon.getINTRule();
>-	}
>+	} 
> 
> 	//terminal STRING:
>-	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" |
>-	//	"f" | "r" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
>+	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
>+	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
> 	public TerminalRule getSTRINGRule() {
> 		return gaUmlCommon.getSTRINGRule();
>-	}
>+	} 
> 
> 	//terminal ML_COMMENT:
> 	//	"/ *"->"* /";
> 	public TerminalRule getML_COMMENTRule() {
> 		return gaUmlCommon.getML_COMMENTRule();
>-	}
>+	} 
> 
> 	//terminal SL_COMMENT:
> 	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
> 	public TerminalRule getSL_COMMENTRule() {
> 		return gaUmlCommon.getSL_COMMENTRule();
>-	}
>+	} 
> 
> 	//terminal WS:
> 	//	(" " | "\t" | "\r" | "\n")+;
> 	public TerminalRule getWSRule() {
> 		return gaUmlCommon.getWSRule();
>-	}
>+	} 
> 
> 	//terminal ANY_OTHER:
> 	//	.;
> 	public TerminalRule getANY_OTHERRule() {
> 		return gaUmlCommon.getANY_OTHERRule();
>-	}
>+	} 
> }
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/AbstractUmlParameterRuntimeModule.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/AbstractUmlParameterRuntimeModule.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/AbstractUmlParameterRuntimeModule.java	(working copy)
>@@ -14,7 +14,7 @@
> /**
> * Manual modifications go to {org.eclipse.papyrus.parameter.editor.xtext.UmlParameterRuntimeModule}
> */
>-@SuppressWarnings("all")
>+ @SuppressWarnings("all")
> public abstract class AbstractUmlParameterRuntimeModule extends DefaultRuntimeModule {
> 
> 	protected Properties properties = null;
>@@ -24,16 +24,16 @@
> 		properties = tryBindProperties(binder, "org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.properties");
> 		super.configure(binder);
> 	}
>-
>+	
> 	public void configureLanguageName(Binder binder) {
> 		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.parameter.editor.xtext.UmlParameter");
> 	}
>-
>+	
> 	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("umlparameter");
> 	}
>-
>+	
> 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
> 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
> 		return org.eclipse.papyrus.parameter.editor.xtext.services.UmlParameterGrammarAccess.class;
>@@ -45,7 +45,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
>-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
>+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
> 		return org.eclipse.papyrus.parameter.editor.xtext.parser.antlr.UmlParameterParser.class;
> 	}
> 
>@@ -80,8 +80,7 @@
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
>-	@org.eclipse.xtext.service.SingletonBinding(eager = true)
>-	public Class<? extends org.eclipse.papyrus.parameter.editor.xtext.validation.UmlParameterJavaValidator> bindUmlParameterJavaValidator() {
>+	@org.eclipse.xtext.service.SingletonBinding(eager=true)	public Class<? extends org.eclipse.papyrus.parameter.editor.xtext.validation.UmlParameterJavaValidator> bindUmlParameterJavaValidator() {
> 		return org.eclipse.papyrus.parameter.editor.xtext.validation.UmlParameterJavaValidator.class;
> 	}
> 
>@@ -92,7 +91,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
> 	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
>-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named("org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.delegate")).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
>+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>@@ -100,6 +99,11 @@
> 		return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
> 	}
> 
>+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
>+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
>+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
>+	}
>+
> 	// contributed by org.eclipse.xtext.generator.exporting.SimpleNamesFragment
> 	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
> 		return org.eclipse.xtext.naming.SimpleNameProvider.class;
>@@ -122,7 +126,7 @@
> 
> 	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
> 	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.scoping.impl.AbstractGlobalScopeProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
>+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
> 	}
> 
> 	// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameterStandaloneSetupGenerated.java
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameterStandaloneSetupGenerated.java	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameterStandaloneSetupGenerated.java	(working copy)
>@@ -1,16 +1,3 @@
>-/*****************************************************************************
>- * Copyright (c) 2010 CEA LIST.
>- *
>- * 
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
>- *
>- *****************************************************************************/
> 
> package org.eclipse.papyrus.parameter.editor.xtext;
> 
>@@ -34,22 +21,21 @@
> 		register(injector);
> 		return injector;
> 	}
>-
>+	
> 	public Injector createInjector() {
> 		return Guice.createInjector(new org.eclipse.papyrus.parameter.editor.xtext.UmlParameterRuntimeModule());
> 	}
>-
>+	
> 	public void register(Injector injector) {
>-		if(!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter")) {
>-			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter", org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage.eINSTANCE);
>-		}
>+	if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter")) {
>+		EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/parameter/editor/xtext/UmlParameter", org.eclipse.papyrus.parameter.editor.xtext.umlParameter.UmlParameterPackage.eINSTANCE);
>+	}
> 
> 		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
> 		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
> 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("umlparameter", resourceFactory);
> 		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("umlparameter", serviceProvider);
>-
>-
>+		
> 
> 
> 
>Index: src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.genmodel
>===================================================================
>--- src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.genmodel	(revision 4043)
>+++ src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.genmodel	(working copy)
>@@ -6,38 +6,38 @@
> modelPluginID="org.eclipse.papyrus.parameter.editor.xtext" forceOverwrite="true"
> modelName="UmlParameter" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.parameter.editor.xtext.edit"
>- editorPluginID="org.eclipse.papyrus.parameter.editor.xtext.editor" usedGenPackages="../../../../../../../../org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UMLCommon.genmodel#//umlCommon">
>+ editorPluginID="org.eclipse.papyrus.parameter.editor.xtext.editor" usedGenPackages="platform:/resource/org.eclipse.papyrus.common.editor.xtext/src-gen/org/eclipse/papyrus/common/editor/xtext/UMLCommon.genmodel#//umlCommon">
> <genPackages prefix="UmlParameter" basePackage="org.eclipse.papyrus.parameter.editor.xtext"
>- resource="XML" disposableProviderFactory="true" ecorePackage="UmlParameter.ecore#/">
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlParameter.ecore#//ModifierKind">
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//ModifierKind/EXCEPTION"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//ModifierKind/STREAM"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//ModifierKind/ORDERED"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//ModifierKind/UNIQUE"/>
>+ resource="XML" disposableProviderFactory="true" ecorePackage="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#/">
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierKind/EXCEPTION"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierKind/STREAM"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierKind/ORDERED"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierKind/UNIQUE"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="UmlParameter.ecore#//EffectKind">
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//EffectKind/CREATE"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//EffectKind/READ"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//EffectKind/UPDATE"/>
>- <genEnumLiterals ecoreEnumLiteral="UmlParameter.ecore#//EffectKind/DELETE"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectKind">
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectKind/CREATE"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectKind/READ"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectKind/UPDATE"/>
>+ <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectKind/DELETE"/>
> </genEnums>
>- <genClasses ecoreClass="UmlParameter.ecore#//ParameterRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlParameter.ecore#//ParameterRule/visibility"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlParameter.ecore#//ParameterRule/direction"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlParameter.ecore#//ParameterRule/name"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlParameter.ecore#//ParameterRule/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlParameter.ecore#//ParameterRule/multiplicity"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlParameter.ecore#//ParameterRule/modifiers"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlParameter.ecore#//ParameterRule/effect"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/visibility"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/direction"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/name"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/multiplicity"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/modifiers"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ParameterRule/effect"/>
> </genClasses>
>- <genClasses ecoreClass="UmlParameter.ecore#//ModifiersRule">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlParameter.ecore#//ModifiersRule/values"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifiersRule">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifiersRule/values"/>
> </genClasses>
>- <genClasses ecoreClass="UmlParameter.ecore#//ModifierSpecification">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlParameter.ecore#//ModifierSpecification/value"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierSpecification">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//ModifierSpecification/value"/>
> </genClasses>
>- <genClasses ecoreClass="UmlParameter.ecore#//EffectRule">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlParameter.ecore#//EffectRule/effectKind"/>
>+ <genClasses ecoreClass="platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectRule">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/resource/org.eclipse.papyrus.parameter.editor.xtext/src-gen/org/eclipse/papyrus/parameter/editor/xtext/UmlParameter.ecore#//EffectRule/effectKind"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>

Flags:

rschnekenburger: iplog+

Actions: View | Diff

Attachments on bug 337289: 189077 | 189079 | 191404