Merges branch 0.7.X changes r3446:3844 into the trunk

NEW - bug 334873: [Xtext Editors] Property editor should support "subsets", "redefines" and "sequence" https://bugs.eclipse.org/bugs/show_bug.cgi?id=334873
author: vlorenzo 2011-01-27 10:51:40 +0000
committer: vlorenzo 2011-01-27 10:51:40 +0000
commit: fae425850d7ac2c339e782a58e6869a3af03c096 (patch)
tree: 2b144dac66f8bcad77f14fa125b016c510c80a4c
parent: ac1a33001813b1e2dc2c177db9c0ccf40aac0046 (diff)
download: org.eclipse.papyrus-fae425850d7ac2c339e782a58e6869a3af03c096.tar.gz
org.eclipse.papyrus-fae425850d7ac2c339e782a58e6869a3af03c096.tar.xz
org.eclipse.papyrus-fae425850d7ac2c339e782a58e6869a3af03c096.zip
41 files changed, 6424 insertions, 1273 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java
index 9855204c986..904f30caa13 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/AbstractUmlPropertyUiModule.java
@@ -35,7 +35,7 @@ public abstract class AbstractUmlPropertyUiModule extends DefaultUiModule {
 
 	// 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;
+		return org.eclipse.xtext.ui.editor.FastDamagerRepairer.class;
 	}
 
 	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
@@ -103,6 +103,16 @@ public abstract class AbstractUmlPropertyUiModule extends DefaultUiModule {
 		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.property.editor.xtext.ui.quickfix.UmlPropertyQuickfixProvider.class;
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/AbstractUmlPropertyProposalProvider.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/AbstractUmlPropertyProposalProvider.java
index d868ffc2a8b..d640226711e 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/AbstractUmlPropertyProposalProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/AbstractUmlPropertyProposalProvider.java
@@ -35,6 +35,9 @@ public class AbstractUmlPropertyProposalProvider extends TerminalsProposalProvid
 	public void completePropertyRule_Modifiers(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
+	public void completePropertyRule_Default(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);
 	}
@@ -59,6 +62,21 @@ public class AbstractUmlPropertyProposalProvider extends TerminalsProposalProvid
 	public void completeModifierSpecification_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
+	public void completeModifierSpecification_Redefines(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeModifierSpecification_Subsets(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeRedefinesRule_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeSubsetsRule_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeDefaultValueRule_Default(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
     
 	public void complete_PropertyRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
@@ -90,4 +108,13 @@ public class AbstractUmlPropertyProposalProvider extends TerminalsProposalProvid
 	public void complete_ModifierKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_RedefinesRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void complete_SubsetsRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void complete_DefaultValueRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 }
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/UmlPropertyParser.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/UmlPropertyParser.java
index 6c66103991e..f5eb361e70c 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/UmlPropertyParser.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/UmlPropertyParser.java
@@ -38,6 +38,7 @@ public class UmlPropertyParser extends AbstractContentAssistParser {
 				private static final long serialVersionUID = 1L;
 				{
 					put(grammarAccess.getPropertyRuleAccess().getAlternatives_4(), "rule__PropertyRule__Alternatives_4");
+					put(grammarAccess.getModifierSpecificationAccess().getAlternatives(), "rule__ModifierSpecification__Alternatives");
 					put(grammarAccess.getVisibilityKindAccess().getAlternatives(), "rule__VisibilityKind__Alternatives");
 					put(grammarAccess.getModifierKindAccess().getAlternatives(), "rule__ModifierKind__Alternatives");
 					put(grammarAccess.getPropertyRuleAccess().getGroup(), "rule__PropertyRule__Group__0");
@@ -47,12 +48,16 @@ public class UmlPropertyParser extends AbstractContentAssistParser {
 					put(grammarAccess.getMultiplicityRuleAccess().getGroup_2(), "rule__MultiplicityRule__Group_2__0");
 					put(grammarAccess.getModifiersRuleAccess().getGroup(), "rule__ModifiersRule__Group__0");
 					put(grammarAccess.getModifiersRuleAccess().getGroup_2(), "rule__ModifiersRule__Group_2__0");
+					put(grammarAccess.getRedefinesRuleAccess().getGroup(), "rule__RedefinesRule__Group__0");
+					put(grammarAccess.getSubsetsRuleAccess().getGroup(), "rule__SubsetsRule__Group__0");
+					put(grammarAccess.getDefaultValueRuleAccess().getGroup(), "rule__DefaultValueRule__Group__0");
 					put(grammarAccess.getPropertyRuleAccess().getVisibilityAssignment_0(), "rule__PropertyRule__VisibilityAssignment_0");
 					put(grammarAccess.getPropertyRuleAccess().getIsDerivedAssignment_1(), "rule__PropertyRule__IsDerivedAssignment_1");
 					put(grammarAccess.getPropertyRuleAccess().getNameAssignment_2(), "rule__PropertyRule__NameAssignment_2");
 					put(grammarAccess.getPropertyRuleAccess().getTypeAssignment_4_0(), "rule__PropertyRule__TypeAssignment_4_0");
 					put(grammarAccess.getPropertyRuleAccess().getMultiplicityAssignment_5(), "rule__PropertyRule__MultiplicityAssignment_5");
 					put(grammarAccess.getPropertyRuleAccess().getModifiersAssignment_6(), "rule__PropertyRule__ModifiersAssignment_6");
+					put(grammarAccess.getPropertyRuleAccess().getDefaultAssignment_7(), "rule__PropertyRule__DefaultAssignment_7");
 					put(grammarAccess.getTypeRuleAccess().getPathAssignment_0(), "rule__TypeRule__PathAssignment_0");
 					put(grammarAccess.getTypeRuleAccess().getTypeAssignment_1(), "rule__TypeRule__TypeAssignment_1");
 					put(grammarAccess.getQualifiedNameAccess().getPathAssignment_0(), "rule__QualifiedName__PathAssignment_0");
@@ -62,7 +67,12 @@ public class UmlPropertyParser extends AbstractContentAssistParser {
 					put(grammarAccess.getBoundSpecificationAccess().getValueAssignment(), "rule__BoundSpecification__ValueAssignment");
 					put(grammarAccess.getModifiersRuleAccess().getValuesAssignment_1(), "rule__ModifiersRule__ValuesAssignment_1");
 					put(grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1(), "rule__ModifiersRule__ValuesAssignment_2_1");
-					put(grammarAccess.getModifierSpecificationAccess().getValueAssignment(), "rule__ModifierSpecification__ValueAssignment");
+					put(grammarAccess.getModifierSpecificationAccess().getValueAssignment_0(), "rule__ModifierSpecification__ValueAssignment_0");
+					put(grammarAccess.getModifierSpecificationAccess().getRedefinesAssignment_1(), "rule__ModifierSpecification__RedefinesAssignment_1");
+					put(grammarAccess.getModifierSpecificationAccess().getSubsetsAssignment_2(), "rule__ModifierSpecification__SubsetsAssignment_2");
+					put(grammarAccess.getRedefinesRuleAccess().getPropertyAssignment_1(), "rule__RedefinesRule__PropertyAssignment_1");
+					put(grammarAccess.getSubsetsRuleAccess().getPropertyAssignment_1(), "rule__SubsetsRule__PropertyAssignment_1");
+					put(grammarAccess.getDefaultValueRuleAccess().getDefaultAssignment_1(), "rule__DefaultValueRule__DefaultAssignment_1");
 				}
 			};
 		}
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g
index 41babedf091..88a94b0d623 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g
@@ -241,9 +241,93 @@ ruleModifierSpecification
     }
 	:
 (
-{ before(grammarAccess.getModifierSpecificationAccess().getValueAssignment()); }
-(rule__ModifierSpecification__ValueAssignment)
-{ after(grammarAccess.getModifierSpecificationAccess().getValueAssignment()); }
+{ before(grammarAccess.getModifierSpecificationAccess().getAlternatives()); }
+(rule__ModifierSpecification__Alternatives)
+{ after(grammarAccess.getModifierSpecificationAccess().getAlternatives()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+// Entry rule entryRuleRedefinesRule
+entryRuleRedefinesRule 
+:
+{ before(grammarAccess.getRedefinesRuleRule()); }
+	 ruleRedefinesRule
+{ after(grammarAccess.getRedefinesRuleRule()); } 
+	 EOF 
+;
+
+// Rule RedefinesRule
+ruleRedefinesRule
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getRedefinesRuleAccess().getGroup()); }
+(rule__RedefinesRule__Group__0)
+{ after(grammarAccess.getRedefinesRuleAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+// Entry rule entryRuleSubsetsRule
+entryRuleSubsetsRule 
+:
+{ before(grammarAccess.getSubsetsRuleRule()); }
+	 ruleSubsetsRule
+{ after(grammarAccess.getSubsetsRuleRule()); } 
+	 EOF 
+;
+
+// Rule SubsetsRule
+ruleSubsetsRule
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getSubsetsRuleAccess().getGroup()); }
+(rule__SubsetsRule__Group__0)
+{ after(grammarAccess.getSubsetsRuleAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+// Entry rule entryRuleDefaultValueRule
+entryRuleDefaultValueRule 
+:
+{ before(grammarAccess.getDefaultValueRuleRule()); }
+	 ruleDefaultValueRule
+{ after(grammarAccess.getDefaultValueRuleRule()); } 
+	 EOF 
+;
+
+// Rule DefaultValueRule
+ruleDefaultValueRule
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getDefaultValueRuleAccess().getGroup()); }
+(rule__DefaultValueRule__Group__0)
+{ after(grammarAccess.getDefaultValueRuleAccess().getGroup()); }
 )
 
 ;
@@ -316,6 +400,34 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__ModifierSpecification__Alternatives
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getModifierSpecificationAccess().getValueAssignment_0()); }
+(rule__ModifierSpecification__ValueAssignment_0)
+{ after(grammarAccess.getModifierSpecificationAccess().getValueAssignment_0()); }
+)
+
+    |(
+{ before(grammarAccess.getModifierSpecificationAccess().getRedefinesAssignment_1()); }
+(rule__ModifierSpecification__RedefinesAssignment_1)
+{ after(grammarAccess.getModifierSpecificationAccess().getRedefinesAssignment_1()); }
+)
+
+    |(
+{ before(grammarAccess.getModifierSpecificationAccess().getSubsetsAssignment_2()); }
+(rule__ModifierSpecification__SubsetsAssignment_2)
+{ after(grammarAccess.getModifierSpecificationAccess().getSubsetsAssignment_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__VisibilityKind__Alternatives
     @init {
 		int stackSize = keepStackSize();
@@ -576,6 +688,7 @@ rule__PropertyRule__Group__6
     }
 :
 	rule__PropertyRule__Group__6__Impl
+	rule__PropertyRule__Group__7
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -598,6 +711,36 @@ finally {
 }
 
 
+rule__PropertyRule__Group__7
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__PropertyRule__Group__7__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__PropertyRule__Group__7__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getPropertyRuleAccess().getDefaultAssignment_7()); }
+(rule__PropertyRule__DefaultAssignment_7)?
+{ after(grammarAccess.getPropertyRuleAccess().getDefaultAssignment_7()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
 
 
 
@@ -1147,6 +1290,195 @@ finally {
 
 
 
+rule__RedefinesRule__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__RedefinesRule__Group__0__Impl
+	rule__RedefinesRule__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__RedefinesRule__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0()); }
+
+	'redefines' 
+
+{ after(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__RedefinesRule__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__RedefinesRule__Group__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__RedefinesRule__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getRedefinesRuleAccess().getPropertyAssignment_1()); }
+(rule__RedefinesRule__PropertyAssignment_1)
+{ after(grammarAccess.getRedefinesRuleAccess().getPropertyAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+rule__SubsetsRule__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SubsetsRule__Group__0__Impl
+	rule__SubsetsRule__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SubsetsRule__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0()); }
+
+	'subsets' 
+
+{ after(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SubsetsRule__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SubsetsRule__Group__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SubsetsRule__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSubsetsRuleAccess().getPropertyAssignment_1()); }
+(rule__SubsetsRule__PropertyAssignment_1)
+{ after(grammarAccess.getSubsetsRuleAccess().getPropertyAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+rule__DefaultValueRule__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__DefaultValueRule__Group__0__Impl
+	rule__DefaultValueRule__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__DefaultValueRule__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0()); }
+
+	'=' 
+
+{ after(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__DefaultValueRule__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__DefaultValueRule__Group__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__DefaultValueRule__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getDefaultValueRuleAccess().getDefaultAssignment_1()); }
+(rule__DefaultValueRule__DefaultAssignment_1)
+{ after(grammarAccess.getDefaultValueRuleAccess().getDefaultAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
 
 rule__PropertyRule__VisibilityAssignment_0
     @init {
@@ -1246,6 +1578,21 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__PropertyRule__DefaultAssignment_7
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); }
+	ruleDefaultValueRule{ after(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__TypeRule__PathAssignment_0
     @init {
 		int stackSize = keepStackSize();
@@ -1389,14 +1736,97 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__ModifierSpecification__ValueAssignment
+rule__ModifierSpecification__ValueAssignment_0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); }
+	ruleModifierKind{ after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__ModifierSpecification__RedefinesAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); }
+	ruleRedefinesRule{ after(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__ModifierSpecification__SubsetsAssignment_2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); }
+	ruleSubsetsRule{ after(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__RedefinesRule__PropertyAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0()); }
+(
+{ before(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); }
+	RULE_ID{ after(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); }
+)
+{ after(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SubsetsRule__PropertyAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0()); }
+(
+{ before(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); }
+	RULE_ID{ after(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); }
+)
+{ after(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__DefaultValueRule__DefaultAssignment_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); }
-	ruleModifierKind{ after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); }
+{ before(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0()); }
+	RULE_STRING{ after(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0()); }
 )
 
 ;
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens
index 06a552d767b..3312a452c0b 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.tokens
@@ -1,8 +1,8 @@
 RULE_ID=4
-RULE_STRING=7
+RULE_STRING=6
 RULE_UNLIMITEDLITERAL=5
 RULE_ANY_OTHER=11
-RULE_INT=6
+RULE_INT=7
 RULE_WS=10
 RULE_SL_COMMENT=9
 RULE_ML_COMMENT=8
@@ -11,10 +11,13 @@ RULE_ML_COMMENT=8
 '}'=27
 '#'=15
 '~'=16
-'/'=29
+'/'=32
+'redefines'=29
 'readOnly'=17
 'unique'=20
 '{'=26
+'subsets'=30
+'='=31
 ':'=21
 '<Undefined>'=12
 '-'=14
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java
index 7e4300e4d32..f4d19494aa6 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyLexer.java
@@ -20,7 +20,7 @@ public class InternalUmlPropertyLexer extends Lexer {
     public static final int T27=27;
     public static final int T26=26;
     public static final int T25=25;
-    public static final int Tokens=30;
+    public static final int Tokens=33;
     public static final int T24=24;
     public static final int EOF=-1;
     public static final int RULE_SL_COMMENT=9;
@@ -29,8 +29,8 @@ public class InternalUmlPropertyLexer extends Lexer {
     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 RULE_STRING=6;
+    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;
@@ -39,7 +39,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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;
     public InternalUmlPropertyLexer() {;} 
     public InternalUmlPropertyLexer(CharStream input) {
         super(input);
@@ -363,10 +366,11 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT29() 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: ( '/' )
-            // ../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: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'
             {
-            match('/'); 
+            match("redefines"); 
+
 
             }
 
@@ -377,14 +381,69 @@ public class InternalUmlPropertyLexer extends Lexer {
     }
     // $ANTLR end T29
 
+    // $ANTLR start T30
+    public final void mT30() 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'
+            {
+            match("subsets"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T30
+
+    // $ANTLR start T31
+    public final void mT31() 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: '='
+            {
+            match('='); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T31
+
+    // $ANTLR start T32
+    public final void mT32() 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: '/'
+            {
+            match('/'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T32
+
     // $ANTLR start RULE_UNLIMITEDLITERAL
     public final void mRULE_UNLIMITEDLITERAL() throws RecognitionException {
         try {
             int _type = RULE_UNLIMITEDLITERAL;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1408: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:1408:25: ( '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: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' )* | '*' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1408:25: ( '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' )* | '*' )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -396,16 +455,16 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("1408:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
+                    new NoViableAltException("1838:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1408:26: '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:26: '0' .. '9' ( '0' .. '9' )*
                     {
                     matchRange('0','9'); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1408:35: ( '0' .. '9' )*
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1838:35: ( '0' .. '9' )*
                     loop1:
                     do {
                         int alt1=2;
@@ -418,7 +477,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                         switch (alt1) {
                     	case 1 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1408:36: '0' .. '9'
+                    	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1838:36: '0' .. '9'
                     	    {
                     	    matchRange('0','9'); 
 
@@ -434,7 +493,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1408:47: '*'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1838:47: '*'
                     {
                     match('*'); 
 
@@ -457,10 +516,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1410: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:1410:11: ( '^' )? ( '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: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' )*
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1410:11: ( '^' )?
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1840:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -469,7 +528,7 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1410:11: '^'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1840:11: '^'
                     {
                     match('^'); 
 
@@ -488,7 +547,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                 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:1410:40: ( '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:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -536,10 +595,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1412:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1412:12: ( '0' .. '9' )+
+            // ../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' )+
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1412:12: ( '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' )+
             int cnt5=0;
             loop5:
             do {
@@ -553,7 +612,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1412:13: '0' .. '9'
+            	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1842:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -583,10 +642,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:1414: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:1414: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: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' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1414: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' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -598,16 +657,16 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("1414:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
+                    new NoViableAltException("1844:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 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:1414: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' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1414: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' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -623,7 +682,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                         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:1414: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' | '\"' | '\\'' | '\\\\' )
                     	    {
                     	    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' ) {
@@ -640,7 +699,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1414:62: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:62: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -666,10 +725,10 @@ public class InternalUmlPropertyLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1414: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:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1414: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:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -685,7 +744,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                         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:1414: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: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' ) {
@@ -702,7 +761,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1414:129: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1844:129: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -744,12 +803,12 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1416: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:1416:19: '/*' ( 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: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; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1416:24: ( 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:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -774,7 +833,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1416:52: .
+            	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1846:52: .
             	    {
             	    matchAny(); 
 
@@ -802,12 +861,12 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418: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:1418:19: '//' (~ ( ( '\\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: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' )?
             {
             match("//"); 
 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../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' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -820,7 +879,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../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') ) {
             	        input.consume();
@@ -841,7 +900,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418:40: ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -850,9 +909,9 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418:41: ( '\\r' )? '\\n'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418:41: ( '\\r' )?
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -861,7 +920,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1418:41: '\\r'
+                            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1848:41: '\\r'
                             {
                             match('\r'); 
 
@@ -891,10 +950,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1420: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:1420:11: ( ' ' | '\\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: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' )+
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1420:11: ( ' ' | '\\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' )+
             int cnt13=0;
             loop13:
             do {
@@ -947,8 +1006,8 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1422:16: ( . )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1422:18: .
+            // ../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: .
             {
             matchAny(); 
 
@@ -962,8 +1021,8 @@ public class InternalUmlPropertyLexer extends Lexer {
     // $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 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt14=26;
+        // ../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 )
+        int alt14=29;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
@@ -1093,56 +1152,77 @@ public class InternalUmlPropertyLexer extends Lexer {
                 }
                 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: RULE_UNLIMITEDLITERAL
+                // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:82: T30
                 {
-                mRULE_UNLIMITEDLITERAL(); 
+                mT30(); 
 
                 }
                 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:104: RULE_ID
+                // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:86: T31
                 {
-                mRULE_ID(); 
+                mT31(); 
 
                 }
                 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:112: RULE_INT
+                // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1:90: T32
                 {
-                mRULE_INT(); 
+                mT32(); 
 
                 }
                 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:121: RULE_STRING
+                // ../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
                 {
-                mRULE_STRING(); 
+                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:133: 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:116: RULE_ID
                 {
-                mRULE_ML_COMMENT(); 
+                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:149: 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:124: RULE_INT
                 {
-                mRULE_SL_COMMENT(); 
+                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:165: RULE_WS
+                // ../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
                 {
-                mRULE_WS(); 
+                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:173: 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:145: 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
+                {
+                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
+                {
+                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
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1156,59 +1236,63 @@ public class InternalUmlPropertyLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\30\4\uffff\3\37\1\43\2\uffff\1\30\3\uffff\1\54\1\56\1"+
-        "\uffff\1\30\1\uffff\2\30\7\uffff\1\37\1\uffff\2\37\13\uffff\1\56"+
-        "\3\uffff\11\37\1\76\2\37\1\101\1\uffff\2\37\1\uffff\1\104\1\105"+
-        "\2\uffff";
+        "\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";
     static final String DFA14_eofS =
-        "\106\uffff";
+        "\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"+
-        "\52\1\60\1\uffff\1\101\1\uffff\2\0\7\uffff\1\141\1\uffff\1\151\1"+
-        "\144\13\uffff\1\60\3\uffff\1\144\1\157\1\145\1\117\1\165\1\156\1"+
-        "\162\1\156\1\145\1\60\1\145\1\154\1\60\1\uffff\1\144\1\171\1\uffff"+
-        "\2\60\2\uffff";
+        "\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";
     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\57\1\71\1\uffff\1\172\1\uffff\2\ufffe\7\uffff\1\141\1\uffff\1"+
-        "\151\1\144\13\uffff\1\71\3\uffff\1\144\1\161\1\145\1\117\1\165\1"+
-        "\156\1\162\1\156\1\145\1\172\1\145\1\154\1\172\1\uffff\1\144\1\171"+
-        "\1\uffff\2\172\2\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";
     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"+
-        "\2\uffff\1\23\1\uffff\1\24\2\uffff\1\31\1\32\1\1\1\2\1\3\1\4\1\5"+
-        "\1\uffff\1\24\2\uffff\1\13\1\12\1\14\1\15\1\16\1\17\1\20\1\21\1"+
-        "\27\1\30\1\22\1\uffff\1\23\1\26\1\31\15\uffff\1\7\2\uffff\1\11\2"+
-        "\uffff\1\10\1\6";
+        "\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";
     static final String DFA14_specialS =
-        "\106\uffff}>";
+        "\130\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\30\2\27\2\30\1\27\22\30\1\27\1\30\1\25\1\4\3\30\1\26\2\30"+
-            "\1\22\1\2\1\17\1\3\1\14\1\20\12\21\1\11\1\30\1\1\4\30\32\24"+
-            "\1\12\1\30\1\13\1\23\1\24\1\30\16\24\1\10\2\24\1\6\2\24\1\7"+
-            "\5\24\1\15\1\30\1\16\1\5\uff80\30",
-            "\1\31",
+            "\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",
+            "\1\33",
             "",
             "",
             "",
             "",
-            "\1\36",
             "\1\40",
-            "\1\41",
             "\1\42",
+            "\1\43",
+            "\1\44",
+            "",
             "",
+            "\1\50",
             "",
-            "\1\46",
             "",
             "",
+            "\1\54",
             "",
-            "\1\52\4\uffff\1\53",
-            "\12\55",
+            "\1\56\4\uffff\1\57",
+            "\12\62",
             "",
-            "\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\32\41\4\uffff\1\41\1\uffff\32\41",
             "",
-            "\uffff\57",
-            "\uffff\57",
+            "\uffff\63",
+            "\uffff\63",
             "",
             "",
             "",
@@ -1216,10 +1300,11 @@ public class InternalUmlPropertyLexer extends Lexer {
             "",
             "",
             "",
-            "\1\61",
+            "\1\66\2\uffff\1\65",
+            "",
+            "\1\67",
+            "\1\70",
             "",
-            "\1\62",
-            "\1\63",
             "",
             "",
             "",
@@ -1227,33 +1312,48 @@ public class InternalUmlPropertyLexer extends Lexer {
             "",
             "",
             "",
+            "\1\71",
             "",
             "",
             "",
             "",
-            "\12\55",
             "",
+            "\12\62",
             "",
             "",
-            "\1\64",
-            "\1\66\1\uffff\1\65",
-            "\1\67",
-            "\1\70",
-            "\1\71",
             "\1\72",
             "\1\73",
-            "\1\74",
-            "\1\75",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\74\1\uffff\1\75",
+            "\1\76",
             "\1\77",
             "\1\100",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
+            "\1\101",
             "\1\102",
             "\1\103",
+            "\1\104",
+            "\1\105",
+            "\1\106",
+            "\1\107",
+            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\111",
+            "\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",
+            "",
+            "\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",
+            "",
             "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
             "",
             ""
     };
@@ -1288,7 +1388,7 @@ public class InternalUmlPropertyLexer extends Lexer {
             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 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            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 );";
         }
     }
  
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java
index 09094fd2ed0..449149531e9 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlPropertyParser.java
@@ -23,13 +23,13 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalUmlPropertyParser 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>'", "'+'", "'-'", "'#'", "'~'", "'readOnly'", "'union'", "'ordered'", "'unique'", "':'", "'::'", "'['", "']'", "'..'", "'{'", "'}'", "','", "'/'"
+        "<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=7;
+    public static final int RULE_STRING=6;
     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_INT=7;
     public static final int RULE_WS=10;
     public static final int RULE_SL_COMMENT=9;
     public static final int EOF=-1;
@@ -544,30 +544,30 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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__ValueAssignment ) ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:242:2: ( ( ( rule__ModifierSpecification__ValueAssignment ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:243:1: ( ( rule__ModifierSpecification__ValueAssignment ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:242:2: ( ( ( rule__ModifierSpecification__Alternatives ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:243:1: ( ( rule__ModifierSpecification__Alternatives ) )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:243:1: ( ( rule__ModifierSpecification__ValueAssignment ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:244:1: ( rule__ModifierSpecification__ValueAssignment )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:243:1: ( ( rule__ModifierSpecification__Alternatives ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:244:1: ( rule__ModifierSpecification__Alternatives )
             {
-             before(grammarAccess.getModifierSpecificationAccess().getValueAssignment()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:245:1: ( rule__ModifierSpecification__ValueAssignment )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:245:2: rule__ModifierSpecification__ValueAssignment
+             before(grammarAccess.getModifierSpecificationAccess().getAlternatives()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:245:1: ( rule__ModifierSpecification__Alternatives )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:245:2: rule__ModifierSpecification__Alternatives
             {
-            pushFollow(FOLLOW_rule__ModifierSpecification__ValueAssignment_in_ruleModifierSpecification454);
-            rule__ModifierSpecification__ValueAssignment();
+            pushFollow(FOLLOW_rule__ModifierSpecification__Alternatives_in_ruleModifierSpecification454);
+            rule__ModifierSpecification__Alternatives();
             _fsp--;
 
 
             }
 
-             after(grammarAccess.getModifierSpecificationAccess().getValueAssignment()); 
+             after(grammarAccess.getModifierSpecificationAccess().getAlternatives()); 
 
             }
 
@@ -589,24 +589,249 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     // $ANTLR end ruleModifierSpecification
 
 
+    // $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 {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:258:1: ( ruleRedefinesRule EOF )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:259:1: ruleRedefinesRule EOF
+            {
+             before(grammarAccess.getRedefinesRuleRule()); 
+            pushFollow(FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule481);
+            ruleRedefinesRule();
+            _fsp--;
+
+             after(grammarAccess.getRedefinesRuleRule()); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRedefinesRule488); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end entryRuleRedefinesRule
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:270:2: ( ( ( 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:271:1: ( ( 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:271:1: ( ( 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:272:1: ( rule__RedefinesRule__Group__0 )
+            {
+             before(grammarAccess.getRedefinesRuleAccess().getGroup()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:273:1: ( 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:273:2: rule__RedefinesRule__Group__0
+            {
+            pushFollow(FOLLOW_rule__RedefinesRule__Group__0_in_ruleRedefinesRule514);
+            rule__RedefinesRule__Group__0();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getRedefinesRuleAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end ruleRedefinesRule
+
+
+    // $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 {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:286:1: ( ruleSubsetsRule EOF )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:287:1: ruleSubsetsRule EOF
+            {
+             before(grammarAccess.getSubsetsRuleRule()); 
+            pushFollow(FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule541);
+            ruleSubsetsRule();
+            _fsp--;
+
+             after(grammarAccess.getSubsetsRuleRule()); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleSubsetsRule548); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end entryRuleSubsetsRule
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:298:2: ( ( ( 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:299:1: ( ( 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:299:1: ( ( 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:300:1: ( rule__SubsetsRule__Group__0 )
+            {
+             before(grammarAccess.getSubsetsRuleAccess().getGroup()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:301:1: ( 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:301:2: rule__SubsetsRule__Group__0
+            {
+            pushFollow(FOLLOW_rule__SubsetsRule__Group__0_in_ruleSubsetsRule574);
+            rule__SubsetsRule__Group__0();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getSubsetsRuleAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end ruleSubsetsRule
+
+
+    // $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 {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:314:1: ( ruleDefaultValueRule EOF )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:315:1: ruleDefaultValueRule EOF
+            {
+             before(grammarAccess.getDefaultValueRuleRule()); 
+            pushFollow(FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule601);
+            ruleDefaultValueRule();
+            _fsp--;
+
+             after(grammarAccess.getDefaultValueRuleRule()); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleDefaultValueRule608); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end entryRuleDefaultValueRule
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:326:2: ( ( ( 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:327:1: ( ( 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:327:1: ( ( 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:328:1: ( rule__DefaultValueRule__Group__0 )
+            {
+             before(grammarAccess.getDefaultValueRuleAccess().getGroup()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:329:1: ( 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:329:2: rule__DefaultValueRule__Group__0
+            {
+            pushFollow(FOLLOW_rule__DefaultValueRule__Group__0_in_ruleDefaultValueRule634);
+            rule__DefaultValueRule__Group__0();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getDefaultValueRuleAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end ruleDefaultValueRule
+
+
     // $ANTLR start ruleVisibilityKind
-    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:258:1: ruleVisibilityKind : ( ( rule__VisibilityKind__Alternatives ) ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:262:1: ( ( ( rule__VisibilityKind__Alternatives ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:263:1: ( ( rule__VisibilityKind__Alternatives ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:346:1: ( ( ( rule__VisibilityKind__Alternatives ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:347:1: ( ( rule__VisibilityKind__Alternatives ) )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:263:1: ( ( rule__VisibilityKind__Alternatives ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:264:1: ( rule__VisibilityKind__Alternatives )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:347:1: ( ( rule__VisibilityKind__Alternatives ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:348:1: ( rule__VisibilityKind__Alternatives )
             {
              before(grammarAccess.getVisibilityKindAccess().getAlternatives()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:265:1: ( rule__VisibilityKind__Alternatives )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:265:2: rule__VisibilityKind__Alternatives
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:349:1: ( rule__VisibilityKind__Alternatives )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:349:2: rule__VisibilityKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind491);
+            pushFollow(FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind671);
             rule__VisibilityKind__Alternatives();
             _fsp--;
 
@@ -636,23 +861,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start ruleModifierKind
-    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:277:1: ruleModifierKind : ( ( rule__ModifierKind__Alternatives ) ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:281:1: ( ( ( rule__ModifierKind__Alternatives ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:282:1: ( ( rule__ModifierKind__Alternatives ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:365:1: ( ( ( rule__ModifierKind__Alternatives ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:366:1: ( ( rule__ModifierKind__Alternatives ) )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:282:1: ( ( rule__ModifierKind__Alternatives ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:283:1: ( rule__ModifierKind__Alternatives )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:366:1: ( ( rule__ModifierKind__Alternatives ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:367:1: ( rule__ModifierKind__Alternatives )
             {
              before(grammarAccess.getModifierKindAccess().getAlternatives()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:284:1: ( rule__ModifierKind__Alternatives )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:284:2: rule__ModifierKind__Alternatives
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:368:1: ( rule__ModifierKind__Alternatives )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:368:2: rule__ModifierKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind527);
+            pushFollow(FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind707);
             rule__ModifierKind__Alternatives();
             _fsp--;
 
@@ -682,13 +907,13 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:295:1: rule__PropertyRule__Alternatives_4 : ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:299:1: ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:383:1: ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -700,22 +925,22 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("295:1: rule__PropertyRule__Alternatives_4 : ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );", 1, 0, input);
+                    new NoViableAltException("379:1: rule__PropertyRule__Alternatives_4 : ( ( ( rule__PropertyRule__TypeAssignment_4_0 ) ) | ( '<Undefined>' ) );", 1, 0, input);
 
                 throw nvae;
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:300:1: ( ( 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:384:1: ( ( 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:300:1: ( ( 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:301:1: ( 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:384:1: ( ( 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:385:1: ( rule__PropertyRule__TypeAssignment_4_0 )
                     {
                      before(grammarAccess.getPropertyRuleAccess().getTypeAssignment_4_0()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:302:1: ( 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:302:2: 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:386:1: ( 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:386:2: rule__PropertyRule__TypeAssignment_4_0
                     {
-                    pushFollow(FOLLOW_rule__PropertyRule__TypeAssignment_4_0_in_rule__PropertyRule__Alternatives_4562);
+                    pushFollow(FOLLOW_rule__PropertyRule__TypeAssignment_4_0_in_rule__PropertyRule__Alternatives_4742);
                     rule__PropertyRule__TypeAssignment_4_0();
                     _fsp--;
 
@@ -730,13 +955,13 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:306:6: ( '<Undefined>' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:390:6: ( '<Undefined>' )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:306:6: ( '<Undefined>' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:307:1: '<Undefined>'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:390:6: ( '<Undefined>' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:391:1: '<Undefined>'
                     {
                      before(grammarAccess.getPropertyRuleAccess().getUndefinedKeyword_4_1()); 
-                    match(input,12,FOLLOW_12_in_rule__PropertyRule__Alternatives_4581); 
+                    match(input,12,FOLLOW_12_in_rule__PropertyRule__Alternatives_4761); 
                      after(grammarAccess.getPropertyRuleAccess().getUndefinedKeyword_4_1()); 
 
                     }
@@ -761,55 +986,180 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     // $ANTLR end rule__PropertyRule__Alternatives_4
 
 
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:407:1: ( ( ( rule__ModifierSpecification__ValueAssignment_0 ) ) | ( ( rule__ModifierSpecification__RedefinesAssignment_1 ) ) | ( ( rule__ModifierSpecification__SubsetsAssignment_2 ) ) )
+            int alt2=3;
+            switch ( input.LA(1) ) {
+            case 17:
+            case 18:
+            case 19:
+            case 20:
+                {
+                alt2=1;
+                }
+                break;
+            case 29:
+                {
+                alt2=2;
+                }
+                break;
+            case 30:
+                {
+                alt2=3;
+                }
+                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);
+
+                throw nvae;
+            }
+
+            switch (alt2) {
+                case 1 :
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:408:1: ( ( 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:408:1: ( ( 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:409:1: ( rule__ModifierSpecification__ValueAssignment_0 )
+                    {
+                     before(grammarAccess.getModifierSpecificationAccess().getValueAssignment_0()); 
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:410:1: ( 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:410:2: rule__ModifierSpecification__ValueAssignment_0
+                    {
+                    pushFollow(FOLLOW_rule__ModifierSpecification__ValueAssignment_0_in_rule__ModifierSpecification__Alternatives795);
+                    rule__ModifierSpecification__ValueAssignment_0();
+                    _fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getModifierSpecificationAccess().getValueAssignment_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:414:6: ( ( 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:414:6: ( ( 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:415:1: ( rule__ModifierSpecification__RedefinesAssignment_1 )
+                    {
+                     before(grammarAccess.getModifierSpecificationAccess().getRedefinesAssignment_1()); 
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:416:1: ( 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:416:2: rule__ModifierSpecification__RedefinesAssignment_1
+                    {
+                    pushFollow(FOLLOW_rule__ModifierSpecification__RedefinesAssignment_1_in_rule__ModifierSpecification__Alternatives813);
+                    rule__ModifierSpecification__RedefinesAssignment_1();
+                    _fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getModifierSpecificationAccess().getRedefinesAssignment_1()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 3 :
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:420:6: ( ( 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:420:6: ( ( 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:421:1: ( rule__ModifierSpecification__SubsetsAssignment_2 )
+                    {
+                     before(grammarAccess.getModifierSpecificationAccess().getSubsetsAssignment_2()); 
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:422:1: ( 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:422:2: rule__ModifierSpecification__SubsetsAssignment_2
+                    {
+                    pushFollow(FOLLOW_rule__ModifierSpecification__SubsetsAssignment_2_in_rule__ModifierSpecification__Alternatives831);
+                    rule__ModifierSpecification__SubsetsAssignment_2();
+                    _fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getModifierSpecificationAccess().getSubsetsAssignment_2()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__ModifierSpecification__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:319:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:323:1: ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) )
-            int alt2=4;
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:435:1: ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) )
+            int alt3=4;
             switch ( input.LA(1) ) {
             case 13:
                 {
-                alt2=1;
+                alt3=1;
                 }
                 break;
             case 14:
                 {
-                alt2=2;
+                alt3=2;
                 }
                 break;
             case 15:
                 {
-                alt2=3;
+                alt3=3;
                 }
                 break;
             case 16:
                 {
-                alt2=4;
+                alt3=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("319:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );", 2, 0, input);
+                    new NoViableAltException("431:1: rule__VisibilityKind__Alternatives : ( ( ( '+' ) ) | ( ( '-' ) ) | ( ( '#' ) ) | ( ( '~' ) ) );", 3, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt2) {
+            switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:324:1: ( ( '+' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:436:1: ( ( '+' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:324:1: ( ( '+' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:325:1: ( '+' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:436:1: ( ( '+' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:437:1: ( '+' )
                     {
                      before(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:326:1: ( '+' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:326:3: '+'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:438:1: ( '+' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:438:3: '+'
                     {
-                    match(input,13,FOLLOW_13_in_rule__VisibilityKind__Alternatives616); 
+                    match(input,13,FOLLOW_13_in_rule__VisibilityKind__Alternatives865); 
 
                     }
 
@@ -821,16 +1171,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:331:6: ( ( '-' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:443:6: ( ( '-' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:331:6: ( ( '-' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:332:1: ( '-' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:443:6: ( ( '-' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:444:1: ( '-' )
                     {
                      before(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:333:1: ( '-' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:333:3: '-'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:445:1: ( '-' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:445:3: '-'
                     {
-                    match(input,14,FOLLOW_14_in_rule__VisibilityKind__Alternatives637); 
+                    match(input,14,FOLLOW_14_in_rule__VisibilityKind__Alternatives886); 
 
                     }
 
@@ -842,16 +1192,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:338:6: ( ( '#' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:450:6: ( ( '#' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:338:6: ( ( '#' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:339:1: ( '#' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:450:6: ( ( '#' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:451:1: ( '#' )
                     {
                      before(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:340:1: ( '#' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:340:3: '#'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:452:1: ( '#' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:452:3: '#'
                     {
-                    match(input,15,FOLLOW_15_in_rule__VisibilityKind__Alternatives658); 
+                    match(input,15,FOLLOW_15_in_rule__VisibilityKind__Alternatives907); 
 
                     }
 
@@ -863,16 +1213,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:345:6: ( ( '~' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:457:6: ( ( '~' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:345:6: ( ( '~' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:346:1: ( '~' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:457:6: ( ( '~' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:458:1: ( '~' )
                     {
                      before(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:347:1: ( '~' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:347:3: '~'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:459:1: ( '~' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:459:3: '~'
                     {
-                    match(input,16,FOLLOW_16_in_rule__VisibilityKind__Alternatives679); 
+                    match(input,16,FOLLOW_16_in_rule__VisibilityKind__Alternatives928); 
 
                     }
 
@@ -901,54 +1251,54 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:357:1: rule__ModifierKind__Alternatives : ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:361:1: ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) )
-            int alt3=4;
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:473:1: ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) )
+            int alt4=4;
             switch ( input.LA(1) ) {
             case 17:
                 {
-                alt3=1;
+                alt4=1;
                 }
                 break;
             case 18:
                 {
-                alt3=2;
+                alt4=2;
                 }
                 break;
             case 19:
                 {
-                alt3=3;
+                alt4=3;
                 }
                 break;
             case 20:
                 {
-                alt3=4;
+                alt4=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("357:1: rule__ModifierKind__Alternatives : ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );", 3, 0, input);
+                    new NoViableAltException("469:1: rule__ModifierKind__Alternatives : ( ( ( 'readOnly' ) ) | ( ( 'union' ) ) | ( ( 'ordered' ) ) | ( ( 'unique' ) ) );", 4, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt3) {
+            switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:362:1: ( ( 'readOnly' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:474:1: ( ( 'readOnly' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:362:1: ( ( 'readOnly' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:363:1: ( 'readOnly' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:474:1: ( ( 'readOnly' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:475:1: ( 'readOnly' )
                     {
                      before(grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:364:1: ( 'readOnly' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:364:3: 'readOnly'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:476:1: ( 'readOnly' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:476:3: 'readOnly'
                     {
-                    match(input,17,FOLLOW_17_in_rule__ModifierKind__Alternatives715); 
+                    match(input,17,FOLLOW_17_in_rule__ModifierKind__Alternatives964); 
 
                     }
 
@@ -960,16 +1310,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:369:6: ( ( 'union' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:481:6: ( ( 'union' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:369:6: ( ( 'union' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:370:1: ( 'union' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:481:6: ( ( 'union' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:482:1: ( 'union' )
                     {
                      before(grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:371:1: ( 'union' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:371:3: 'union'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:483:1: ( 'union' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:483:3: 'union'
                     {
-                    match(input,18,FOLLOW_18_in_rule__ModifierKind__Alternatives736); 
+                    match(input,18,FOLLOW_18_in_rule__ModifierKind__Alternatives985); 
 
                     }
 
@@ -981,16 +1331,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:376:6: ( ( 'ordered' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:488:6: ( ( 'ordered' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:376:6: ( ( 'ordered' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:377:1: ( 'ordered' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:488:6: ( ( 'ordered' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:489:1: ( 'ordered' )
                     {
                      before(grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:378:1: ( 'ordered' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:378:3: 'ordered'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:490:1: ( 'ordered' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:490:3: 'ordered'
                     {
-                    match(input,19,FOLLOW_19_in_rule__ModifierKind__Alternatives757); 
+                    match(input,19,FOLLOW_19_in_rule__ModifierKind__Alternatives1006); 
 
                     }
 
@@ -1002,16 +1352,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:383:6: ( ( 'unique' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:495:6: ( ( 'unique' ) )
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:383:6: ( ( 'unique' ) )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:384:1: ( 'unique' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:495:6: ( ( 'unique' ) )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:496:1: ( 'unique' )
                     {
                      before(grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3()); 
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:385:1: ( 'unique' )
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:385:3: 'unique'
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:497:1: ( 'unique' )
+                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:497:3: 'unique'
                     {
-                    match(input,20,FOLLOW_20_in_rule__ModifierKind__Alternatives778); 
+                    match(input,20,FOLLOW_20_in_rule__ModifierKind__Alternatives1027); 
 
                     }
 
@@ -1040,20 +1390,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:397:1: rule__PropertyRule__Group__0 : rule__PropertyRule__Group__0__Impl 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:509:1: rule__PropertyRule__Group__0 : rule__PropertyRule__Group__0__Impl rule__PropertyRule__Group__1 ;
     public final void rule__PropertyRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:401:1: ( rule__PropertyRule__Group__0__Impl 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:402:2: rule__PropertyRule__Group__0__Impl 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:513:1: ( rule__PropertyRule__Group__0__Impl 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:514:2: rule__PropertyRule__Group__0__Impl rule__PropertyRule__Group__1
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__0__Impl_in_rule__PropertyRule__Group__0811);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__0__Impl_in_rule__PropertyRule__Group__01060);
             rule__PropertyRule__Group__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__PropertyRule__Group__1_in_rule__PropertyRule__Group__0814);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__1_in_rule__PropertyRule__Group__01063);
             rule__PropertyRule__Group__1();
             _fsp--;
 
@@ -1076,23 +1426,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:409:1: rule__PropertyRule__Group__0__Impl : ( ( 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:521:1: rule__PropertyRule__Group__0__Impl : ( ( rule__PropertyRule__VisibilityAssignment_0 ) ) ;
     public final void rule__PropertyRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:413:1: ( ( ( 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:414:1: ( ( 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:525:1: ( ( ( 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:526:1: ( ( 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:414:1: ( ( 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:415:1: ( 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:526:1: ( ( 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:527:1: ( rule__PropertyRule__VisibilityAssignment_0 )
             {
              before(grammarAccess.getPropertyRuleAccess().getVisibilityAssignment_0()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:416:1: ( 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:416:2: 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:528:1: ( 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:528:2: rule__PropertyRule__VisibilityAssignment_0
             {
-            pushFollow(FOLLOW_rule__PropertyRule__VisibilityAssignment_0_in_rule__PropertyRule__Group__0__Impl841);
+            pushFollow(FOLLOW_rule__PropertyRule__VisibilityAssignment_0_in_rule__PropertyRule__Group__0__Impl1090);
             rule__PropertyRule__VisibilityAssignment_0();
             _fsp--;
 
@@ -1122,20 +1472,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:426:1: rule__PropertyRule__Group__1 : rule__PropertyRule__Group__1__Impl 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:538:1: rule__PropertyRule__Group__1 : rule__PropertyRule__Group__1__Impl rule__PropertyRule__Group__2 ;
     public final void rule__PropertyRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:430:1: ( rule__PropertyRule__Group__1__Impl 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:431:2: rule__PropertyRule__Group__1__Impl 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:542:1: ( rule__PropertyRule__Group__1__Impl 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:543:2: rule__PropertyRule__Group__1__Impl rule__PropertyRule__Group__2
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__1__Impl_in_rule__PropertyRule__Group__1871);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__1__Impl_in_rule__PropertyRule__Group__11120);
             rule__PropertyRule__Group__1__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__PropertyRule__Group__2_in_rule__PropertyRule__Group__1874);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__2_in_rule__PropertyRule__Group__11123);
             rule__PropertyRule__Group__2();
             _fsp--;
 
@@ -1158,31 +1508,31 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:438:1: rule__PropertyRule__Group__1__Impl : ( ( 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:550:1: rule__PropertyRule__Group__1__Impl : ( ( rule__PropertyRule__IsDerivedAssignment_1 )? ) ;
     public final void rule__PropertyRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:442:1: ( ( ( 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:443:1: ( ( 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:554:1: ( ( ( 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:555:1: ( ( 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:443:1: ( ( 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:444:1: ( 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:555:1: ( ( 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:556:1: ( rule__PropertyRule__IsDerivedAssignment_1 )?
             {
              before(grammarAccess.getPropertyRuleAccess().getIsDerivedAssignment_1()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:445:1: ( rule__PropertyRule__IsDerivedAssignment_1 )?
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:557:1: ( rule__PropertyRule__IsDerivedAssignment_1 )?
+            int alt5=2;
+            int LA5_0 = input.LA(1);
 
-            if ( (LA4_0==29) ) {
-                alt4=1;
+            if ( (LA5_0==32) ) {
+                alt5=1;
             }
-            switch (alt4) {
+            switch (alt5) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:445:2: 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:557:2: rule__PropertyRule__IsDerivedAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__PropertyRule__IsDerivedAssignment_1_in_rule__PropertyRule__Group__1__Impl901);
+                    pushFollow(FOLLOW_rule__PropertyRule__IsDerivedAssignment_1_in_rule__PropertyRule__Group__1__Impl1150);
                     rule__PropertyRule__IsDerivedAssignment_1();
                     _fsp--;
 
@@ -1215,20 +1565,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:455:1: rule__PropertyRule__Group__2 : rule__PropertyRule__Group__2__Impl 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:567:1: rule__PropertyRule__Group__2 : rule__PropertyRule__Group__2__Impl rule__PropertyRule__Group__3 ;
     public final void rule__PropertyRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:459:1: ( rule__PropertyRule__Group__2__Impl 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:460:2: rule__PropertyRule__Group__2__Impl 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:571:1: ( rule__PropertyRule__Group__2__Impl 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:572:2: rule__PropertyRule__Group__2__Impl rule__PropertyRule__Group__3
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__2__Impl_in_rule__PropertyRule__Group__2932);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__2__Impl_in_rule__PropertyRule__Group__21181);
             rule__PropertyRule__Group__2__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__PropertyRule__Group__3_in_rule__PropertyRule__Group__2935);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__3_in_rule__PropertyRule__Group__21184);
             rule__PropertyRule__Group__3();
             _fsp--;
 
@@ -1251,23 +1601,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:467:1: rule__PropertyRule__Group__2__Impl : ( ( 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:579:1: rule__PropertyRule__Group__2__Impl : ( ( rule__PropertyRule__NameAssignment_2 ) ) ;
     public final void rule__PropertyRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:471:1: ( ( ( 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:472:1: ( ( 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:583:1: ( ( ( 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:584:1: ( ( 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:472:1: ( ( 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:473:1: ( 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:584:1: ( ( 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:585:1: ( rule__PropertyRule__NameAssignment_2 )
             {
              before(grammarAccess.getPropertyRuleAccess().getNameAssignment_2()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:474:1: ( 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:474:2: 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:586:1: ( 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:586:2: rule__PropertyRule__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__PropertyRule__NameAssignment_2_in_rule__PropertyRule__Group__2__Impl962);
+            pushFollow(FOLLOW_rule__PropertyRule__NameAssignment_2_in_rule__PropertyRule__Group__2__Impl1211);
             rule__PropertyRule__NameAssignment_2();
             _fsp--;
 
@@ -1297,20 +1647,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:484:1: rule__PropertyRule__Group__3 : rule__PropertyRule__Group__3__Impl 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:596:1: rule__PropertyRule__Group__3 : rule__PropertyRule__Group__3__Impl rule__PropertyRule__Group__4 ;
     public final void rule__PropertyRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:488:1: ( rule__PropertyRule__Group__3__Impl 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:489:2: rule__PropertyRule__Group__3__Impl 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:600:1: ( rule__PropertyRule__Group__3__Impl 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:601:2: rule__PropertyRule__Group__3__Impl rule__PropertyRule__Group__4
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__3__Impl_in_rule__PropertyRule__Group__3992);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__3__Impl_in_rule__PropertyRule__Group__31241);
             rule__PropertyRule__Group__3__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__PropertyRule__Group__4_in_rule__PropertyRule__Group__3995);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__4_in_rule__PropertyRule__Group__31244);
             rule__PropertyRule__Group__4();
             _fsp--;
 
@@ -1333,20 +1683,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:496:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:500:1: ( ( ':' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:501:1: ( ':' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:612:1: ( ( ':' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:613:1: ( ':' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:501:1: ( ':' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:502:1: ':'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:613:1: ( ':' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:614:1: ':'
             {
              before(grammarAccess.getPropertyRuleAccess().getColonKeyword_3()); 
-            match(input,21,FOLLOW_21_in_rule__PropertyRule__Group__3__Impl1023); 
+            match(input,21,FOLLOW_21_in_rule__PropertyRule__Group__3__Impl1272); 
              after(grammarAccess.getPropertyRuleAccess().getColonKeyword_3()); 
 
             }
@@ -1370,20 +1720,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:515:1: rule__PropertyRule__Group__4 : rule__PropertyRule__Group__4__Impl 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:627:1: rule__PropertyRule__Group__4 : rule__PropertyRule__Group__4__Impl rule__PropertyRule__Group__5 ;
     public final void rule__PropertyRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:519:1: ( rule__PropertyRule__Group__4__Impl 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:520:2: rule__PropertyRule__Group__4__Impl 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:631:1: ( rule__PropertyRule__Group__4__Impl 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:632:2: rule__PropertyRule__Group__4__Impl rule__PropertyRule__Group__5
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__4__Impl_in_rule__PropertyRule__Group__41054);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__4__Impl_in_rule__PropertyRule__Group__41303);
             rule__PropertyRule__Group__4__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__PropertyRule__Group__5_in_rule__PropertyRule__Group__41057);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__5_in_rule__PropertyRule__Group__41306);
             rule__PropertyRule__Group__5();
             _fsp--;
 
@@ -1406,23 +1756,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:527:1: rule__PropertyRule__Group__4__Impl : ( ( 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:639:1: rule__PropertyRule__Group__4__Impl : ( ( rule__PropertyRule__Alternatives_4 ) ) ;
     public final void rule__PropertyRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:531:1: ( ( ( 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:532:1: ( ( 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:643:1: ( ( ( 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:644:1: ( ( 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:532:1: ( ( 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:533:1: ( 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:644:1: ( ( 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:645:1: ( rule__PropertyRule__Alternatives_4 )
             {
              before(grammarAccess.getPropertyRuleAccess().getAlternatives_4()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:534:1: ( 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:534:2: 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:646:1: ( 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:646:2: rule__PropertyRule__Alternatives_4
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Alternatives_4_in_rule__PropertyRule__Group__4__Impl1084);
+            pushFollow(FOLLOW_rule__PropertyRule__Alternatives_4_in_rule__PropertyRule__Group__4__Impl1333);
             rule__PropertyRule__Alternatives_4();
             _fsp--;
 
@@ -1452,20 +1802,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:544:1: rule__PropertyRule__Group__5 : rule__PropertyRule__Group__5__Impl 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:656:1: rule__PropertyRule__Group__5 : rule__PropertyRule__Group__5__Impl rule__PropertyRule__Group__6 ;
     public final void rule__PropertyRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:548:1: ( rule__PropertyRule__Group__5__Impl 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:549:2: rule__PropertyRule__Group__5__Impl 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:660:1: ( rule__PropertyRule__Group__5__Impl 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:661:2: rule__PropertyRule__Group__5__Impl rule__PropertyRule__Group__6
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__5__Impl_in_rule__PropertyRule__Group__51114);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__5__Impl_in_rule__PropertyRule__Group__51363);
             rule__PropertyRule__Group__5__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__PropertyRule__Group__6_in_rule__PropertyRule__Group__51117);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__6_in_rule__PropertyRule__Group__51366);
             rule__PropertyRule__Group__6();
             _fsp--;
 
@@ -1488,31 +1838,31 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:556:1: rule__PropertyRule__Group__5__Impl : ( ( 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:668:1: rule__PropertyRule__Group__5__Impl : ( ( rule__PropertyRule__MultiplicityAssignment_5 )? ) ;
     public final void rule__PropertyRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:560:1: ( ( ( 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:561:1: ( ( 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:672:1: ( ( ( 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:673:1: ( ( 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:561:1: ( ( 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:562:1: ( 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:673:1: ( ( 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:674:1: ( rule__PropertyRule__MultiplicityAssignment_5 )?
             {
              before(grammarAccess.getPropertyRuleAccess().getMultiplicityAssignment_5()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:563:1: ( rule__PropertyRule__MultiplicityAssignment_5 )?
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:675:1: ( rule__PropertyRule__MultiplicityAssignment_5 )?
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA5_0==23) ) {
-                alt5=1;
+            if ( (LA6_0==23) ) {
+                alt6=1;
             }
-            switch (alt5) {
+            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:563:2: 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:675:2: rule__PropertyRule__MultiplicityAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__PropertyRule__MultiplicityAssignment_5_in_rule__PropertyRule__Group__5__Impl1144);
+                    pushFollow(FOLLOW_rule__PropertyRule__MultiplicityAssignment_5_in_rule__PropertyRule__Group__5__Impl1393);
                     rule__PropertyRule__MultiplicityAssignment_5();
                     _fsp--;
 
@@ -1545,19 +1895,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:573:1: rule__PropertyRule__Group__6 : 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:685:1: rule__PropertyRule__Group__6 : rule__PropertyRule__Group__6__Impl rule__PropertyRule__Group__7 ;
     public final void rule__PropertyRule__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:577:1: ( 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:578:2: 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:689:1: ( rule__PropertyRule__Group__6__Impl 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:690:2: rule__PropertyRule__Group__6__Impl rule__PropertyRule__Group__7
             {
-            pushFollow(FOLLOW_rule__PropertyRule__Group__6__Impl_in_rule__PropertyRule__Group__61175);
+            pushFollow(FOLLOW_rule__PropertyRule__Group__6__Impl_in_rule__PropertyRule__Group__61424);
             rule__PropertyRule__Group__6__Impl();
             _fsp--;
 
+            pushFollow(FOLLOW_rule__PropertyRule__Group__7_in_rule__PropertyRule__Group__61427);
+            rule__PropertyRule__Group__7();
+            _fsp--;
+
 
             }
 
@@ -1577,31 +1931,31 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:584:1: rule__PropertyRule__Group__6__Impl : ( ( 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:697:1: rule__PropertyRule__Group__6__Impl : ( ( rule__PropertyRule__ModifiersAssignment_6 )? ) ;
     public final void rule__PropertyRule__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:588:1: ( ( ( 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:589:1: ( ( 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:701:1: ( ( ( 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:702:1: ( ( 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:589:1: ( ( 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:590:1: ( 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:702:1: ( ( 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:703:1: ( rule__PropertyRule__ModifiersAssignment_6 )?
             {
              before(grammarAccess.getPropertyRuleAccess().getModifiersAssignment_6()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:591:1: ( rule__PropertyRule__ModifiersAssignment_6 )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:704:1: ( rule__PropertyRule__ModifiersAssignment_6 )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA6_0==26) ) {
-                alt6=1;
+            if ( (LA7_0==26) ) {
+                alt7=1;
             }
-            switch (alt6) {
+            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:591:2: 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:704:2: rule__PropertyRule__ModifiersAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__PropertyRule__ModifiersAssignment_6_in_rule__PropertyRule__Group__6__Impl1202);
+                    pushFollow(FOLLOW_rule__PropertyRule__ModifiersAssignment_6_in_rule__PropertyRule__Group__6__Impl1454);
                     rule__PropertyRule__ModifiersAssignment_6();
                     _fsp--;
 
@@ -1633,21 +1987,110 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     // $ANTLR end rule__PropertyRule__Group__6__Impl
 
 
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:718:1: ( 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:719:2: rule__PropertyRule__Group__7__Impl
+            {
+            pushFollow(FOLLOW_rule__PropertyRule__Group__7__Impl_in_rule__PropertyRule__Group__71485);
+            rule__PropertyRule__Group__7__Impl();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__PropertyRule__Group__7
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:729:1: ( ( ( 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:730:1: ( ( 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:730:1: ( ( 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:731:1: ( rule__PropertyRule__DefaultAssignment_7 )?
+            {
+             before(grammarAccess.getPropertyRuleAccess().getDefaultAssignment_7()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:732:1: ( rule__PropertyRule__DefaultAssignment_7 )?
+            int alt8=2;
+            int LA8_0 = input.LA(1);
+
+            if ( (LA8_0==31) ) {
+                alt8=1;
+            }
+            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:732:2: rule__PropertyRule__DefaultAssignment_7
+                    {
+                    pushFollow(FOLLOW_rule__PropertyRule__DefaultAssignment_7_in_rule__PropertyRule__Group__7__Impl1512);
+                    rule__PropertyRule__DefaultAssignment_7();
+                    _fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getPropertyRuleAccess().getDefaultAssignment_7()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__PropertyRule__Group__7__Impl
+
+
     // $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:615:1: rule__TypeRule__Group__0 : rule__TypeRule__Group__0__Impl 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:758: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:619:1: ( rule__TypeRule__Group__0__Impl 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:620:2: rule__TypeRule__Group__0__Impl 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:762:1: ( rule__TypeRule__Group__0__Impl 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:763:2: rule__TypeRule__Group__0__Impl rule__TypeRule__Group__1
             {
-            pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__01247);
+            pushFollow(FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__01559);
             rule__TypeRule__Group__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__01250);
+            pushFollow(FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__01562);
             rule__TypeRule__Group__1();
             _fsp--;
 
@@ -1670,35 +2113,35 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:627:1: rule__TypeRule__Group__0__Impl : ( ( 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:770: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:631:1: ( ( ( 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:632:1: ( ( 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:774:1: ( ( ( 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:775:1: ( ( 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:632:1: ( ( 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:633:1: ( 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:775:1: ( ( 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:776:1: ( rule__TypeRule__PathAssignment_0 )?
             {
              before(grammarAccess.getTypeRuleAccess().getPathAssignment_0()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:634:1: ( rule__TypeRule__PathAssignment_0 )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:777:1: ( rule__TypeRule__PathAssignment_0 )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA7_0==RULE_ID) ) {
-                int LA7_1 = input.LA(2);
+            if ( (LA9_0==RULE_ID) ) {
+                int LA9_1 = input.LA(2);
 
-                if ( (LA7_1==22) ) {
-                    alt7=1;
+                if ( (LA9_1==22) ) {
+                    alt9=1;
                 }
             }
-            switch (alt7) {
+            switch (alt9) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:634:2: 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:777:2: rule__TypeRule__PathAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl1277);
+                    pushFollow(FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl1589);
                     rule__TypeRule__PathAssignment_0();
                     _fsp--;
 
@@ -1731,16 +2174,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:644:1: rule__TypeRule__Group__1 : 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:787: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:648:1: ( 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:649:2: 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:791:1: ( 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:792:2: rule__TypeRule__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__11308);
+            pushFollow(FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__11620);
             rule__TypeRule__Group__1__Impl();
             _fsp--;
 
@@ -1763,23 +2206,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:655:1: rule__TypeRule__Group__1__Impl : ( ( 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:798:1: rule__TypeRule__Group__1__Impl : ( ( rule__TypeRule__TypeAssignment_1 ) ) ;
     public final void rule__TypeRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:659:1: ( ( ( 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:660:1: ( ( 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:802:1: ( ( ( 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:803:1: ( ( 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:660:1: ( ( 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:661:1: ( 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:803:1: ( ( 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:804:1: ( rule__TypeRule__TypeAssignment_1 )
             {
              before(grammarAccess.getTypeRuleAccess().getTypeAssignment_1()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:662:1: ( 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:662:2: 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:805:1: ( 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:805:2: rule__TypeRule__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl1335);
+            pushFollow(FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl1647);
             rule__TypeRule__TypeAssignment_1();
             _fsp--;
 
@@ -1809,20 +2252,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:676:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl 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:819: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:680:1: ( rule__QualifiedName__Group__0__Impl 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:681:2: rule__QualifiedName__Group__0__Impl 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:823:1: ( rule__QualifiedName__Group__0__Impl 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:824:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__01369);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__01681);
             rule__QualifiedName__Group__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__01372);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__01684);
             rule__QualifiedName__Group__1();
             _fsp--;
 
@@ -1845,23 +2288,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:688:1: rule__QualifiedName__Group__0__Impl : ( ( 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:831: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:692:1: ( ( ( 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:693:1: ( ( 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:835:1: ( ( ( 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:836:1: ( ( 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:693:1: ( ( 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:694:1: ( 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:836:1: ( ( 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:837:1: ( rule__QualifiedName__PathAssignment_0 )
             {
              before(grammarAccess.getQualifiedNameAccess().getPathAssignment_0()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:695:1: ( 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:695:2: 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:838:1: ( 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:838:2: rule__QualifiedName__PathAssignment_0
             {
-            pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1399);
+            pushFollow(FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1711);
             rule__QualifiedName__PathAssignment_0();
             _fsp--;
 
@@ -1891,20 +2334,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:705:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl 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:848: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:709:1: ( rule__QualifiedName__Group__1__Impl 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:710:2: rule__QualifiedName__Group__1__Impl 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:852:1: ( rule__QualifiedName__Group__1__Impl 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:853:2: rule__QualifiedName__Group__1__Impl rule__QualifiedName__Group__2
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11429);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11741);
             rule__QualifiedName__Group__1__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11432);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11744);
             rule__QualifiedName__Group__2();
             _fsp--;
 
@@ -1927,20 +2370,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:717:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:721:1: ( ( '::' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:722:1: ( '::' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:864:1: ( ( '::' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:865:1: ( '::' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:722:1: ( '::' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:723:1: '::'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:865:1: ( '::' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:866:1: '::'
             {
              before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
-            match(input,22,FOLLOW_22_in_rule__QualifiedName__Group__1__Impl1460); 
+            match(input,22,FOLLOW_22_in_rule__QualifiedName__Group__1__Impl1772); 
              after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1()); 
 
             }
@@ -1964,16 +2407,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:736:1: rule__QualifiedName__Group__2 : 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:879: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:740:1: ( 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:741:2: 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:883:1: ( 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:884:2: rule__QualifiedName__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21491);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21803);
             rule__QualifiedName__Group__2__Impl();
             _fsp--;
 
@@ -1996,35 +2439,35 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:747:1: rule__QualifiedName__Group__2__Impl : ( ( 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:890: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:751:1: ( ( ( 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:752:1: ( ( 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:894:1: ( ( ( 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:895:1: ( ( 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:752:1: ( ( 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:753:1: ( 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:895:1: ( ( 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:896:1: ( rule__QualifiedName__RemainingAssignment_2 )?
             {
              before(grammarAccess.getQualifiedNameAccess().getRemainingAssignment_2()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:754:1: ( rule__QualifiedName__RemainingAssignment_2 )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:897:1: ( rule__QualifiedName__RemainingAssignment_2 )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA8_0==RULE_ID) ) {
-                int LA8_1 = input.LA(2);
+            if ( (LA10_0==RULE_ID) ) {
+                int LA10_1 = input.LA(2);
 
-                if ( (LA8_1==22) ) {
-                    alt8=1;
+                if ( (LA10_1==22) ) {
+                    alt10=1;
                 }
             }
-            switch (alt8) {
+            switch (alt10) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:754:2: 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:897:2: rule__QualifiedName__RemainingAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1518);
+                    pushFollow(FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1830);
                     rule__QualifiedName__RemainingAssignment_2();
                     _fsp--;
 
@@ -2057,20 +2500,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:770:1: rule__MultiplicityRule__Group__0 : rule__MultiplicityRule__Group__0__Impl 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:913: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:774:1: ( rule__MultiplicityRule__Group__0__Impl 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:775:2: rule__MultiplicityRule__Group__0__Impl 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:917:1: ( rule__MultiplicityRule__Group__0__Impl 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:918:2: rule__MultiplicityRule__Group__0__Impl rule__MultiplicityRule__Group__1
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__01555);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__01867);
             rule__MultiplicityRule__Group__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__01558);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__01870);
             rule__MultiplicityRule__Group__1();
             _fsp--;
 
@@ -2093,20 +2536,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:782:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:786:1: ( ( '[' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:787:1: ( '[' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:929:1: ( ( '[' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:930:1: ( '[' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:787:1: ( '[' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:788:1: '['
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:930:1: ( '[' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:931:1: '['
             {
              before(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0()); 
-            match(input,23,FOLLOW_23_in_rule__MultiplicityRule__Group__0__Impl1586); 
+            match(input,23,FOLLOW_23_in_rule__MultiplicityRule__Group__0__Impl1898); 
              after(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0()); 
 
             }
@@ -2130,20 +2573,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:801:1: rule__MultiplicityRule__Group__1 : rule__MultiplicityRule__Group__1__Impl 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:944: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();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:805:1: ( rule__MultiplicityRule__Group__1__Impl 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:806:2: rule__MultiplicityRule__Group__1__Impl 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:948:1: ( rule__MultiplicityRule__Group__1__Impl 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:949:2: rule__MultiplicityRule__Group__1__Impl rule__MultiplicityRule__Group__2
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__11617);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__11929);
             rule__MultiplicityRule__Group__1__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__11620);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__11932);
             rule__MultiplicityRule__Group__2();
             _fsp--;
 
@@ -2166,23 +2609,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:813:1: rule__MultiplicityRule__Group__1__Impl : ( ( 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:956: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:817:1: ( ( ( 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:818:1: ( ( 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:960:1: ( ( ( 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:961:1: ( ( 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:818:1: ( ( 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:819:1: ( 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:961:1: ( ( 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:962:1: ( rule__MultiplicityRule__BoundsAssignment_1 )
             {
              before(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_1()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:820:1: ( 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:820:2: 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:963:1: ( 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:963:2: rule__MultiplicityRule__BoundsAssignment_1
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl1647);
+            pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl1959);
             rule__MultiplicityRule__BoundsAssignment_1();
             _fsp--;
 
@@ -2212,20 +2655,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:830:1: rule__MultiplicityRule__Group__2 : rule__MultiplicityRule__Group__2__Impl 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:973:1: rule__MultiplicityRule__Group__2 : rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3 ;
     public final void rule__MultiplicityRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:834:1: ( rule__MultiplicityRule__Group__2__Impl 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:835:2: rule__MultiplicityRule__Group__2__Impl 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:977:1: ( rule__MultiplicityRule__Group__2__Impl 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:978:2: rule__MultiplicityRule__Group__2__Impl rule__MultiplicityRule__Group__3
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__21677);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__21989);
             rule__MultiplicityRule__Group__2__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__21680);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__21992);
             rule__MultiplicityRule__Group__3();
             _fsp--;
 
@@ -2248,31 +2691,31 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:842:1: rule__MultiplicityRule__Group__2__Impl : ( ( 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:985: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:846:1: ( ( ( 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:847:1: ( ( 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:989:1: ( ( ( 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:990:1: ( ( 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:847:1: ( ( 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:848:1: ( 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:990:1: ( ( 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:991:1: ( rule__MultiplicityRule__Group_2__0 )?
             {
              before(grammarAccess.getMultiplicityRuleAccess().getGroup_2()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:849:1: ( rule__MultiplicityRule__Group_2__0 )?
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:992:1: ( rule__MultiplicityRule__Group_2__0 )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
 
-            if ( (LA9_0==25) ) {
-                alt9=1;
+            if ( (LA11_0==25) ) {
+                alt11=1;
             }
-            switch (alt9) {
+            switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:849:2: 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:992:2: rule__MultiplicityRule__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl1707);
+                    pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl2019);
                     rule__MultiplicityRule__Group_2__0();
                     _fsp--;
 
@@ -2305,16 +2748,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:859:1: rule__MultiplicityRule__Group__3 : 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:1002:1: rule__MultiplicityRule__Group__3 : rule__MultiplicityRule__Group__3__Impl ;
     public final void rule__MultiplicityRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:863:1: ( 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:864:2: 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:1006:1: ( 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:1007:2: rule__MultiplicityRule__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__31738);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__32050);
             rule__MultiplicityRule__Group__3__Impl();
             _fsp--;
 
@@ -2337,20 +2780,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:870:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:874:1: ( ( ']' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:875:1: ( ']' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1017:1: ( ( ']' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1018:1: ( ']' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:875:1: ( ']' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:876:1: ']'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1018:1: ( ']' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1019:1: ']'
             {
              before(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3()); 
-            match(input,24,FOLLOW_24_in_rule__MultiplicityRule__Group__3__Impl1766); 
+            match(input,24,FOLLOW_24_in_rule__MultiplicityRule__Group__3__Impl2078); 
              after(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3()); 
 
             }
@@ -2374,20 +2817,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:897:1: rule__MultiplicityRule__Group_2__0 : rule__MultiplicityRule__Group_2__0__Impl 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: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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:901:1: ( rule__MultiplicityRule__Group_2__0__Impl 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:902:2: rule__MultiplicityRule__Group_2__0__Impl 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:1044:1: ( rule__MultiplicityRule__Group_2__0__Impl 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:1045: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__01805);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02117);
             rule__MultiplicityRule__Group_2__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__01808);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02120);
             rule__MultiplicityRule__Group_2__1();
             _fsp--;
 
@@ -2410,20 +2853,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:909:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:913:1: ( ( '..' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:914:1: ( '..' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1056:1: ( ( '..' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1057:1: ( '..' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:914:1: ( '..' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:915:1: '..'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1057:1: ( '..' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1058:1: '..'
             {
              before(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0()); 
-            match(input,25,FOLLOW_25_in_rule__MultiplicityRule__Group_2__0__Impl1836); 
+            match(input,25,FOLLOW_25_in_rule__MultiplicityRule__Group_2__0__Impl2148); 
              after(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0()); 
 
             }
@@ -2447,16 +2890,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:928:1: rule__MultiplicityRule__Group_2__1 : 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:1071: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:932:1: ( 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:933:2: 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:1075:1: ( 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:1076:2: rule__MultiplicityRule__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__11867);
+            pushFollow(FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12179);
             rule__MultiplicityRule__Group_2__1__Impl();
             _fsp--;
 
@@ -2479,23 +2922,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:939:1: rule__MultiplicityRule__Group_2__1__Impl : ( ( 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:1082: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();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:943:1: ( ( ( 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:944:1: ( ( 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:1086:1: ( ( ( 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:1087:1: ( ( 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:944:1: ( ( 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:945:1: ( 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:1087:1: ( ( 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:1088:1: ( rule__MultiplicityRule__BoundsAssignment_2_1 )
             {
              before(grammarAccess.getMultiplicityRuleAccess().getBoundsAssignment_2_1()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:946:1: ( 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:946:2: 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:1089:1: ( 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:1089:2: rule__MultiplicityRule__BoundsAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl1894);
+            pushFollow(FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2206);
             rule__MultiplicityRule__BoundsAssignment_2_1();
             _fsp--;
 
@@ -2525,20 +2968,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:960:1: rule__ModifiersRule__Group__0 : rule__ModifiersRule__Group__0__Impl 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:1103: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:964:1: ( rule__ModifiersRule__Group__0__Impl 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:965:2: rule__ModifiersRule__Group__0__Impl 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:1107:1: ( rule__ModifiersRule__Group__0__Impl 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:1108:2: rule__ModifiersRule__Group__0__Impl rule__ModifiersRule__Group__1
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__01928);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__02240);
             rule__ModifiersRule__Group__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__01931);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__02243);
             rule__ModifiersRule__Group__1();
             _fsp--;
 
@@ -2561,20 +3004,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:972:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:976:1: ( ( '{' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:977:1: ( '{' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1119:1: ( ( '{' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1120:1: ( '{' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:977:1: ( '{' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:978:1: '{'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1120:1: ( '{' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1121:1: '{'
             {
              before(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0()); 
-            match(input,26,FOLLOW_26_in_rule__ModifiersRule__Group__0__Impl1959); 
+            match(input,26,FOLLOW_26_in_rule__ModifiersRule__Group__0__Impl2271); 
              after(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0()); 
 
             }
@@ -2598,20 +3041,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:991:1: rule__ModifiersRule__Group__1 : rule__ModifiersRule__Group__1__Impl 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:1134: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:995:1: ( rule__ModifiersRule__Group__1__Impl 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:996:2: rule__ModifiersRule__Group__1__Impl 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:1138:1: ( rule__ModifiersRule__Group__1__Impl 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:1139:2: rule__ModifiersRule__Group__1__Impl rule__ModifiersRule__Group__2
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__11990);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__12302);
             rule__ModifiersRule__Group__1__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__11993);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__12305);
             rule__ModifiersRule__Group__2();
             _fsp--;
 
@@ -2634,23 +3077,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1003:1: rule__ModifiersRule__Group__1__Impl : ( ( 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:1146: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1007:1: ( ( ( 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:1008:1: ( ( 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:1150:1: ( ( ( 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:1151:1: ( ( 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:1008:1: ( ( 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:1009:1: ( 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:1151:1: ( ( 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:1152:1: ( rule__ModifiersRule__ValuesAssignment_1 )
             {
              before(grammarAccess.getModifiersRuleAccess().getValuesAssignment_1()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1010:1: ( 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:1010:2: 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:1153:1: ( 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:1153:2: rule__ModifiersRule__ValuesAssignment_1
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl2020);
+            pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl2332);
             rule__ModifiersRule__ValuesAssignment_1();
             _fsp--;
 
@@ -2680,20 +3123,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1020:1: rule__ModifiersRule__Group__2 : rule__ModifiersRule__Group__2__Impl 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:1163:1: rule__ModifiersRule__Group__2 : rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3 ;
     public final void rule__ModifiersRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1024:1: ( rule__ModifiersRule__Group__2__Impl 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:1025:2: rule__ModifiersRule__Group__2__Impl 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:1167:1: ( rule__ModifiersRule__Group__2__Impl 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:1168:2: rule__ModifiersRule__Group__2__Impl rule__ModifiersRule__Group__3
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__22050);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__22362);
             rule__ModifiersRule__Group__2__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__22053);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__22365);
             rule__ModifiersRule__Group__3();
             _fsp--;
 
@@ -2716,35 +3159,35 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1032:1: rule__ModifiersRule__Group__2__Impl : ( ( 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:1175: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1036:1: ( ( ( 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:1037:1: ( ( 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:1179:1: ( ( ( 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:1180:1: ( ( 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:1037:1: ( ( 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:1038:1: ( 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:1180:1: ( ( 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:1181:1: ( rule__ModifiersRule__Group_2__0 )*
             {
              before(grammarAccess.getModifiersRuleAccess().getGroup_2()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1039:1: ( rule__ModifiersRule__Group_2__0 )*
-            loop10:
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1182:1: ( rule__ModifiersRule__Group_2__0 )*
+            loop12:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt12=2;
+                int LA12_0 = input.LA(1);
 
-                if ( (LA10_0==28) ) {
-                    alt10=1;
+                if ( (LA12_0==28) ) {
+                    alt12=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1039:2: 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:1182:2: rule__ModifiersRule__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl2080);
+            	    pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl2392);
             	    rule__ModifiersRule__Group_2__0();
             	    _fsp--;
 
@@ -2753,7 +3196,7 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
             	    break;
 
             	default :
-            	    break loop10;
+            	    break loop12;
                 }
             } while (true);
 
@@ -2780,16 +3223,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1049:1: rule__ModifiersRule__Group__3 : 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:1192: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1053:1: ( 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:1054:2: 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:1196:1: ( 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:1197:2: rule__ModifiersRule__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__32111);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__32423);
             rule__ModifiersRule__Group__3__Impl();
             _fsp--;
 
@@ -2812,20 +3255,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1060:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1064:1: ( ( '}' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1065:1: ( '}' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1207:1: ( ( '}' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1208:1: ( '}' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1065:1: ( '}' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1066:1: '}'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1208:1: ( '}' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1209:1: '}'
             {
              before(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3()); 
-            match(input,27,FOLLOW_27_in_rule__ModifiersRule__Group__3__Impl2139); 
+            match(input,27,FOLLOW_27_in_rule__ModifiersRule__Group__3__Impl2451); 
              after(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3()); 
 
             }
@@ -2849,20 +3292,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1087:1: rule__ModifiersRule__Group_2__0 : rule__ModifiersRule__Group_2__0__Impl 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: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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1091:1: ( rule__ModifiersRule__Group_2__0__Impl 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:1092:2: rule__ModifiersRule__Group_2__0__Impl 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:1234:1: ( rule__ModifiersRule__Group_2__0__Impl 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:1235: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__02178);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__02490);
             rule__ModifiersRule__Group_2__0__Impl();
             _fsp--;
 
-            pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__02181);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__02493);
             rule__ModifiersRule__Group_2__1();
             _fsp--;
 
@@ -2885,20 +3328,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1099:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1103:1: ( ( ',' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1104:1: ( ',' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1246:1: ( ( ',' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1247:1: ( ',' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1104:1: ( ',' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1105:1: ','
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1247:1: ( ',' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1248:1: ','
             {
              before(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0()); 
-            match(input,28,FOLLOW_28_in_rule__ModifiersRule__Group_2__0__Impl2209); 
+            match(input,28,FOLLOW_28_in_rule__ModifiersRule__Group_2__0__Impl2521); 
              after(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0()); 
 
             }
@@ -2922,16 +3365,16 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1118:1: rule__ModifiersRule__Group_2__1 : 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:1261:1: rule__ModifiersRule__Group_2__1 : rule__ModifiersRule__Group_2__1__Impl ;
     public final void rule__ModifiersRule__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1122:1: ( 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:1123:2: 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:1265:1: ( 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:1266:2: rule__ModifiersRule__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__12240);
+            pushFollow(FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__12552);
             rule__ModifiersRule__Group_2__1__Impl();
             _fsp--;
 
@@ -2954,23 +3397,23 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1129:1: rule__ModifiersRule__Group_2__1__Impl : ( ( 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:1272: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.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1133:1: ( ( ( 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:1134:1: ( ( 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:1276:1: ( ( ( 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:1277:1: ( ( 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:1134:1: ( ( 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:1135:1: ( 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:1277:1: ( ( 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:1278:1: ( rule__ModifiersRule__ValuesAssignment_2_1 )
             {
              before(grammarAccess.getModifiersRuleAccess().getValuesAssignment_2_1()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1136:1: ( 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:1136:2: 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:1279:1: ( 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:1279:2: rule__ModifiersRule__ValuesAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl2267);
+            pushFollow(FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl2579);
             rule__ModifiersRule__ValuesAssignment_2_1();
             _fsp--;
 
@@ -2999,21 +3442,474 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     // $ANTLR end rule__ModifiersRule__Group_2__1__Impl
 
 
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1297:1: ( rule__RedefinesRule__Group__0__Impl 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:1298:2: rule__RedefinesRule__Group__0__Impl rule__RedefinesRule__Group__1
+            {
+            pushFollow(FOLLOW_rule__RedefinesRule__Group__0__Impl_in_rule__RedefinesRule__Group__02613);
+            rule__RedefinesRule__Group__0__Impl();
+            _fsp--;
+
+            pushFollow(FOLLOW_rule__RedefinesRule__Group__1_in_rule__RedefinesRule__Group__02616);
+            rule__RedefinesRule__Group__1();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__RedefinesRule__Group__0
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1309:1: ( ( 'redefines' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1310:1: ( 'redefines' )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1310:1: ( 'redefines' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1311:1: 'redefines'
+            {
+             before(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0()); 
+            match(input,29,FOLLOW_29_in_rule__RedefinesRule__Group__0__Impl2644); 
+             after(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__RedefinesRule__Group__0__Impl
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1328:1: ( 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:1329:2: rule__RedefinesRule__Group__1__Impl
+            {
+            pushFollow(FOLLOW_rule__RedefinesRule__Group__1__Impl_in_rule__RedefinesRule__Group__12675);
+            rule__RedefinesRule__Group__1__Impl();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__RedefinesRule__Group__1
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1339:1: ( ( ( 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:1340:1: ( ( 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:1340:1: ( ( 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:1341:1: ( rule__RedefinesRule__PropertyAssignment_1 )
+            {
+             before(grammarAccess.getRedefinesRuleAccess().getPropertyAssignment_1()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1342:1: ( 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:1342:2: rule__RedefinesRule__PropertyAssignment_1
+            {
+            pushFollow(FOLLOW_rule__RedefinesRule__PropertyAssignment_1_in_rule__RedefinesRule__Group__1__Impl2702);
+            rule__RedefinesRule__PropertyAssignment_1();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getRedefinesRuleAccess().getPropertyAssignment_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__RedefinesRule__Group__1__Impl
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1360:1: ( rule__SubsetsRule__Group__0__Impl 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:1361:2: rule__SubsetsRule__Group__0__Impl rule__SubsetsRule__Group__1
+            {
+            pushFollow(FOLLOW_rule__SubsetsRule__Group__0__Impl_in_rule__SubsetsRule__Group__02736);
+            rule__SubsetsRule__Group__0__Impl();
+            _fsp--;
+
+            pushFollow(FOLLOW_rule__SubsetsRule__Group__1_in_rule__SubsetsRule__Group__02739);
+            rule__SubsetsRule__Group__1();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__SubsetsRule__Group__0
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1372:1: ( ( 'subsets' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1373:1: ( 'subsets' )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1373:1: ( 'subsets' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1374:1: 'subsets'
+            {
+             before(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0()); 
+            match(input,30,FOLLOW_30_in_rule__SubsetsRule__Group__0__Impl2767); 
+             after(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__SubsetsRule__Group__0__Impl
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1391:1: ( 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:1392:2: rule__SubsetsRule__Group__1__Impl
+            {
+            pushFollow(FOLLOW_rule__SubsetsRule__Group__1__Impl_in_rule__SubsetsRule__Group__12798);
+            rule__SubsetsRule__Group__1__Impl();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__SubsetsRule__Group__1
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1402:1: ( ( ( 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:1403:1: ( ( 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:1403:1: ( ( 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:1404:1: ( rule__SubsetsRule__PropertyAssignment_1 )
+            {
+             before(grammarAccess.getSubsetsRuleAccess().getPropertyAssignment_1()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1405:1: ( 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:1405:2: rule__SubsetsRule__PropertyAssignment_1
+            {
+            pushFollow(FOLLOW_rule__SubsetsRule__PropertyAssignment_1_in_rule__SubsetsRule__Group__1__Impl2825);
+            rule__SubsetsRule__PropertyAssignment_1();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getSubsetsRuleAccess().getPropertyAssignment_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__SubsetsRule__Group__1__Impl
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1423:1: ( rule__DefaultValueRule__Group__0__Impl 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:1424:2: rule__DefaultValueRule__Group__0__Impl rule__DefaultValueRule__Group__1
+            {
+            pushFollow(FOLLOW_rule__DefaultValueRule__Group__0__Impl_in_rule__DefaultValueRule__Group__02859);
+            rule__DefaultValueRule__Group__0__Impl();
+            _fsp--;
+
+            pushFollow(FOLLOW_rule__DefaultValueRule__Group__1_in_rule__DefaultValueRule__Group__02862);
+            rule__DefaultValueRule__Group__1();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__DefaultValueRule__Group__0
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1435:1: ( ( '=' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1436:1: ( '=' )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1436:1: ( '=' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1437:1: '='
+            {
+             before(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0()); 
+            match(input,31,FOLLOW_31_in_rule__DefaultValueRule__Group__0__Impl2890); 
+             after(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__DefaultValueRule__Group__0__Impl
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1454:1: ( 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:1455:2: rule__DefaultValueRule__Group__1__Impl
+            {
+            pushFollow(FOLLOW_rule__DefaultValueRule__Group__1__Impl_in_rule__DefaultValueRule__Group__12921);
+            rule__DefaultValueRule__Group__1__Impl();
+            _fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__DefaultValueRule__Group__1
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1465:1: ( ( ( 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:1466:1: ( ( 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:1466:1: ( ( 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:1467:1: ( rule__DefaultValueRule__DefaultAssignment_1 )
+            {
+             before(grammarAccess.getDefaultValueRuleAccess().getDefaultAssignment_1()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1468:1: ( 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:1468:2: rule__DefaultValueRule__DefaultAssignment_1
+            {
+            pushFollow(FOLLOW_rule__DefaultValueRule__DefaultAssignment_1_in_rule__DefaultValueRule__Group__1__Impl2948);
+            rule__DefaultValueRule__DefaultAssignment_1();
+            _fsp--;
+
+
+            }
+
+             after(grammarAccess.getDefaultValueRuleAccess().getDefaultAssignment_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__DefaultValueRule__Group__1__Impl
+
+
     // $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:1151:1: rule__PropertyRule__VisibilityAssignment_0 : ( ruleVisibilityKind ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1155:1: ( ( ruleVisibilityKind ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1156:1: ( ruleVisibilityKind )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1487:1: ( ( ruleVisibilityKind ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1488:1: ( ruleVisibilityKind )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1156:1: ( ruleVisibilityKind )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1157:1: ruleVisibilityKind
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1488:1: ( ruleVisibilityKind )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1489:1: ruleVisibilityKind
             {
              before(grammarAccess.getPropertyRuleAccess().getVisibilityVisibilityKindEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleVisibilityKind_in_rule__PropertyRule__VisibilityAssignment_02306);
+            pushFollow(FOLLOW_ruleVisibilityKind_in_rule__PropertyRule__VisibilityAssignment_02987);
             ruleVisibilityKind();
             _fsp--;
 
@@ -3040,24 +3936,24 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1166:1: 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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1170:1: ( ( ( '/' ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1171:1: ( ( '/' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1502:1: ( ( ( '/' ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1503:1: ( ( '/' ) )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1171:1: ( ( '/' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1172:1: ( '/' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1503:1: ( ( '/' ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1504:1: ( '/' )
             {
              before(grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1173:1: ( '/' )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1174:1: '/'
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1505:1: ( '/' )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1506:1: '/'
             {
              before(grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0()); 
-            match(input,29,FOLLOW_29_in_rule__PropertyRule__IsDerivedAssignment_12342); 
+            match(input,32,FOLLOW_32_in_rule__PropertyRule__IsDerivedAssignment_13023); 
              after(grammarAccess.getPropertyRuleAccess().getIsDerivedSolidusKeyword_1_0()); 
 
             }
@@ -3085,20 +3981,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1189:1: rule__PropertyRule__NameAssignment_2 : ( RULE_ID ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1193:1: ( ( RULE_ID ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1194:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1525:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1526:1: ( RULE_ID )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1194:1: ( RULE_ID )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1195:1: RULE_ID
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1526:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1527:1: RULE_ID
             {
              before(grammarAccess.getPropertyRuleAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PropertyRule__NameAssignment_22381); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__PropertyRule__NameAssignment_23062); 
              after(grammarAccess.getPropertyRuleAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -3122,20 +4018,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1204:1: rule__PropertyRule__TypeAssignment_4_0 : ( ruleTypeRule ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1208:1: ( ( ruleTypeRule ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1209:1: ( ruleTypeRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1540:1: ( ( ruleTypeRule ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1541:1: ( ruleTypeRule )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1209:1: ( ruleTypeRule )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1210:1: ruleTypeRule
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1541:1: ( ruleTypeRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1542:1: ruleTypeRule
             {
              before(grammarAccess.getPropertyRuleAccess().getTypeTypeRuleParserRuleCall_4_0_0()); 
-            pushFollow(FOLLOW_ruleTypeRule_in_rule__PropertyRule__TypeAssignment_4_02412);
+            pushFollow(FOLLOW_ruleTypeRule_in_rule__PropertyRule__TypeAssignment_4_03093);
             ruleTypeRule();
             _fsp--;
 
@@ -3162,20 +4058,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1219:1: rule__PropertyRule__MultiplicityAssignment_5 : ( ruleMultiplicityRule ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1223:1: ( ( ruleMultiplicityRule ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1224:1: ( ruleMultiplicityRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1555:1: ( ( ruleMultiplicityRule ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1556:1: ( ruleMultiplicityRule )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1224:1: ( ruleMultiplicityRule )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1225:1: ruleMultiplicityRule
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1556:1: ( ruleMultiplicityRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1557:1: ruleMultiplicityRule
             {
              before(grammarAccess.getPropertyRuleAccess().getMultiplicityMultiplicityRuleParserRuleCall_5_0()); 
-            pushFollow(FOLLOW_ruleMultiplicityRule_in_rule__PropertyRule__MultiplicityAssignment_52443);
+            pushFollow(FOLLOW_ruleMultiplicityRule_in_rule__PropertyRule__MultiplicityAssignment_53124);
             ruleMultiplicityRule();
             _fsp--;
 
@@ -3202,20 +4098,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1234:1: rule__PropertyRule__ModifiersAssignment_6 : ( ruleModifiersRule ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1238:1: ( ( ruleModifiersRule ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1239:1: ( ruleModifiersRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1570:1: ( ( ruleModifiersRule ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1571:1: ( ruleModifiersRule )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1239:1: ( ruleModifiersRule )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1240:1: ruleModifiersRule
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1571:1: ( ruleModifiersRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1572:1: ruleModifiersRule
             {
              before(grammarAccess.getPropertyRuleAccess().getModifiersModifiersRuleParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleModifiersRule_in_rule__PropertyRule__ModifiersAssignment_62474);
+            pushFollow(FOLLOW_ruleModifiersRule_in_rule__PropertyRule__ModifiersAssignment_63155);
             ruleModifiersRule();
             _fsp--;
 
@@ -3241,21 +4137,61 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     // $ANTLR end rule__PropertyRule__ModifiersAssignment_6
 
 
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1585:1: ( ( ruleDefaultValueRule ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1586:1: ( ruleDefaultValueRule )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1586:1: ( ruleDefaultValueRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1587:1: ruleDefaultValueRule
+            {
+             before(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); 
+            pushFollow(FOLLOW_ruleDefaultValueRule_in_rule__PropertyRule__DefaultAssignment_73186);
+            ruleDefaultValueRule();
+            _fsp--;
+
+             after(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__PropertyRule__DefaultAssignment_7
+
+
     // $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:1249:1: rule__TypeRule__PathAssignment_0 : ( ruleQualifiedName ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1253:1: ( ( ruleQualifiedName ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1254:1: ( ruleQualifiedName )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1600:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1601:1: ( ruleQualifiedName )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1254:1: ( ruleQualifiedName )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1255:1: ruleQualifiedName
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1601:1: ( ruleQualifiedName )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1602:1: ruleQualifiedName
             {
              before(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_02505);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03217);
             ruleQualifiedName();
             _fsp--;
 
@@ -3282,24 +4218,24 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1264:1: rule__TypeRule__TypeAssignment_1 : ( ( RULE_ID ) ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1268:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1269:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1615:1: ( ( ( RULE_ID ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1616:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1269:1: ( ( RULE_ID ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1270:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1616:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1617:1: ( RULE_ID )
             {
              before(grammarAccess.getTypeRuleAccess().getTypeClassifierCrossReference_1_0()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1271:1: ( RULE_ID )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1272:1: RULE_ID
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1618:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1619:1: RULE_ID
             {
              before(grammarAccess.getTypeRuleAccess().getTypeClassifierIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_12540); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_13252); 
              after(grammarAccess.getTypeRuleAccess().getTypeClassifierIDTerminalRuleCall_1_0_1()); 
 
             }
@@ -3327,24 +4263,24 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1283:1: rule__QualifiedName__PathAssignment_0 : ( ( RULE_ID ) ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1287:1: ( ( ( RULE_ID ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1288:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1634:1: ( ( ( RULE_ID ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1635:1: ( ( RULE_ID ) )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1288:1: ( ( RULE_ID ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1289:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1635:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1636:1: ( RULE_ID )
             {
              before(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0()); 
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1290:1: ( RULE_ID )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1291:1: RULE_ID
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1637:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1638:1: RULE_ID
             {
              before(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_02579); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_03291); 
              after(grammarAccess.getQualifiedNameAccess().getPathNamespaceIDTerminalRuleCall_0_0_1()); 
 
             }
@@ -3372,20 +4308,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1302:1: rule__QualifiedName__RemainingAssignment_2 : ( ruleQualifiedName ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1306:1: ( ( ruleQualifiedName ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1307:1: ( ruleQualifiedName )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1653:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1654:1: ( ruleQualifiedName )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1307:1: ( ruleQualifiedName )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1308:1: ruleQualifiedName
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1654:1: ( ruleQualifiedName )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1655:1: ruleQualifiedName
             {
              before(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_22614);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23326);
             ruleQualifiedName();
             _fsp--;
 
@@ -3412,20 +4348,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1317:1: rule__MultiplicityRule__BoundsAssignment_1 : ( ruleBoundSpecification ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1321:1: ( ( ruleBoundSpecification ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1322:1: ( ruleBoundSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1668:1: ( ( ruleBoundSpecification ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1669:1: ( ruleBoundSpecification )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1322:1: ( ruleBoundSpecification )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1323:1: ruleBoundSpecification
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1669:1: ( ruleBoundSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1670:1: ruleBoundSpecification
             {
              before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_12645);
+            pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13357);
             ruleBoundSpecification();
             _fsp--;
 
@@ -3452,20 +4388,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1332:1: rule__MultiplicityRule__BoundsAssignment_2_1 : ( ruleBoundSpecification ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1336:1: ( ( ruleBoundSpecification ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1337:1: ( ruleBoundSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1683:1: ( ( ruleBoundSpecification ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1684:1: ( ruleBoundSpecification )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1337:1: ( ruleBoundSpecification )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1338:1: ruleBoundSpecification
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1684:1: ( ruleBoundSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1685:1: ruleBoundSpecification
             {
              before(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_12676);
+            pushFollow(FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13388);
             ruleBoundSpecification();
             _fsp--;
 
@@ -3492,20 +4428,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1347:1: rule__BoundSpecification__ValueAssignment : ( RULE_UNLIMITEDLITERAL ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1351:1: ( ( RULE_UNLIMITEDLITERAL ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1352:1: ( RULE_UNLIMITEDLITERAL )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1698:1: ( ( RULE_UNLIMITEDLITERAL ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1699:1: ( RULE_UNLIMITEDLITERAL )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1352:1: ( RULE_UNLIMITEDLITERAL )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1353:1: RULE_UNLIMITEDLITERAL
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1699:1: ( RULE_UNLIMITEDLITERAL )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1700:1: RULE_UNLIMITEDLITERAL
             {
              before(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
-            match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment2707); 
+            match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment3419); 
              after(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0()); 
 
             }
@@ -3529,20 +4465,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1362:1: rule__ModifiersRule__ValuesAssignment_1 : ( ruleModifierSpecification ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1366:1: ( ( ruleModifierSpecification ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1367:1: ( ruleModifierSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1713:1: ( ( ruleModifierSpecification ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1714:1: ( ruleModifierSpecification )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1367:1: ( ruleModifierSpecification )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1368:1: ruleModifierSpecification
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1714:1: ( ruleModifierSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1715:1: ruleModifierSpecification
             {
              before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_12738);
+            pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13450);
             ruleModifierSpecification();
             _fsp--;
 
@@ -3569,20 +4505,20 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
 
 
     // $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:1377:1: rule__ModifiersRule__ValuesAssignment_2_1 : ( ruleModifierSpecification ) ;
+    // ../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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1381:1: ( ( ruleModifierSpecification ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1382:1: ( ruleModifierSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1728:1: ( ( ruleModifierSpecification ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1729:1: ( ruleModifierSpecification )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1382:1: ( ruleModifierSpecification )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1383:1: ruleModifierSpecification
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1729:1: ( ruleModifierSpecification )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1730:1: ruleModifierSpecification
             {
              before(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_12769);
+            pushFollow(FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13481);
             ruleModifierSpecification();
             _fsp--;
 
@@ -3608,25 +4544,232 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     // $ANTLR end rule__ModifiersRule__ValuesAssignment_2_1
 
 
-    // $ANTLR start rule__ModifierSpecification__ValueAssignment
-    // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1392:1: rule__ModifierSpecification__ValueAssignment : ( ruleModifierKind ) ;
-    public final void rule__ModifierSpecification__ValueAssignment() throws RecognitionException {
+    // $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 {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1396:1: ( ( ruleModifierKind ) )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1397:1: ( ruleModifierKind )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1743:1: ( ( ruleModifierKind ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1744:1: ( ruleModifierKind )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1397:1: ( ruleModifierKind )
-            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1398:1: ruleModifierKind
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1744:1: ( ruleModifierKind )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1745:1: ruleModifierKind
             {
-             before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); 
-            pushFollow(FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment2800);
+             before(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); 
+            pushFollow(FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment_03512);
             ruleModifierKind();
             _fsp--;
 
-             after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0()); 
+             after(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__ModifierSpecification__ValueAssignment_0
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1758:1: ( ( ruleRedefinesRule ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1759:1: ( ruleRedefinesRule )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1759:1: ( ruleRedefinesRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1760:1: ruleRedefinesRule
+            {
+             before(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_ruleRedefinesRule_in_rule__ModifierSpecification__RedefinesAssignment_13543);
+            ruleRedefinesRule();
+            _fsp--;
+
+             after(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__ModifierSpecification__RedefinesAssignment_1
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1773:1: ( ( ruleSubsetsRule ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1774:1: ( ruleSubsetsRule )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1774:1: ( ruleSubsetsRule )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1775:1: ruleSubsetsRule
+            {
+             before(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_ruleSubsetsRule_in_rule__ModifierSpecification__SubsetsAssignment_23574);
+            ruleSubsetsRule();
+            _fsp--;
+
+             after(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__ModifierSpecification__SubsetsAssignment_2
+
+
+    // $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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1788:1: ( ( ( RULE_ID ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1789:1: ( ( RULE_ID ) )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1789:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1790:1: ( RULE_ID )
+            {
+             before(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1791:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1792:1: RULE_ID
+            {
+             before(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RedefinesRule__PropertyAssignment_13609); 
+             after(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); 
+
+            }
+
+             after(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__RedefinesRule__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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1807:1: ( ( ( RULE_ID ) ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1808:1: ( ( RULE_ID ) )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1808:1: ( ( RULE_ID ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1809:1: ( RULE_ID )
+            {
+             before(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0()); 
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1810:1: ( RULE_ID )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1811:1: RULE_ID
+            {
+             before(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SubsetsRule__PropertyAssignment_13648); 
+             after(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyIDTerminalRuleCall_1_0_1()); 
+
+            }
+
+             after(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end rule__SubsetsRule__PropertyAssignment_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 {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1826:1: ( ( RULE_STRING ) )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1827:1: ( RULE_STRING )
+            {
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1827:1: ( RULE_STRING )
+            // ../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g:1828:1: RULE_STRING
+            {
+             before(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0()); 
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__DefaultValueRule__DefaultAssignment_13683); 
+             after(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0()); 
 
             }
 
@@ -3645,7 +4788,7 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end rule__ModifierSpecification__ValueAssignment
+    // $ANTLR end rule__DefaultValueRule__DefaultAssignment_1
 
 
  
@@ -3670,99 +4813,135 @@ public class InternalUmlPropertyParser extends AbstractInternalContentAssistPars
     public static final BitSet FOLLOW_rule__ModifiersRule__Group__0_in_ruleModifiersRule394 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification421 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifierSpecification__ValueAssignment_in_ruleModifierSpecification454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__TypeAssignment_4_0_in_rule__PropertyRule__Alternatives_4562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__PropertyRule__Alternatives_4581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__VisibilityKind__Alternatives616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__VisibilityKind__Alternatives637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__VisibilityKind__Alternatives658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__VisibilityKind__Alternatives679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__ModifierKind__Alternatives715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__ModifierKind__Alternatives736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__ModifierKind__Alternatives757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__ModifierKind__Alternatives778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__0__Impl_in_rule__PropertyRule__Group__0811 = new BitSet(new long[]{0x0000000020000010L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__1_in_rule__PropertyRule__Group__0814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__VisibilityAssignment_0_in_rule__PropertyRule__Group__0__Impl841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__1__Impl_in_rule__PropertyRule__Group__1871 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__2_in_rule__PropertyRule__Group__1874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__IsDerivedAssignment_1_in_rule__PropertyRule__Group__1__Impl901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__2__Impl_in_rule__PropertyRule__Group__2932 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__3_in_rule__PropertyRule__Group__2935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__NameAssignment_2_in_rule__PropertyRule__Group__2__Impl962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__3__Impl_in_rule__PropertyRule__Group__3992 = new BitSet(new long[]{0x0000000000001010L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__4_in_rule__PropertyRule__Group__3995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__PropertyRule__Group__3__Impl1023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__4__Impl_in_rule__PropertyRule__Group__41054 = new BitSet(new long[]{0x0000000004800002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__5_in_rule__PropertyRule__Group__41057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Alternatives_4_in_rule__PropertyRule__Group__4__Impl1084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__5__Impl_in_rule__PropertyRule__Group__51114 = new BitSet(new long[]{0x0000000004000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__6_in_rule__PropertyRule__Group__51117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__MultiplicityAssignment_5_in_rule__PropertyRule__Group__5__Impl1144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__Group__6__Impl_in_rule__PropertyRule__Group__61175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PropertyRule__ModifiersAssignment_6_in_rule__PropertyRule__Group__6__Impl1202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__01247 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__01250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl1277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__11308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl1335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__01369 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__01372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__PathAssignment_0_in_rule__QualifiedName__Group__0__Impl1399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__11429 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__2_in_rule__QualifiedName__Group__11432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__QualifiedName__Group__1__Impl1460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__2__Impl_in_rule__QualifiedName__Group__21491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__01555 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__01558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__MultiplicityRule__Group__0__Impl1586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1__Impl_in_rule__MultiplicityRule__Group__11617 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2_in_rule__MultiplicityRule__Group__11620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_1_in_rule__MultiplicityRule__Group__1__Impl1647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__2__Impl_in_rule__MultiplicityRule__Group__21677 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3_in_rule__MultiplicityRule__Group__21680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0_in_rule__MultiplicityRule__Group__2__Impl1707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__3__Impl_in_rule__MultiplicityRule__Group__31738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__MultiplicityRule__Group__3__Impl1766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__01805 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__01808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__MultiplicityRule__Group_2__0__Impl1836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__11867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl1894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__01928 = new BitSet(new long[]{0x00000000001E0000L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__01931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__ModifiersRule__Group__0__Impl1959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__1__Impl_in_rule__ModifiersRule__Group__11990 = new BitSet(new long[]{0x0000000018000000L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__2_in_rule__ModifiersRule__Group__11993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_1_in_rule__ModifiersRule__Group__1__Impl2020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__2__Impl_in_rule__ModifiersRule__Group__22050 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__3_in_rule__ModifiersRule__Group__22053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0_in_rule__ModifiersRule__Group__2__Impl2080 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group__3__Impl_in_rule__ModifiersRule__Group__32111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__ModifiersRule__Group__3__Impl2139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__02178 = new BitSet(new long[]{0x00000000001E0000L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__02181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__ModifiersRule__Group_2__0__Impl2209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__12240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl2267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__PropertyRule__VisibilityAssignment_02306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__PropertyRule__IsDerivedAssignment_12342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__PropertyRule__NameAssignment_22381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeRule_in_rule__PropertyRule__TypeAssignment_4_02412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicityRule_in_rule__PropertyRule__MultiplicityAssignment_52443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifiersRule_in_rule__PropertyRule__ModifiersAssignment_62474 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_02505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_12540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_02579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_22614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_12645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_12676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment2707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_12738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_12769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment2800 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifierSpecification__Alternatives_in_ruleModifierSpecification454 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule481 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRedefinesRule488 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RedefinesRule__Group__0_in_ruleRedefinesRule514 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule541 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleSubsetsRule548 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SubsetsRule__Group__0_in_ruleSubsetsRule574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule601 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleDefaultValueRule608 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__DefaultValueRule__Group__0_in_ruleDefaultValueRule634 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__VisibilityKind__Alternatives_in_ruleVisibilityKind671 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifierKind__Alternatives_in_ruleModifierKind707 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__PropertyRule__TypeAssignment_4_0_in_rule__PropertyRule__Alternatives_4742 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_12_in_rule__PropertyRule__Alternatives_4761 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifierSpecification__ValueAssignment_0_in_rule__ModifierSpecification__Alternatives795 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifierSpecification__RedefinesAssignment_1_in_rule__ModifierSpecification__Alternatives813 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifierSpecification__SubsetsAssignment_2_in_rule__ModifierSpecification__Alternatives831 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__VisibilityKind__Alternatives865 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_14_in_rule__VisibilityKind__Alternatives886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_15_in_rule__VisibilityKind__Alternatives907 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_rule__VisibilityKind__Alternatives928 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_17_in_rule__ModifierKind__Alternatives964 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_18_in_rule__ModifierKind__Alternatives985 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_19_in_rule__ModifierKind__Alternatives1006 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_20_in_rule__ModifierKind__Alternatives1027 = new BitSet(new long[]{0x0000000000000002L});
+    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__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});
+    public static final BitSet FOLLOW_rule__PropertyRule__Group__3_in_rule__PropertyRule__Group__21184 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__PropertyRule__NameAssignment_2_in_rule__PropertyRule__Group__2__Impl1211 = new BitSet(new long[]{0x0000000000000002L});
+    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__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__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__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});
+    public static final BitSet FOLLOW_rule__PropertyRule__DefaultAssignment_7_in_rule__PropertyRule__Group__7__Impl1512 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__TypeRule__Group__0__Impl_in_rule__TypeRule__Group__01559 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__TypeRule__Group__1_in_rule__TypeRule__Group__01562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__TypeRule__PathAssignment_0_in_rule__TypeRule__Group__0__Impl1589 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__TypeRule__Group__1__Impl_in_rule__TypeRule__Group__11620 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__TypeRule__TypeAssignment_1_in_rule__TypeRule__Group__1__Impl1647 = new BitSet(new long[]{0x0000000000000002L});
+    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__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});
+    public static final BitSet FOLLOW_rule__QualifiedName__RemainingAssignment_2_in_rule__QualifiedName__Group__2__Impl1830 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__0__Impl_in_rule__MultiplicityRule__Group__01867 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_rule__MultiplicityRule__Group__1_in_rule__MultiplicityRule__Group__01870 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_rule__MultiplicityRule__Group__0__Impl1898 = new BitSet(new long[]{0x0000000000000002L});
+    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__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});
+    public static final BitSet FOLLOW_24_in_rule__MultiplicityRule__Group__3__Impl2078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__0__Impl_in_rule__MultiplicityRule__Group_2__02117 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1_in_rule__MultiplicityRule__Group_2__02120 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_25_in_rule__MultiplicityRule__Group_2__0__Impl2148 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MultiplicityRule__Group_2__1__Impl_in_rule__MultiplicityRule__Group_2__12179 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MultiplicityRule__BoundsAssignment_2_1_in_rule__MultiplicityRule__Group_2__1__Impl2206 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifiersRule__Group__0__Impl_in_rule__ModifiersRule__Group__02240 = new BitSet(new long[]{0x00000000601E0000L});
+    public static final BitSet FOLLOW_rule__ModifiersRule__Group__1_in_rule__ModifiersRule__Group__02243 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_26_in_rule__ModifiersRule__Group__0__Impl2271 = new BitSet(new long[]{0x0000000000000002L});
+    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__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});
+    public static final BitSet FOLLOW_27_in_rule__ModifiersRule__Group__3__Impl2451 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__0__Impl_in_rule__ModifiersRule__Group_2__02490 = new BitSet(new long[]{0x00000000601E0000L});
+    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1_in_rule__ModifiersRule__Group_2__02493 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_rule__ModifiersRule__Group_2__0__Impl2521 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifiersRule__Group_2__1__Impl_in_rule__ModifiersRule__Group_2__12552 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ModifiersRule__ValuesAssignment_2_1_in_rule__ModifiersRule__Group_2__1__Impl2579 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RedefinesRule__Group__0__Impl_in_rule__RedefinesRule__Group__02613 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__RedefinesRule__Group__1_in_rule__RedefinesRule__Group__02616 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_29_in_rule__RedefinesRule__Group__0__Impl2644 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RedefinesRule__Group__1__Impl_in_rule__RedefinesRule__Group__12675 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RedefinesRule__PropertyAssignment_1_in_rule__RedefinesRule__Group__1__Impl2702 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SubsetsRule__Group__0__Impl_in_rule__SubsetsRule__Group__02736 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__SubsetsRule__Group__1_in_rule__SubsetsRule__Group__02739 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_30_in_rule__SubsetsRule__Group__0__Impl2767 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SubsetsRule__Group__1__Impl_in_rule__SubsetsRule__Group__12798 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SubsetsRule__PropertyAssignment_1_in_rule__SubsetsRule__Group__1__Impl2825 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__DefaultValueRule__Group__0__Impl_in_rule__DefaultValueRule__Group__02859 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_rule__DefaultValueRule__Group__1_in_rule__DefaultValueRule__Group__02862 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_31_in_rule__DefaultValueRule__Group__0__Impl2890 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__DefaultValueRule__Group__1__Impl_in_rule__DefaultValueRule__Group__12921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__DefaultValueRule__DefaultAssignment_1_in_rule__DefaultValueRule__Group__1__Impl2948 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleVisibilityKind_in_rule__PropertyRule__VisibilityAssignment_02987 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_rule__PropertyRule__IsDerivedAssignment_13023 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__PropertyRule__NameAssignment_23062 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleTypeRule_in_rule__PropertyRule__TypeAssignment_4_03093 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMultiplicityRule_in_rule__PropertyRule__MultiplicityAssignment_53124 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleModifiersRule_in_rule__PropertyRule__ModifiersAssignment_63155 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleDefaultValueRule_in_rule__PropertyRule__DefaultAssignment_73186 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__TypeRule__PathAssignment_03217 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__TypeRule__TypeAssignment_13252 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedName__PathAssignment_03291 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedName__RemainingAssignment_23326 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_13357 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleBoundSpecification_in_rule__MultiplicityRule__BoundsAssignment_2_13388 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_rule__BoundSpecification__ValueAssignment3419 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_13450 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleModifierSpecification_in_rule__ModifiersRule__ValuesAssignment_2_13481 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleModifierKind_in_rule__ModifierSpecification__ValueAssignment_03512 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRedefinesRule_in_rule__ModifierSpecification__RedefinesAssignment_13543 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSubsetsRule_in_rule__ModifierSpecification__SubsetsAssignment_23574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__RedefinesRule__PropertyAssignment_13609 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__SubsetsRule__PropertyAssignment_13648 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__DefaultValueRule__DefaultAssignment_13683 = new BitSet(new long[]{0x0000000000000002L});
 
 }
 \ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty__.g b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty__.g
index 2dd52d0d50f..4240d26a891 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty__.g
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty__.g
@@ -24,30 +24,33 @@ T25 : '..' ;
 T26 : '{' ;
 T27 : '}' ;
 T28 : ',' ;
-T29 : '/' ;
+T29 : 'redefines' ;
+T30 : 'subsets' ;
+T31 : '=' ;
+T32 : '/' ;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1408
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1838
 RULE_UNLIMITEDLITERAL : ('0'..'9' ('0'..'9')*|'*');
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1410
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1840
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1412
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1842
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1414
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1844
 RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1416
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1846
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1418
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1848
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1420
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1850
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1422
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext.ui/src-gen/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/antlr/internal/InternalUmlProperty.g" 1852
 RULE_ANY_OTHER : .;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/UmlPropertyProposalProvider.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/UmlPropertyProposalProvider.java
index 28a5fd23f14..fa624dc9998 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/UmlPropertyProposalProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contentassist/UmlPropertyProposalProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.papyrus.core.utils.DisplayUtils;
+import org.eclipse.papyrus.property.editor.xtext.scoping.UmlPropertyScopeProvider;
 import org.eclipse.papyrus.property.editor.xtext.ui.contentassist.AbstractUmlPropertyProposalProvider;
 import org.eclipse.papyrus.property.editor.xtext.ui.contributions.UMLPropertyEditorPropertyUtil;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification;
@@ -196,8 +197,34 @@ public class UmlPropertyProposalProvider extends AbstractUmlPropertyProposalProv
 		}
 	}
 	
-	
-	
+	@Override
+	public void completeRedefinesRule_Property(EObject model,
+			Assignment assignment, ContentAssistContext context,
+			ICompletionProposalAcceptor acceptor) {
+		for (Property inherited : UmlPropertyScopeProvider.retrieveInheritedProperties()) {
+			if (inherited.getName().toLowerCase().contains(context.getPrefix().toLowerCase())) {
+				String completionString = inherited.getName() ;
+				String displayString = UMLPropertyEditorPropertyUtil.getLabel(inherited) ;
+				CustomCompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(inherited, completionString, displayString, context) ;
+				acceptor.accept(completionProposal) ;
+			}
+		}
+	}
+
+	@Override
+	public void completeSubsetsRule_Property(EObject model,
+			Assignment assignment, ContentAssistContext context,
+			ICompletionProposalAcceptor acceptor) {
+		for (Property inherited : UmlPropertyScopeProvider.retrieveInheritedProperties()) {
+			if (inherited.getName().toLowerCase().contains(context.getPrefix().toLowerCase())) {
+				String completionString = inherited.getName() ;
+				String displayString = UMLPropertyEditorPropertyUtil.getLabel(inherited) ;
+				CustomCompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(inherited, completionString, displayString, context) ;
+				acceptor.accept(completionProposal) ;
+			}
+		}
+	}
+
 	/**
 	 * Provides custom completion for keywords, in the context of "modifiers" specification
 	 * 
@@ -261,6 +288,7 @@ public class UmlPropertyProposalProvider extends AbstractUmlPropertyProposalProv
 	@Override
 	public void complete_MultiplicityRule(EObject model, RuleCall ruleCall,
 			ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		String zero_one = "[0..1]" ;
 		String one = "[1]" ;
 		String one_star = "[1..*]" ;
 		String star = "[*]" ;
@@ -269,6 +297,11 @@ public class UmlPropertyProposalProvider extends AbstractUmlPropertyProposalProv
 		String displayString = "";
 		ICompletionProposal completionProposal = null ;
 		
+		completionString = "" + zero_one.substring(context.getPrefix().length()) ;
+		displayString = "" + zero_one ;
+		completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
+		acceptor.accept(completionProposal) ;
+		
 		completionString = "" + one.substring(context.getPrefix().length()) ;
 		displayString = "" + one ;
 		completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/PropertyPopupEditorConfigurationContribution.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/PropertyPopupEditorConfigurationContribution.java
index 54eebcb6b33..edce74fb2a3 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/PropertyPopupEditorConfigurationContribution.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/PropertyPopupEditorConfigurationContribution.java
@@ -71,12 +71,18 @@ public class PropertyPopupEditorConfigurationContribution extends PopupEditorCon
 	private int newLowerBound;
 
 	private int newUpperBound;
+	
+	private String newDefault ;
 
 	private String newName;
 
 	private Classifier newType;
 
 	private org.eclipse.uml2.uml.VisibilityKind newVisibility;
+	
+	private List<Property> newRedefines = new ArrayList<Property>() ;
+	
+	private List<Property> newSubsets = new ArrayList<Property>() ;
 
 	/**
 	 * Default implementation of the constructor for this class
@@ -135,24 +141,33 @@ public class PropertyPopupEditorConfigurationContribution extends PopupEditorCon
 				newIsUnique = false;
 				newIsUnion = false;
 				newIsOrdered = false;
+				newRedefines = new ArrayList<Property>() ;
+				newSubsets = new ArrayList<Property>() ;
 				if(propertyRuleObject.getModifiers() != null) {
 					for(ModifierSpecification modifier : propertyRuleObject.getModifiers().getValues()) {
-						switch(modifier.getValue()) {
-						case ORDERED:
-							newIsOrdered = true;
-							break;
-						case READ_ONLY:
-							newIsReadOnly = true;
-							break;
-						case UNION:
-							newIsUnion = true;
-							break;
-						case UNIQUE:
-							newIsUnique = true;
-							break;
-						default:
-							break;
-						}
+						if (modifier.getRedefines() == null && modifier.getSubsets()==null)
+							switch(modifier.getValue()) {
+							case ORDERED:
+								newIsOrdered = true;
+								break;
+							case READ_ONLY:
+								newIsReadOnly = true;
+								break;
+							case UNION:
+								newIsUnion = true;
+								break;
+							case UNIQUE:
+								newIsUnique = true;
+								break;
+							default:
+								break;
+							}
+					}
+					for (ModifierSpecification modifier : propertyRuleObject.getModifiers().getValues()) {
+						if (modifier.getRedefines() != null)
+							newRedefines.add(modifier.getRedefines().getProperty()) ;
+						else if (modifier.getSubsets() != null)
+							newSubsets.add(modifier.getSubsets().getProperty()) ;
 					}
 				}
 				newLowerBound = 1;
@@ -179,6 +194,13 @@ public class PropertyPopupEditorConfigurationContribution extends PopupEditorCon
 					}
 				}
 
+				if (propertyRuleObject.getDefault() != null) {
+					newDefault = propertyRuleObject.getDefault().getDefault() ;
+				}
+				else {
+					newDefault = null ;
+				}
+				
 				newName = "" + propertyRuleObject.getName();
 
 				TypeRule typeRule = propertyRuleObject.getType();
@@ -268,6 +290,18 @@ public class PropertyPopupEditorConfigurationContribution extends PopupEditorCon
 		ICommand setVisibilityCommand = provider.getEditCommand(setVisibilityRequest);
 		updateCommand.add(setVisibilityCommand);
 
+		SetRequest setDefaultValueRequest = new SetRequest (editedObject, UMLPackage.eINSTANCE.getProperty_Default(), newDefault) ;
+		ICommand setDefaultValueCommand = provider.getEditCommand(setDefaultValueRequest) ;
+		updateCommand.add(setDefaultValueCommand) ;
+		
+		SetRequest setRedefinedPropertiesRequest = new SetRequest (editedObject, UMLPackage.eINSTANCE.getProperty_RedefinedProperty(), newRedefines) ;
+		ICommand setRedefinedPropertiesCommand = provider.getEditCommand(setRedefinedPropertiesRequest) ;
+		updateCommand.add(setRedefinedPropertiesCommand) ;
+		
+		SetRequest setSubsettedPropertiesRequest = new SetRequest (editedObject, UMLPackage.eINSTANCE.getProperty_SubsettedProperty(), newSubsets) ;
+		ICommand setSubsettedPropertiesCommand = provider.getEditCommand(setSubsettedPropertiesRequest) ;
+		updateCommand.add(setSubsettedPropertiesCommand) ;
+		
 		return updateCommand;
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/UMLPropertyEditorPropertyUtil.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/UMLPropertyEditorPropertyUtil.java
index 81565102174..1f7dcba4087 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/UMLPropertyEditorPropertyUtil.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext.ui/src/org/eclipse/papyrus/property/editor/xtext/ui/contributions/UMLPropertyEditorPropertyUtil.java
@@ -44,16 +44,15 @@ public class UMLPropertyEditorPropertyUtil extends PropertyUtil {
 			buffer.append(multiplicity);
 		}
 
+		// property modifiers
+		buffer.append(" ") ;
+		buffer.append(PropertyUtil.getModifiersAsString(property, false));
+		
 		// default value
 		if(property.getDefault() != null) {
 			buffer.append(" = ");
-			buffer.append(property.getDefault());
+			buffer.append("\"" + property.getDefault() + "\"");
 		}
-
-		// property modifiers
-		buffer.append(" ") ;
-		buffer.append(PropertyUtil.getModifiersAsString(property, false));
-
 		
 		
 		return buffer.toString();
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/META-INF/MANIFEST.MF
index cbaf97e8fd0..92884421ac3 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext,
  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.7.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.papyrus.property.editor.xtext,
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore
index 586137c8d1b..d7d35f8c88b 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.ecore
@@ -13,6 +13,8 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="modifiers" eType="#//ModifiersRule"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//DefaultValueRule"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">
     <eLiterals name="public" literal="+"/>
@@ -43,6 +45,10 @@
   </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"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="subsets" eType="#//SubsetsRule"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ModifierKind">
     <eLiterals name="readOnly" literal="readOnly"/>
@@ -50,4 +56,13 @@
     <eLiterals name="ordered" value="2" literal="ordered"/>
     <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"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SubsetsRule">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="ecore:EClass ../../../../../../../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"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel
index 340eb088dc5..4669622eb27 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.genmodel
@@ -28,6 +28,7 @@
       <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>
     <genClasses ecoreClass="UmlProperty.ecore#//TypeRule">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference UmlProperty.ecore#//TypeRule/path"/>
@@ -48,6 +49,17 @@
     </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>
+    <genClasses ecoreClass="UmlProperty.ecore#//RedefinesRule">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference 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>
+    <genClasses ecoreClass="UmlProperty.ecore#//DefaultValueRule">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UmlProperty.ecore#//DefaultValueRule/default"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi
index e2f564d5005..e4f6c298222 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xmi
@@ -34,6 +34,9 @@
         <elements xsi:type="xtext:Assignment" cardinality="?" feature="modifiers" operator="=">
           <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.7"/>
         </elements>
+        <elements xsi:type="xtext:Assignment" cardinality="?" feature="default" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.12"/>
+        </elements>
       </alternatives>
     </rules>
     <rules xsi:type="xtext:EnumRule" name="VisibilityKind">
@@ -162,8 +165,16 @@
       <type metamodel="/0/@metamodelDeclarations.1">
         <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/property/editor/xtext/UmlProperty#//ModifierSpecification"/>
       </type>
-      <alternatives xsi:type="xtext:Assignment" feature="value" operator="=">
-        <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.9"/>
+      <alternatives xsi:type="xtext:Alternatives">
+        <elements xsi:type="xtext:Assignment" feature="value" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.9"/>
+        </elements>
+        <elements xsi:type="xtext:Assignment" feature="redefines" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.10"/>
+        </elements>
+        <elements xsi:type="xtext:Assignment" feature="subsets" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.11"/>
+        </elements>
       </alternatives>
     </rules>
     <rules xsi:type="xtext:EnumRule" name="ModifierKind">
@@ -189,6 +200,49 @@
         </elements>
       </alternatives>
     </rules>
+    <rules xsi:type="xtext:ParserRule" name="RedefinesRule">
+      <type metamodel="/0/@metamodelDeclarations.1">
+        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/property/editor/xtext/UmlProperty#//RedefinesRule"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <elements xsi:type="xtext:Keyword" value="redefines"/>
+        <elements xsi:type="xtext:Assignment" feature="property" operator="=">
+          <terminal xsi:type="xtext:CrossReference">
+            <type metamodel="/0/@metamodelDeclarations.0">
+              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+            </type>
+            <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>
+          </terminal>
+        </elements>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:ParserRule" name="SubsetsRule">
+      <type metamodel="/0/@metamodelDeclarations.1">
+        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/property/editor/xtext/UmlProperty#//SubsetsRule"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <elements xsi:type="xtext:Keyword" value="subsets"/>
+        <elements xsi:type="xtext:Assignment" feature="property" operator="=">
+          <terminal xsi:type="xtext:CrossReference">
+            <type metamodel="/0/@metamodelDeclarations.0">
+              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+            </type>
+            <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>
+          </terminal>
+        </elements>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:ParserRule" name="DefaultValueRule">
+      <type metamodel="/0/@metamodelDeclarations.1">
+        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/property/editor/xtext/UmlProperty#//DefaultValueRule"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <elements xsi:type="xtext:Keyword" value="="/>
+        <elements xsi:type="xtext:Assignment" feature="default" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/>
+        </elements>
+      </alternatives>
+    </rules>
   </xtext:Grammar>
   <xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
     <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parseTreeConstruction/UmlPropertyParsetreeConstructor.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parseTreeConstruction/UmlPropertyParsetreeConstructor.java
index 086afc6b823..b793864447e 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parseTreeConstruction/UmlPropertyParsetreeConstructor.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parseTreeConstruction/UmlPropertyParsetreeConstructor.java
@@ -37,7 +37,10 @@ protected class ThisRootNode extends RootToken {
 			case 3: return new MultiplicityRule_Group(this, this, 3, inst);
 			case 4: return new BoundSpecification_ValueAssignment(this, this, 4, inst);
 			case 5: return new ModifiersRule_Group(this, this, 5, inst);
-			case 6: return new ModifierSpecification_ValueAssignment(this, this, 6, inst);
+			case 6: return new ModifierSpecification_Alternatives(this, this, 6, inst);
+			case 7: return new RedefinesRule_Group(this, this, 7, inst);
+			case 8: return new SubsetsRule_Group(this, this, 8, inst);
+			case 9: return new DefaultValueRule_Group(this, this, 9, inst);
 			default: return null;
 		}	
 	}	
@@ -48,12 +51,12 @@ protected class ThisRootNode extends RootToken {
  *
  * PropertyRule:
  * 	visibility=VisibilityKind isDerived="/"? name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
- * 	modifiers=ModifiersRule?;
+ * 	modifiers=ModifiersRule? default=DefaultValueRule?;
  *
  **/
 
 // visibility=VisibilityKind isDerived="/"? name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
-// modifiers=ModifiersRule?
+// modifiers=ModifiersRule? default=DefaultValueRule?
 protected class PropertyRule_Group extends GroupToken {
 	
 	public PropertyRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -68,9 +71,10 @@ protected class PropertyRule_Group extends GroupToken {
     @Override
 	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
 		switch(index) {
-			case 0: return new PropertyRule_ModifiersAssignment_6(lastRuleCallOrigin, this, 0, inst);
-			case 1: return new PropertyRule_MultiplicityAssignment_5(lastRuleCallOrigin, this, 1, inst);
-			case 2: return new PropertyRule_Alternatives_4(lastRuleCallOrigin, this, 2, inst);
+			case 0: return new PropertyRule_DefaultAssignment_7(lastRuleCallOrigin, this, 0, inst);
+			case 1: return new PropertyRule_ModifiersAssignment_6(lastRuleCallOrigin, this, 1, inst);
+			case 2: return new PropertyRule_MultiplicityAssignment_5(lastRuleCallOrigin, this, 2, inst);
+			case 3: return new PropertyRule_Alternatives_4(lastRuleCallOrigin, this, 3, inst);
 			default: return null;
 		}	
 	}
@@ -393,6 +397,54 @@ protected class PropertyRule_ModifiersAssignment_6 extends AssignmentToken  {
 	}	
 }
 
+// default=DefaultValueRule?
+protected class PropertyRule_DefaultAssignment_7 extends AssignmentToken  {
+	
+	public PropertyRule_DefaultAssignment_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getPropertyRuleAccess().getDefaultAssignment_7();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new DefaultValueRule_Group(this, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override	
+	public IEObjectConsumer tryConsume() {
+		if((value = eObjectConsumer.getConsumable("default",false)) == null) return null;
+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("default");
+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
+			if(param.isInstanceOf(grammarAccess.getDefaultValueRuleRule().getType().getClassifier())) {
+				type = AssignmentType.PARSER_RULE_CALL;
+				element = grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_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 PropertyRule_ModifiersAssignment_6(lastRuleCallOrigin, next, actIndex, consumed);
+			case 1: return new PropertyRule_MultiplicityAssignment_5(lastRuleCallOrigin, next, actIndex, consumed);
+			case 2: return new PropertyRule_Alternatives_4(lastRuleCallOrigin, next, actIndex, consumed);
+			default: return null;
+		}	
+	}	
+}
+
 
 /************ end Rule PropertyRule ****************/
 
@@ -1002,7 +1054,7 @@ protected class ModifiersRule_ValuesAssignment_1 extends AssignmentToken  {
     @Override
 	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
 		switch(index) {
-			case 0: return new ModifierSpecification_ValueAssignment(this, this, 0, inst);
+			case 0: return new ModifierSpecification_Alternatives(this, this, 0, inst);
 			default: return null;
 		}	
 	}
@@ -1093,7 +1145,7 @@ protected class ModifiersRule_ValuesAssignment_2_1 extends AssignmentToken  {
     @Override
 	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
 		switch(index) {
-			case 0: return new ModifierSpecification_ValueAssignment(this, this, 0, inst);
+			case 0: return new ModifierSpecification_Alternatives(this, this, 0, inst);
 			default: return null;
 		}	
 	}
@@ -1155,20 +1207,51 @@ protected class ModifiersRule_RightCurlyBracketKeyword_3 extends KeywordToken  {
 /************ begin Rule ModifierSpecification ****************
  *
  * ModifierSpecification:
- * 	value=ModifierKind;
+ * 	value=ModifierKind | redefines=RedefinesRule | subsets=SubsetsRule;
  *
  **/
 
+// value=ModifierKind | redefines=RedefinesRule | subsets=SubsetsRule
+protected class ModifierSpecification_Alternatives extends AlternativesToken {
+
+	public ModifierSpecification_Alternatives(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Alternatives getGrammarElement() {
+		return grammarAccess.getModifierSpecificationAccess().getAlternatives();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new ModifierSpecification_ValueAssignment_0(lastRuleCallOrigin, this, 0, inst);
+			case 1: return new ModifierSpecification_RedefinesAssignment_1(lastRuleCallOrigin, this, 1, inst);
+			case 2: return new ModifierSpecification_SubsetsAssignment_2(lastRuleCallOrigin, this, 2, inst);
+			default: return null;
+		}	
+	}
+
+    @Override
+	public IEObjectConsumer tryConsume() {
+		if(getEObject().eClass() != grammarAccess.getModifierSpecificationRule().getType().getClassifier())
+			return null;
+		return eObjectConsumer;
+	}
+
+}
+
 // value=ModifierKind
-protected class ModifierSpecification_ValueAssignment extends AssignmentToken  {
+protected class ModifierSpecification_ValueAssignment_0 extends AssignmentToken  {
 	
-	public ModifierSpecification_ValueAssignment(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+	public ModifierSpecification_ValueAssignment_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
 		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
 	}
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.getModifierSpecificationAccess().getValueAssignment();
+		return grammarAccess.getModifierSpecificationAccess().getValueAssignment_0();
 	}
 
     @Override
@@ -1180,13 +1263,11 @@ protected class ModifierSpecification_ValueAssignment extends AssignmentToken  {
 
     @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)) { 
+		if(enumLitSerializer.isValid(obj.getEObject(), grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0(), value, null)) { 
 			type = AssignmentType.ENUM_RULE_CALL;
-			element = grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0();
+			element = grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0();
 			return obj;
 		}
 		return null;
@@ -1194,6 +1275,388 @@ protected class ModifierSpecification_ValueAssignment extends AssignmentToken  {
 
 }
 
+// redefines=RedefinesRule
+protected class ModifierSpecification_RedefinesAssignment_1 extends AssignmentToken  {
+	
+	public ModifierSpecification_RedefinesAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getModifierSpecificationAccess().getRedefinesAssignment_1();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new RedefinesRule_Group(this, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override	
+	public IEObjectConsumer tryConsume() {
+		if((value = eObjectConsumer.getConsumable("redefines",true)) == null) return null;
+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("redefines");
+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
+			if(param.isInstanceOf(grammarAccess.getRedefinesRuleRule().getType().getClassifier())) {
+				type = AssignmentType.PARSER_RULE_CALL;
+				element = grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_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) {
+			default: return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex , index, consumed);
+		}	
+	}	
+}
+
+// subsets=SubsetsRule
+protected class ModifierSpecification_SubsetsAssignment_2 extends AssignmentToken  {
+	
+	public ModifierSpecification_SubsetsAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getModifierSpecificationAccess().getSubsetsAssignment_2();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new SubsetsRule_Group(this, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override	
+	public IEObjectConsumer tryConsume() {
+		if((value = eObjectConsumer.getConsumable("subsets",true)) == null) return null;
+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("subsets");
+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
+			if(param.isInstanceOf(grammarAccess.getSubsetsRuleRule().getType().getClassifier())) {
+				type = AssignmentType.PARSER_RULE_CALL;
+				element = grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_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) {
+			default: return lastRuleCallOrigin.createFollowerAfterReturn(next, actIndex , index, consumed);
+		}	
+	}	
+}
+
+
 /************ end Rule ModifierSpecification ****************/
 
+
+/************ begin Rule RedefinesRule ****************
+ *
+ * RedefinesRule:
+ * 	"redefines" property=[uml::Property];
+ *
+ **/
+
+// "redefines" property=[uml::Property]
+protected class RedefinesRule_Group extends GroupToken {
+	
+	public RedefinesRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Group getGrammarElement() {
+		return grammarAccess.getRedefinesRuleAccess().getGroup();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new RedefinesRule_PropertyAssignment_1(lastRuleCallOrigin, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override
+	public IEObjectConsumer tryConsume() {
+		if(getEObject().eClass() != grammarAccess.getRedefinesRuleRule().getType().getClassifier())
+			return null;
+		return eObjectConsumer;
+	}
+
+}
+
+// "redefines"
+protected class RedefinesRule_RedefinesKeyword_0 extends KeywordToken  {
+	
+	public RedefinesRule_RedefinesKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Keyword getGrammarElement() {
+		return grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
+		}	
+	}
+
+}
+
+// property=[uml::Property]
+protected class RedefinesRule_PropertyAssignment_1 extends AssignmentToken  {
+	
+	public RedefinesRule_PropertyAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getRedefinesRuleAccess().getPropertyAssignment_1();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new RedefinesRule_RedefinesKeyword_0(lastRuleCallOrigin, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override	
+	public IEObjectConsumer tryConsume() {
+		if((value = eObjectConsumer.getConsumable("property",true)) == null) return null;
+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("property");
+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
+			if(param.isInstanceOf(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0().getType().getClassifier())) {
+				type = AssignmentType.CROSS_REFERENCE;
+				element = grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0(); 
+				return obj;
+			}
+		}
+		return null;
+	}
+
+}
+
+
+/************ end Rule RedefinesRule ****************/
+
+
+/************ begin Rule SubsetsRule ****************
+ *
+ * SubsetsRule:
+ * 	"subsets" property=[uml::Property];
+ *
+ **/
+
+// "subsets" property=[uml::Property]
+protected class SubsetsRule_Group extends GroupToken {
+	
+	public SubsetsRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Group getGrammarElement() {
+		return grammarAccess.getSubsetsRuleAccess().getGroup();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new SubsetsRule_PropertyAssignment_1(lastRuleCallOrigin, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override
+	public IEObjectConsumer tryConsume() {
+		if(getEObject().eClass() != grammarAccess.getSubsetsRuleRule().getType().getClassifier())
+			return null;
+		return eObjectConsumer;
+	}
+
+}
+
+// "subsets"
+protected class SubsetsRule_SubsetsKeyword_0 extends KeywordToken  {
+	
+	public SubsetsRule_SubsetsKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Keyword getGrammarElement() {
+		return grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
+		}	
+	}
+
+}
+
+// property=[uml::Property]
+protected class SubsetsRule_PropertyAssignment_1 extends AssignmentToken  {
+	
+	public SubsetsRule_PropertyAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getSubsetsRuleAccess().getPropertyAssignment_1();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new SubsetsRule_SubsetsKeyword_0(lastRuleCallOrigin, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override	
+	public IEObjectConsumer tryConsume() {
+		if((value = eObjectConsumer.getConsumable("property",true)) == null) return null;
+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("property");
+		if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
+			IEObjectConsumer param = createEObjectConsumer((EObject)value);
+			if(param.isInstanceOf(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0().getType().getClassifier())) {
+				type = AssignmentType.CROSS_REFERENCE;
+				element = grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0(); 
+				return obj;
+			}
+		}
+		return null;
+	}
+
+}
+
+
+/************ end Rule SubsetsRule ****************/
+
+
+/************ begin Rule DefaultValueRule ****************
+ *
+ * DefaultValueRule:
+ * 	"=" default=STRING;
+ *
+ **/
+
+// "=" default=STRING
+protected class DefaultValueRule_Group extends GroupToken {
+	
+	public DefaultValueRule_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Group getGrammarElement() {
+		return grammarAccess.getDefaultValueRuleAccess().getGroup();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new DefaultValueRule_DefaultAssignment_1(lastRuleCallOrigin, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override
+	public IEObjectConsumer tryConsume() {
+		if(getEObject().eClass() != grammarAccess.getDefaultValueRuleRule().getType().getClassifier())
+			return null;
+		return eObjectConsumer;
+	}
+
+}
+
+// "="
+protected class DefaultValueRule_EqualsSignKeyword_0 extends KeywordToken  {
+	
+	public DefaultValueRule_EqualsSignKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Keyword getGrammarElement() {
+		return grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			default: return lastRuleCallOrigin.createFollowerAfterReturn(this, index, index, inst);
+		}	
+	}
+
+}
+
+// default=STRING
+protected class DefaultValueRule_DefaultAssignment_1 extends AssignmentToken  {
+	
+	public DefaultValueRule_DefaultAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getDefaultValueRuleAccess().getDefaultAssignment_1();
+	}
+
+    @Override
+	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
+		switch(index) {
+			case 0: return new DefaultValueRule_EqualsSignKeyword_0(lastRuleCallOrigin, this, 0, inst);
+			default: return null;
+		}	
+	}
+
+    @Override	
+	public IEObjectConsumer tryConsume() {
+		if((value = eObjectConsumer.getConsumable("default",true)) == null) return null;
+		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("default");
+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0(), value, null)) {
+			type = AssignmentType.TERMINAL_RULE_CALL;
+			element = grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0();
+			return obj;
+		}
+		return null;
+	}
+
+}
+
+
+/************ end Rule DefaultValueRule ****************/
+
 }
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g
index 9bc244e47a5..e8fe8ea026e 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g
@@ -240,6 +240,30 @@ rulePropertyRule returns [EObject current=null]
 	    }
 
 )
+)?(
+(
+		{ 
+	        currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0(), currentNode); 
+	    }
+		lv_default_8_0=ruleDefaultValueRule		{
+	        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);
+	        }
+	        currentNode = currentNode.getParent();
+	    }
+
+)
 )?)
 ;
 
@@ -602,10 +626,10 @@ ruleModifierSpecification returns [EObject current=null]
     @after { resetLookahead(); 
     	lastConsumedNode = currentNode;
     }:
-(
+((
 (
 		{ 
-	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0(), currentNode); 
 	    }
 		lv_value_0_0=ruleModifierKind		{
 	        if ($current==null) {
@@ -627,6 +651,189 @@ ruleModifierSpecification returns [EObject current=null]
 
 )
 )
+    |(
+(
+		{ 
+	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0(), currentNode); 
+	    }
+		lv_redefines_1_0=ruleRedefinesRule		{
+	        if ($current==null) {
+	            $current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode.getParent(), $current);
+	        }
+	        try {
+	       		set(
+	       			$current, 
+	       			"redefines",
+	        		lv_redefines_1_0, 
+	        		"RedefinesRule", 
+	        		currentNode);
+	        } catch (ValueConverterException vce) {
+				handleValueConverterException(vce);
+	        }
+	        currentNode = currentNode.getParent();
+	    }
+
+)
+)
+    |(
+(
+		{ 
+	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0(), currentNode); 
+	    }
+		lv_subsets_2_0=ruleSubsetsRule		{
+	        if ($current==null) {
+	            $current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode.getParent(), $current);
+	        }
+	        try {
+	       		set(
+	       			$current, 
+	       			"subsets",
+	        		lv_subsets_2_0, 
+	        		"SubsetsRule", 
+	        		currentNode);
+	        } catch (ValueConverterException vce) {
+				handleValueConverterException(vce);
+	        }
+	        currentNode = currentNode.getParent();
+	    }
+
+)
+))
+;
+
+
+
+
+
+// Entry rule entryRuleRedefinesRule
+entryRuleRedefinesRule returns [EObject current=null] 
+	:
+	{ currentNode = createCompositeNode(grammarAccess.getRedefinesRuleRule(), currentNode); }
+	 iv_ruleRedefinesRule=ruleRedefinesRule 
+	 { $current=$iv_ruleRedefinesRule.current; } 
+	 EOF 
+;
+
+// Rule RedefinesRule
+ruleRedefinesRule returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+    }
+    @after { resetLookahead(); 
+    	lastConsumedNode = currentNode;
+    }:
+(	'redefines' 
+    {
+        createLeafNode(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0(), null); 
+    }
+(
+(
+		{
+			if ($current==null) {
+	            $current = factory.create(grammarAccess.getRedefinesRuleRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+        }
+	RULE_ID
+	{
+		createLeafNode(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
+	}
+
+)
+))
+;
+
+
+
+
+
+// Entry rule entryRuleSubsetsRule
+entryRuleSubsetsRule returns [EObject current=null] 
+	:
+	{ currentNode = createCompositeNode(grammarAccess.getSubsetsRuleRule(), currentNode); }
+	 iv_ruleSubsetsRule=ruleSubsetsRule 
+	 { $current=$iv_ruleSubsetsRule.current; } 
+	 EOF 
+;
+
+// Rule SubsetsRule
+ruleSubsetsRule returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+    }
+    @after { resetLookahead(); 
+    	lastConsumedNode = currentNode;
+    }:
+(	'subsets' 
+    {
+        createLeafNode(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0(), null); 
+    }
+(
+(
+		{
+			if ($current==null) {
+	            $current = factory.create(grammarAccess.getSubsetsRuleRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+        }
+	RULE_ID
+	{
+		createLeafNode(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
+	}
+
+)
+))
+;
+
+
+
+
+
+// Entry rule entryRuleDefaultValueRule
+entryRuleDefaultValueRule returns [EObject current=null] 
+	:
+	{ currentNode = createCompositeNode(grammarAccess.getDefaultValueRuleRule(), currentNode); }
+	 iv_ruleDefaultValueRule=ruleDefaultValueRule 
+	 { $current=$iv_ruleDefaultValueRule.current; } 
+	 EOF 
+;
+
+// Rule DefaultValueRule
+ruleDefaultValueRule returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+    }
+    @after { resetLookahead(); 
+    	lastConsumedNode = currentNode;
+    }:
+(	'=' 
+    {
+        createLeafNode(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0(), null); 
+    }
+(
+(
+		lv_default_1_0=RULE_STRING
+		{
+			createLeafNode(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0(), "default"); 
+		}
+		{
+	        if ($current==null) {
+	            $current = factory.create(grammarAccess.getDefaultValueRuleRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        try {
+	       		set(
+	       			$current, 
+	       			"default",
+	        		lv_default_1_0, 
+	        		"STRING", 
+	        		lastConsumedNode);
+	        } catch (ValueConverterException vce) {
+				handleValueConverterException(vce);
+	        }
+	    }
+
+)
+))
 ;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens
index b229c38ba09..73dfb622a9a 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.tokens
@@ -1,26 +1,29 @@
 RULE_ID=4
-RULE_STRING=7
+RULE_STRING=6
 RULE_UNLIMITEDLITERAL=5
 RULE_ANY_OTHER=11
-RULE_INT=6
+RULE_INT=7
 RULE_WS=10
 RULE_SL_COMMENT=9
 RULE_ML_COMMENT=8
 '..'=17
-'ordered'=28
+'ordered'=31
+'#'=27
 '}'=21
-'#'=24
-'~'=25
+'~'=28
 '/'=12
-'unique'=29
-'readOnly'=26
+'redefines'=22
+'unique'=32
+'readOnly'=29
 '{'=19
+'subsets'=23
+'='=24
 ':'=13
+'-'=26
 '<Undefined>'=14
 '::'=15
 '['=16
-'-'=23
-'+'=22
+'+'=25
 ','=20
-'union'=27
+'union'=30
 ']'=18
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java
index d4e18c6ba57..7b584083e8b 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyLexer.java
@@ -20,7 +20,7 @@ public class InternalUmlPropertyLexer extends Lexer {
     public static final int T27=27;
     public static final int T26=26;
     public static final int T25=25;
-    public static final int Tokens=30;
+    public static final int Tokens=33;
     public static final int T24=24;
     public static final int EOF=-1;
     public static final int RULE_SL_COMMENT=9;
@@ -29,8 +29,8 @@ public class InternalUmlPropertyLexer extends Lexer {
     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 RULE_STRING=6;
+    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;
@@ -39,7 +39,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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;
     public InternalUmlPropertyLexer() {;} 
     public InternalUmlPropertyLexer(CharStream input) {
         super(input);
@@ -233,10 +236,11 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT22() 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: ( '+' )
-            // ../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:5: ( 'redefines' )
+            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:20:7: 'redefines'
             {
-            match('+'); 
+            match("redefines"); 
+
 
             }
 
@@ -251,10 +255,11 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT23() 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: ( '-' )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:21:7: '-'
+            // ../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'
             {
-            match('-'); 
+            match("subsets"); 
+
 
             }
 
@@ -269,10 +274,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT24() 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: '#'
+            // ../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: '='
             {
-            match('#'); 
+            match('='); 
 
             }
 
@@ -287,10 +292,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT25() 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: '~'
+            // ../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: '+'
             {
-            match('~'); 
+            match('+'); 
 
             }
 
@@ -305,11 +310,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT26() 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: ( 'readOnly' )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:24:7: 'readOnly'
+            // ../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: '-'
             {
-            match("readOnly"); 
-
+            match('-'); 
 
             }
 
@@ -324,11 +328,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT27() 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: ( 'union' )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:25:7: 'union'
+            // ../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: '#'
             {
-            match("union"); 
-
+            match('#'); 
 
             }
 
@@ -343,11 +346,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT28() 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: ( 'ordered' )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:26:7: 'ordered'
+            // ../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: '~'
             {
-            match("ordered"); 
-
+            match('~'); 
 
             }
 
@@ -362,10 +364,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     public final void mT29() 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: ( 'unique' )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:27:7: 'unique'
+            // ../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'
             {
-            match("unique"); 
+            match("readOnly"); 
 
 
             }
@@ -377,14 +379,71 @@ public class InternalUmlPropertyLexer extends Lexer {
     }
     // $ANTLR end T29
 
+    // $ANTLR start T30
+    public final void mT30() 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'
+            {
+            match("union"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T30
+
+    // $ANTLR start T31
+    public final void mT31() 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'
+            {
+            match("ordered"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T31
+
+    // $ANTLR start T32
+    public final void mT32() 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'
+            {
+            match("unique"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T32
+
     // $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:702:23: ( ( '0' .. '9' ( '0' .. '9' )* | '*' ) )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:702: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: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' )* | '*' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:702: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' )* | '*' )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -396,16 +455,16 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("702:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 2, 0, input);
+                    new NoViableAltException("909:25: ( '0' .. '9' ( '0' .. '9' )* | '*' )", 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:702:26: '0' .. '9' ( '0' .. '9' )*
+                    // ../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' )*
                     {
                     matchRange('0','9'); 
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:702:35: ( '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' )*
                     loop1:
                     do {
                         int alt1=2;
@@ -418,7 +477,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                         switch (alt1) {
                     	case 1 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:702:36: '0' .. '9'
+                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:36: '0' .. '9'
                     	    {
                     	    matchRange('0','9'); 
 
@@ -434,7 +493,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:702:47: '*'
+                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:909:47: '*'
                     {
                     match('*'); 
 
@@ -457,10 +516,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:704: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:704: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: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' )*
             {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:704:11: ( '^' )?
+            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -469,7 +528,7 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:704:11: '^'
+                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:911:11: '^'
                     {
                     match('^'); 
 
@@ -488,7 +547,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                 recover(mse);    throw mse;
             }
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:704: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:911:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -536,10 +595,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:706:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:706:12: ( '0' .. '9' )+
+            // ../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' )+
             {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:706: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' )+
             int cnt5=0;
             loop5:
             do {
@@ -553,7 +612,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:706:13: '0' .. '9'
+            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:913:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -583,10 +642,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:708: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:708: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: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' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708: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:915:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -598,16 +657,16 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("708:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 8, 0, input);
+                    new NoViableAltException("915:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 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:708: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:915:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708: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:915:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -623,7 +682,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708: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:915: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' ) {
@@ -640,7 +699,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708:62: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:62: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -666,10 +725,10 @@ public class InternalUmlPropertyLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708: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:915:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708: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:915:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -685,7 +744,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708: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:915: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' ) {
@@ -702,7 +761,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:708:129: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:915:129: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -744,12 +803,12 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:710:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:710:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../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; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:710:24: ( options {greedy=false; } : . )*
+            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:917:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -774,7 +833,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:710:52: .
+            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:917:52: .
             	    {
             	    matchAny(); 
 
@@ -802,12 +861,12 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:712:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../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' )?
             {
             match("//"); 
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -820,7 +879,7 @@ public class InternalUmlPropertyLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919: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();
@@ -841,7 +900,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:40: ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -850,9 +909,9 @@ public class InternalUmlPropertyLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712: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' )? '\\n'
                     {
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:41: ( '\\r' )?
+                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -861,7 +920,7 @@ public class InternalUmlPropertyLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:712:41: '\\r'
+                            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:919:41: '\\r'
                             {
                             match('\r'); 
 
@@ -891,10 +950,10 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:714:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:714:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../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' )+
             {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:714: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' )+
             int cnt13=0;
             loop13:
             do {
@@ -947,8 +1006,8 @@ public class InternalUmlPropertyLexer extends Lexer {
     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:716:16: ( . )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:716:18: .
+            // ../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: .
             {
             matchAny(); 
 
@@ -962,8 +1021,8 @@ public class InternalUmlPropertyLexer extends Lexer {
     // $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 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt14=26;
+        // ../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 )
+        int alt14=29;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
@@ -1093,56 +1152,77 @@ public class InternalUmlPropertyLexer extends Lexer {
                 }
                 break;
             case 19 :
-                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:82: RULE_UNLIMITEDLITERAL
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:82: T30
                 {
-                mRULE_UNLIMITEDLITERAL(); 
+                mT30(); 
 
                 }
                 break;
             case 20 :
-                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:104: RULE_ID
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:86: T31
                 {
-                mRULE_ID(); 
+                mT31(); 
 
                 }
                 break;
             case 21 :
-                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:112: RULE_INT
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:90: T32
                 {
-                mRULE_INT(); 
+                mT32(); 
 
                 }
                 break;
             case 22 :
-                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:121: RULE_STRING
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:94: RULE_UNLIMITEDLITERAL
                 {
-                mRULE_STRING(); 
+                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:133: RULE_ML_COMMENT
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:116: RULE_ID
                 {
-                mRULE_ML_COMMENT(); 
+                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:149: RULE_SL_COMMENT
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:124: RULE_INT
                 {
-                mRULE_SL_COMMENT(); 
+                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:165: RULE_WS
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:133: RULE_STRING
                 {
-                mRULE_WS(); 
+                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:173: RULE_ANY_OTHER
+                // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:1:145: 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
+                {
+                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
+                {
+                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
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1156,58 +1236,63 @@ public class InternalUmlPropertyLexer extends Lexer {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\33\1\35\1\30\1\uffff\1\30\10\uffff\3\52\1\56\1\uffff"+
-        "\1\30\1\uffff\2\30\22\uffff\1\52\1\uffff\2\52\1\56\3\uffff\10\52"+
-        "\1\75\3\52\1\uffff\1\101\2\52\1\uffff\1\104\1\105\2\uffff";
+        "\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"+
+        "\123\1\uffff\1\124\1\50\1\126\2\uffff\1\127\2\uffff";
     static final String DFA14_eofS =
-        "\106\uffff";
+        "\130\uffff";
     static final String DFA14_minS =
-        "\1\0\1\52\1\72\1\125\1\uffff\1\56\10\uffff\1\145\1\156\1\162\1\60"+
-        "\1\uffff\1\101\1\uffff\2\0\22\uffff\1\141\1\uffff\1\151\1\144\1"+
-        "\60\3\uffff\1\144\1\157\1\145\1\117\1\156\1\165\1\162\1\156\1\60"+
-        "\2\145\1\154\1\uffff\1\60\1\144\1\171\1\uffff\2\60\2\uffff";
+        "\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";
     static final String DFA14_maxS =
-        "\1\ufffe\1\57\1\72\1\125\1\uffff\1\56\10\uffff\1\145\1\156\1\162"+
-        "\1\71\1\uffff\1\172\1\uffff\2\ufffe\22\uffff\1\141\1\uffff\1\151"+
-        "\1\144\1\71\3\uffff\1\144\1\161\1\145\1\117\1\156\1\165\1\162\1"+
-        "\156\1\172\2\145\1\154\1\uffff\1\172\1\144\1\171\1\uffff\2\172\2"+
-        "\uffff";
+        "\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"+
+        "\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";
     static final String DFA14_acceptS =
-        "\4\uffff\1\5\1\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\4\uffff"+
-        "\1\23\1\uffff\1\24\2\uffff\1\31\1\32\1\27\1\30\1\1\1\4\1\2\1\3\1"+
-        "\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\uffff\1\24\3\uffff"+
-        "\1\23\1\26\1\31\14\uffff\1\20\3\uffff\1\22\2\uffff\1\21\1\17";
+        "\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";
     static final String DFA14_specialS =
-        "\106\uffff}>";
+        "\130\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\30\2\27\2\30\1\27\22\30\1\27\1\30\1\25\1\14\3\30\1\26\2"+
-            "\30\1\22\1\12\1\10\1\13\1\5\1\1\12\21\1\2\1\30\1\3\4\30\32\24"+
-            "\1\4\1\30\1\6\1\23\1\24\1\30\16\24\1\20\2\24\1\16\2\24\1\17"+
-            "\5\24\1\7\1\30\1\11\1\15\uff80\30",
-            "\1\31\4\uffff\1\32",
-            "\1\34",
+            "\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\33\4\uffff\1\34",
             "\1\36",
-            "",
             "\1\40",
             "",
+            "\1\42",
             "",
             "",
             "",
             "",
+            "\1\47",
+            "\1\51",
             "",
             "",
             "",
-            "\1\51",
-            "\1\53",
-            "\1\54",
-            "\12\55",
             "",
-            "\32\52\4\uffff\1\52\1\uffff\32\52",
             "",
-            "\uffff\57",
-            "\uffff\57",
+            "\1\57",
+            "\1\60",
+            "\12\62",
             "",
+            "\32\50\4\uffff\1\50\1\uffff\32\50",
             "",
+            "\uffff\63",
+            "\uffff\63",
             "",
             "",
             "",
@@ -1222,35 +1307,53 @@ public class InternalUmlPropertyLexer extends Lexer {
             "",
             "",
             "",
+            "\1\66\2\uffff\1\65",
             "",
+            "\1\67",
             "",
-            "\1\61",
             "",
-            "\1\62",
-            "\1\63",
-            "\12\55",
             "",
             "",
             "",
-            "\1\64",
-            "\1\65\1\uffff\1\66",
-            "\1\67",
             "\1\70",
             "\1\71",
+            "",
+            "\12\62",
+            "",
+            "",
             "\1\72",
             "\1\73",
             "\1\74",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
-            "\1\76",
+            "\1\76\1\uffff\1\75",
             "\1\77",
             "\1\100",
-            "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
+            "\1\101",
             "\1\102",
             "\1\103",
+            "\1\104",
+            "\1\105",
+            "\1\106",
+            "\1\107",
+            "\1\110",
+            "\1\111",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\113",
+            "\1\114",
+            "\1\115",
+            "\1\116",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "",
+            "\1\120",
+            "\1\121",
+            "\1\122",
+            "\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\125",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52",
+            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
             "",
             ""
     };
@@ -1285,7 +1388,7 @@ public class InternalUmlPropertyLexer extends Lexer {
             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 | RULE_UNLIMITEDLITERAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            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 );";
         }
     }
  
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java
index 1414ad19636..28389813aaa 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlPropertyParser.java
@@ -25,13 +25,13 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalUmlPropertyParser 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>'", "'::'", "'['", "'..'", "']'", "'{'", "','", "'}'", "'+'", "'-'", "'#'", "'~'", "'readOnly'", "'union'", "'ordered'", "'unique'"
+        "<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=7;
+    public static final int RULE_STRING=6;
     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_INT=7;
     public static final int RULE_WS=10;
     public static final int RULE_SL_COMMENT=9;
     public static final int EOF=-1;
@@ -110,7 +110,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $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 ) )? ) ;
+    // ../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 ) )? ) ;
     public final EObject rulePropertyRule() throws RecognitionException {
         EObject current = null;
 
@@ -124,15 +124,17 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
         EObject lv_modifiers_7_0 = null;
 
+        EObject lv_default_8_0 = null;
+
 
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         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 ) )? ) )
-            // ../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 ) )? )
+            // ../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: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 ) )? )
-            // ../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 ) )?
+            // ../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: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 )
@@ -413,6 +415,53 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
+            // ../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 ) )?
+            int alt5=2;
+            int LA5_0 = input.LA(1);
+
+            if ( (LA5_0==24) ) {
+                alt5=1;
+            }
+            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: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
+                    {
+                     
+                    	        currentNode=createCompositeNode(grammarAccess.getPropertyRuleAccess().getDefaultDefaultValueRuleParserRuleCall_7_0(), currentNode); 
+                    	    
+                    pushFollow(FOLLOW_ruleDefaultValueRule_in_rulePropertyRule299);
+                    lv_default_8_0=ruleDefaultValueRule();
+                    _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);
+                    	        }
+                    	        currentNode = currentNode.getParent();
+                    	    
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+
 
             }
 
@@ -436,7 +485,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start entryRuleTypeRule
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:251:1: entryRuleTypeRule returns [EObject current=null] : iv_ruleTypeRule= ruleTypeRule EOF ;
+    // ../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 ;
     public final EObject entryRuleTypeRule() throws RecognitionException {
         EObject current = null;
 
@@ -444,16 +493,16 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:252:2: (iv_ruleTypeRule= ruleTypeRule EOF )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:253:2: iv_ruleTypeRule= ruleTypeRule EOF
+            // ../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
             {
              currentNode = createCompositeNode(grammarAccess.getTypeRuleRule(), currentNode); 
-            pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule314);
+            pushFollow(FOLLOW_ruleTypeRule_in_entryRuleTypeRule336);
             iv_ruleTypeRule=ruleTypeRule();
             _fsp--;
 
              current =iv_ruleTypeRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule324); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRule346); 
 
             }
 
@@ -471,7 +520,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleTypeRule
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:260:1: ruleTypeRule returns [EObject current=null] : ( ( (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:284:1: ruleTypeRule returns [EObject current=null] : ( ( (lv_path_0_0= ruleQualifiedName ) )? ( ( RULE_ID ) ) ) ;
     public final EObject ruleTypeRule() throws RecognitionException {
         EObject current = null;
 
@@ -481,34 +530,34 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:265: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:266: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: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:266: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:266: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: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:266:2: ( (lv_path_0_0= ruleQualifiedName ) )?
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // ../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 ) )?
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA5_0==RULE_ID) ) {
-                int LA5_1 = input.LA(2);
+            if ( (LA6_0==RULE_ID) ) {
+                int LA6_1 = input.LA(2);
 
-                if ( (LA5_1==15) ) {
-                    alt5=1;
+                if ( (LA6_1==15) ) {
+                    alt6=1;
                 }
             }
-            switch (alt5) {
+            switch (alt6) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:267: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:267: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:268: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: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
                     {
                      
                     	        currentNode=createCompositeNode(grammarAccess.getTypeRuleAccess().getPathQualifiedNameParserRuleCall_0_0(), currentNode); 
                     	    
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule370);
+                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleTypeRule392);
                     lv_path_0_0=ruleQualifiedName();
                     _fsp--;
 
@@ -538,11 +587,11 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:290:3: ( ( RULE_ID ) )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:291:1: ( RULE_ID )
+            // ../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:291:1: ( RULE_ID )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:292: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:316:3: RULE_ID
             {
 
             			if (current==null) {
@@ -550,7 +599,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRule389); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRule411); 
 
             		createLeafNode(grammarAccess.getTypeRuleAccess().getTypeClassifierCrossReference_1_0(), "type"); 
             	
@@ -583,7 +632,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start entryRuleQualifiedName
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:312:1: entryRuleQualifiedName returns [EObject current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // ../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 ;
     public final EObject entryRuleQualifiedName() throws RecognitionException {
         EObject current = null;
 
@@ -591,16 +640,16 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:313:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:314:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // ../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
             {
              currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); 
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName425);
+            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName447);
             iv_ruleQualifiedName=ruleQualifiedName();
             _fsp--;
 
              current =iv_ruleQualifiedName; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName435); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName457); 
 
             }
 
@@ -618,7 +667,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleQualifiedName
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:321:1: ruleQualifiedName returns [EObject current=null] : ( ( ( 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:345:1: ruleQualifiedName returns [EObject current=null] : ( ( ( RULE_ID ) ) '::' ( (lv_remaining_2_0= ruleQualifiedName ) )? ) ;
     public final EObject ruleQualifiedName() throws RecognitionException {
         EObject current = null;
 
@@ -628,17 +677,17 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:326: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:327: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: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:327: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:327: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: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:327:2: ( ( RULE_ID ) )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:328:1: ( RULE_ID )
+            // ../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:328:1: ( RULE_ID )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:329:3: 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
             {
 
             			if (current==null) {
@@ -646,7 +695,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName478); 
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName500); 
 
             		createLeafNode(grammarAccess.getQualifiedNameAccess().getPathNamespaceCrossReference_0_0(), "path"); 
             	
@@ -656,32 +705,32 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
-            match(input,15,FOLLOW_15_in_ruleQualifiedName488); 
+            match(input,15,FOLLOW_15_in_ruleQualifiedName510); 
 
                     createLeafNode(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1(), null); 
                 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:345:1: ( (lv_remaining_2_0= ruleQualifiedName ) )?
-            int alt6=2;
-            int LA6_0 = input.LA(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 ) )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA6_0==RULE_ID) ) {
-                int LA6_1 = input.LA(2);
+            if ( (LA7_0==RULE_ID) ) {
+                int LA7_1 = input.LA(2);
 
-                if ( (LA6_1==15) ) {
-                    alt6=1;
+                if ( (LA7_1==15) ) {
+                    alt7=1;
                 }
             }
-            switch (alt6) {
+            switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:346: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:346: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:347: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: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
                     {
                      
                     	        currentNode=createCompositeNode(grammarAccess.getQualifiedNameAccess().getRemainingQualifiedNameParserRuleCall_2_0(), currentNode); 
                     	    
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName509);
+                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedName531);
                     lv_remaining_2_0=ruleQualifiedName();
                     _fsp--;
 
@@ -734,7 +783,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start entryRuleMultiplicityRule
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:377:1: entryRuleMultiplicityRule returns [EObject current=null] : iv_ruleMultiplicityRule= ruleMultiplicityRule EOF ;
+    // ../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 ;
     public final EObject entryRuleMultiplicityRule() throws RecognitionException {
         EObject current = null;
 
@@ -742,16 +791,16 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:378:2: (iv_ruleMultiplicityRule= ruleMultiplicityRule EOF )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:379:2: iv_ruleMultiplicityRule= ruleMultiplicityRule EOF
+            // ../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
             {
              currentNode = createCompositeNode(grammarAccess.getMultiplicityRuleRule(), currentNode); 
-            pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule546);
+            pushFollow(FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule568);
             iv_ruleMultiplicityRule=ruleMultiplicityRule();
             _fsp--;
 
              current =iv_ruleMultiplicityRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule556); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicityRule578); 
 
             }
 
@@ -769,7 +818,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleMultiplicityRule
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:386:1: ruleMultiplicityRule returns [EObject current=null] : ( '[' ( (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:410: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;
 
@@ -781,26 +830,26 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:391: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:392: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: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:392: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:392: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: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 ) ) )? ']'
             {
-            match(input,16,FOLLOW_16_in_ruleMultiplicityRule591); 
+            match(input,16,FOLLOW_16_in_ruleMultiplicityRule613); 
 
                     createLeafNode(grammarAccess.getMultiplicityRuleAccess().getLeftSquareBracketKeyword_0(), null); 
                 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:396: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:397: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: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:397: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:398: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: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
             {
              
             	        currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_1_0(), currentNode); 
             	    
-            pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule612);
+            pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule634);
             lv_bounds_1_0=ruleBoundSpecification();
             _fsp--;
 
@@ -827,31 +876,31 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:420:2: ( '..' ( (lv_bounds_3_0= ruleBoundSpecification ) ) )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
+            // ../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 ) ) )?
+            int alt8=2;
+            int LA8_0 = input.LA(1);
 
-            if ( (LA7_0==17) ) {
-                alt7=1;
+            if ( (LA8_0==17) ) {
+                alt8=1;
             }
-            switch (alt7) {
+            switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:420: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:444:4: '..' ( (lv_bounds_3_0= ruleBoundSpecification ) )
                     {
-                    match(input,17,FOLLOW_17_in_ruleMultiplicityRule623); 
+                    match(input,17,FOLLOW_17_in_ruleMultiplicityRule645); 
 
                             createLeafNode(grammarAccess.getMultiplicityRuleAccess().getFullStopFullStopKeyword_2_0(), null); 
                         
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:424: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:425: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: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:425: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:426: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: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
                     {
                      
                     	        currentNode=createCompositeNode(grammarAccess.getMultiplicityRuleAccess().getBoundsBoundSpecificationParserRuleCall_2_1_0(), currentNode); 
                     	    
-                    pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule644);
+                    pushFollow(FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule666);
                     lv_bounds_3_0=ruleBoundSpecification();
                     _fsp--;
 
@@ -884,7 +933,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
-            match(input,18,FOLLOW_18_in_ruleMultiplicityRule656); 
+            match(input,18,FOLLOW_18_in_ruleMultiplicityRule678); 
 
                     createLeafNode(grammarAccess.getMultiplicityRuleAccess().getRightSquareBracketKeyword_3(), null); 
                 
@@ -911,7 +960,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start entryRuleBoundSpecification
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:460:1: entryRuleBoundSpecification returns [EObject current=null] : iv_ruleBoundSpecification= ruleBoundSpecification EOF ;
+    // ../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 ;
     public final EObject entryRuleBoundSpecification() throws RecognitionException {
         EObject current = null;
 
@@ -919,16 +968,16 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:461:2: (iv_ruleBoundSpecification= ruleBoundSpecification EOF )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:462:2: iv_ruleBoundSpecification= ruleBoundSpecification EOF
+            // ../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
             {
              currentNode = createCompositeNode(grammarAccess.getBoundSpecificationRule(), currentNode); 
-            pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification692);
+            pushFollow(FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification714);
             iv_ruleBoundSpecification=ruleBoundSpecification();
             _fsp--;
 
              current =iv_ruleBoundSpecification; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification702); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleBoundSpecification724); 
 
             }
 
@@ -946,7 +995,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleBoundSpecification
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:469:1: ruleBoundSpecification returns [EObject current=null] : ( (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:493:1: ruleBoundSpecification returns [EObject current=null] : ( (lv_value_0_0= RULE_UNLIMITEDLITERAL ) ) ;
     public final EObject ruleBoundSpecification() throws RecognitionException {
         EObject current = null;
 
@@ -955,17 +1004,17 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:474: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:475: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: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:475: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:476: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:476: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:477: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: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
             {
             lv_value_0_0=(Token)input.LT(1);
-            match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification743); 
+            match(input,RULE_UNLIMITEDLITERAL,FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification765); 
 
             			createLeafNode(grammarAccess.getBoundSpecificationAccess().getValueUnlimitedLiteralTerminalRuleCall_0(), "value"); 
             		
@@ -1011,7 +1060,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start entryRuleModifiersRule
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:507:1: entryRuleModifiersRule returns [EObject current=null] : iv_ruleModifiersRule= ruleModifiersRule EOF ;
+    // ../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 ;
     public final EObject entryRuleModifiersRule() throws RecognitionException {
         EObject current = null;
 
@@ -1019,16 +1068,16 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:508:2: (iv_ruleModifiersRule= ruleModifiersRule EOF )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:509:2: iv_ruleModifiersRule= ruleModifiersRule EOF
+            // ../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
             {
              currentNode = createCompositeNode(grammarAccess.getModifiersRuleRule(), currentNode); 
-            pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule783);
+            pushFollow(FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule805);
             iv_ruleModifiersRule=ruleModifiersRule();
             _fsp--;
 
              current =iv_ruleModifiersRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule793); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleModifiersRule815); 
 
             }
 
@@ -1046,7 +1095,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleModifiersRule
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:516:1: ruleModifiersRule returns [EObject current=null] : ( '{' ( (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:540: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;
 
@@ -1058,26 +1107,26 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:521: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:522: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: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:522: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:522: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: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 ) ) )* '}'
             {
-            match(input,19,FOLLOW_19_in_ruleModifiersRule828); 
+            match(input,19,FOLLOW_19_in_ruleModifiersRule850); 
 
                     createLeafNode(grammarAccess.getModifiersRuleAccess().getLeftCurlyBracketKeyword_0(), null); 
                 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:526: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:527: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: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:527: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:528: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: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
             {
              
             	        currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_1_0(), currentNode); 
             	    
-            pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule849);
+            pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule871);
             lv_values_1_0=ruleModifierSpecification();
             _fsp--;
 
@@ -1104,35 +1153,35 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:550:2: ( ',' ( (lv_values_3_0= ruleModifierSpecification ) ) )*
-            loop8:
+            // ../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 ) ) )*
+            loop9:
             do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
+                int alt9=2;
+                int LA9_0 = input.LA(1);
 
-                if ( (LA8_0==20) ) {
-                    alt8=1;
+                if ( (LA9_0==20) ) {
+                    alt9=1;
                 }
 
 
-                switch (alt8) {
+                switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:550: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:574:4: ',' ( (lv_values_3_0= ruleModifierSpecification ) )
             	    {
-            	    match(input,20,FOLLOW_20_in_ruleModifiersRule860); 
+            	    match(input,20,FOLLOW_20_in_ruleModifiersRule882); 
 
             	            createLeafNode(grammarAccess.getModifiersRuleAccess().getCommaKeyword_2_0(), null); 
             	        
-            	    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:554: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:555: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: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:555: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:556: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: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
             	    {
             	     
             	    	        currentNode=createCompositeNode(grammarAccess.getModifiersRuleAccess().getValuesModifierSpecificationParserRuleCall_2_1_0(), currentNode); 
             	    	    
-            	    pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule881);
+            	    pushFollow(FOLLOW_ruleModifierSpecification_in_ruleModifiersRule903);
             	    lv_values_3_0=ruleModifierSpecification();
             	    _fsp--;
 
@@ -1164,11 +1213,11 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop8;
+            	    break loop9;
                 }
             } while (true);
 
-            match(input,21,FOLLOW_21_in_ruleModifiersRule893); 
+            match(input,21,FOLLOW_21_in_ruleModifiersRule915); 
 
                     createLeafNode(grammarAccess.getModifiersRuleAccess().getRightCurlyBracketKeyword_3(), null); 
                 
@@ -1195,7 +1244,7 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start entryRuleModifierSpecification
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:590:1: entryRuleModifierSpecification returns [EObject current=null] : iv_ruleModifierSpecification= ruleModifierSpecification EOF ;
+    // ../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 ;
     public final EObject entryRuleModifierSpecification() throws RecognitionException {
         EObject current = null;
 
@@ -1203,16 +1252,16 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:591:2: (iv_ruleModifierSpecification= ruleModifierSpecification EOF )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:592:2: iv_ruleModifierSpecification= ruleModifierSpecification EOF
+            // ../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
             {
              currentNode = createCompositeNode(grammarAccess.getModifierSpecificationRule(), currentNode); 
-            pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification929);
+            pushFollow(FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification951);
             iv_ruleModifierSpecification=ruleModifierSpecification();
             _fsp--;
 
              current =iv_ruleModifierSpecification; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification939); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleModifierSpecification961); 
 
             }
 
@@ -1230,48 +1279,475 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleModifierSpecification
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:599:1: ruleModifierSpecification returns [EObject current=null] : ( (lv_value_0_0= ruleModifierKind ) ) ;
+    // ../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 ) ) ) ;
     public final EObject ruleModifierSpecification() throws RecognitionException {
         EObject current = null;
 
         Enumerator lv_value_0_0 = null;
 
+        EObject lv_redefines_1_0 = null;
+
+        EObject lv_subsets_2_0 = null;
+
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+            
+        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:629: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:
+            case 30:
+            case 31:
+            case 32:
+                {
+                alt10=1;
+                }
+                break;
+            case 22:
+                {
+                alt10=2;
+                }
+                break;
+            case 23:
+                {
+                alt10=3;
+                }
+                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);
+
+                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: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: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
+                    {
+                     
+                    	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0_0(), currentNode); 
+                    	    
+                    pushFollow(FOLLOW_ruleModifierKind_in_ruleModifierSpecification1007);
+                    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();
+                    	    
+
+                    }
+
+
+                    }
+
+
+                    }
+                    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: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: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
+                    {
+                     
+                    	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getRedefinesRedefinesRuleParserRuleCall_1_0(), currentNode); 
+                    	    
+                    pushFollow(FOLLOW_ruleRedefinesRule_in_ruleModifierSpecification1034);
+                    lv_redefines_1_0=ruleRedefinesRule();
+                    _fsp--;
+
+
+                    	        if (current==null) {
+                    	            current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
+                    	            associateNodeWithAstElement(currentNode.getParent(), current);
+                    	        }
+                    	        try {
+                    	       		set(
+                    	       			current, 
+                    	       			"redefines",
+                    	        		lv_redefines_1_0, 
+                    	        		"RedefinesRule", 
+                    	        		currentNode);
+                    	        } catch (ValueConverterException vce) {
+                    				handleValueConverterException(vce);
+                    	        }
+                    	        currentNode = currentNode.getParent();
+                    	    
+
+                    }
+
+
+                    }
+
+
+                    }
+                    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: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: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
+                    {
+                     
+                    	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getSubsetsSubsetsRuleParserRuleCall_2_0(), currentNode); 
+                    	    
+                    pushFollow(FOLLOW_ruleSubsetsRule_in_ruleModifierSpecification1061);
+                    lv_subsets_2_0=ruleSubsetsRule();
+                    _fsp--;
+
+
+                    	        if (current==null) {
+                    	            current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
+                    	            associateNodeWithAstElement(currentNode.getParent(), current);
+                    	        }
+                    	        try {
+                    	       		set(
+                    	       			current, 
+                    	       			"subsets",
+                    	        		lv_subsets_2_0, 
+                    	        		"SubsetsRule", 
+                    	        		currentNode);
+                    	        } catch (ValueConverterException vce) {
+                    				handleValueConverterException(vce);
+                    	        }
+                    	        currentNode = currentNode.getParent();
+                    	    
+
+                    }
+
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+                	lastConsumedNode = currentNode;
+                
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $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 ;
+    public final EObject entryRuleRedefinesRule() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleRedefinesRule = null;
+
+
+        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
+            {
+             currentNode = createCompositeNode(grammarAccess.getRedefinesRuleRule(), currentNode); 
+            pushFollow(FOLLOW_ruleRedefinesRule_in_entryRuleRedefinesRule1097);
+            iv_ruleRedefinesRule=ruleRedefinesRule();
+            _fsp--;
+
+             current =iv_ruleRedefinesRule; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRedefinesRule1107); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $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 ) ) ) ;
+    public final EObject ruleRedefinesRule() throws RecognitionException {
+        EObject current = null;
 
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:604:6: ( ( (lv_value_0_0= ruleModifierKind ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:605: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: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:605: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:606: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: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:606: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:607:3: lv_value_0_0= ruleModifierKind
+            match(input,22,FOLLOW_22_in_ruleRedefinesRule1142); 
+
+                    createLeafNode(grammarAccess.getRedefinesRuleAccess().getRedefinesKeyword_0(), null); 
+                
+            // ../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 )
             {
-             
-            	        currentNode=createCompositeNode(grammarAccess.getModifierSpecificationAccess().getValueModifierKindEnumRuleCall_0(), currentNode); 
-            	    
-            pushFollow(FOLLOW_ruleModifierKind_in_ruleModifierSpecification984);
-            lv_value_0_0=ruleModifierKind();
+            // ../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
+            {
+
+            			if (current==null) {
+            	            current = factory.create(grammarAccess.getRedefinesRuleRule().getType().getClassifier());
+            	            associateNodeWithAstElement(currentNode, current);
+            	        }
+                    
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRedefinesRule1160); 
+
+            		createLeafNode(grammarAccess.getRedefinesRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
+            	
+
+            }
+
+
+            }
+
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+                	lastConsumedNode = currentNode;
+                
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $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 ;
+    public final EObject entryRuleSubsetsRule() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleSubsetsRule = null;
+
+
+        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
+            {
+             currentNode = createCompositeNode(grammarAccess.getSubsetsRuleRule(), currentNode); 
+            pushFollow(FOLLOW_ruleSubsetsRule_in_entryRuleSubsetsRule1196);
+            iv_ruleSubsetsRule=ruleSubsetsRule();
             _fsp--;
 
+             current =iv_ruleSubsetsRule; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleSubsetsRule1206); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $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 ) ) ) ;
+    public final EObject ruleSubsetsRule() throws RecognitionException {
+        EObject current = null;
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+            
+        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: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 ) )
+            {
+            match(input,23,FOLLOW_23_in_ruleSubsetsRule1241); 
+
+                    createLeafNode(grammarAccess.getSubsetsRuleAccess().getSubsetsKeyword_0(), null); 
+                
+            // ../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: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
+            {
+
+            			if (current==null) {
+            	            current = factory.create(grammarAccess.getSubsetsRuleRule().getType().getClassifier());
+            	            associateNodeWithAstElement(currentNode, current);
+            	        }
+                    
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubsetsRule1259); 
+
+            		createLeafNode(grammarAccess.getSubsetsRuleAccess().getPropertyPropertyCrossReference_1_0(), "property"); 
+            	
+
+            }
+
+
+            }
+
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+                	lastConsumedNode = currentNode;
+                
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $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 ;
+    public final EObject entryRuleDefaultValueRule() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleDefaultValueRule = null;
+
+
+        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
+            {
+             currentNode = createCompositeNode(grammarAccess.getDefaultValueRuleRule(), currentNode); 
+            pushFollow(FOLLOW_ruleDefaultValueRule_in_entryRuleDefaultValueRule1295);
+            iv_ruleDefaultValueRule=ruleDefaultValueRule();
+            _fsp--;
+
+             current =iv_ruleDefaultValueRule; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleDefaultValueRule1305); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $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 ) ) ) ;
+    public final EObject ruleDefaultValueRule() throws RecognitionException {
+        EObject current = null;
+
+        Token lv_default_1_0=null;
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+            
+        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: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 ) )
+            {
+            match(input,24,FOLLOW_24_in_ruleDefaultValueRule1340); 
+
+                    createLeafNode(grammarAccess.getDefaultValueRuleAccess().getEqualsSignKeyword_0(), null); 
+                
+            // ../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: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
+            {
+            lv_default_1_0=(Token)input.LT(1);
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDefaultValueRule1357); 
+
+            			createLeafNode(grammarAccess.getDefaultValueRuleAccess().getDefaultSTRINGTerminalRuleCall_1_0(), "default"); 
+            		
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.getModifierSpecificationRule().getType().getClassifier());
-            	            associateNodeWithAstElement(currentNode.getParent(), current);
+            	            current = factory.create(grammarAccess.getDefaultValueRuleRule().getType().getClassifier());
+            	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        try {
             	       		set(
             	       			current, 
-            	       			"value",
-            	        		lv_value_0_0, 
-            	        		"ModifierKind", 
-            	        		currentNode);
+            	       			"default",
+            	        		lv_default_1_0, 
+            	        		"STRING", 
+            	        		lastConsumedNode);
             	        } catch (ValueConverterException vce) {
             				handleValueConverterException(vce);
             	        }
-            	        currentNode = currentNode.getParent();
             	    
 
             }
@@ -1282,6 +1758,9 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
             }
 
+
+            }
+
              resetLookahead(); 
                 	lastConsumedNode = currentNode;
                 
@@ -1295,57 +1774,57 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end ruleModifierSpecification
+    // $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:637:1: ruleVisibilityKind returns [Enumerator current=null] : ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) ;
+    // ../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] : ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) ;
     public final Enumerator ruleVisibilityKind() throws RecognitionException {
         Enumerator current = null;
 
          setCurrentLookahead(); resetLookahead(); 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:641:6: ( ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:642:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
+            // ../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:642:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
-            int alt9=4;
+            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:849:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )
+            int alt11=4;
             switch ( input.LA(1) ) {
-            case 22:
+            case 25:
                 {
-                alt9=1;
+                alt11=1;
                 }
                 break;
-            case 23:
+            case 26:
                 {
-                alt9=2;
+                alt11=2;
                 }
                 break;
-            case 24:
+            case 27:
                 {
-                alt9=3;
+                alt11=3;
                 }
                 break;
-            case 25:
+            case 28:
                 {
-                alt9=4;
+                alt11=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("642:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )", 9, 0, input);
+                    new NoViableAltException("849:1: ( ( '+' ) | ( '-' ) | ( '#' ) | ( '~' ) )", 11, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt9) {
+            switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:642:2: ( '+' )
+                    // ../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:642:2: ( '+' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:642:4: '+'
+                    // ../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: '+'
                     {
-                    match(input,22,FOLLOW_22_in_ruleVisibilityKind1031); 
+                    match(input,25,FOLLOW_25_in_ruleVisibilityKind1410); 
 
                             current = grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getVisibilityKindAccess().getPublicEnumLiteralDeclaration_0(), null); 
@@ -1357,12 +1836,12 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:648:6: ( '-' )
+                    // ../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:648:6: ( '-' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:648:8: '-'
+                    // ../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: '-'
                     {
-                    match(input,23,FOLLOW_23_in_ruleVisibilityKind1046); 
+                    match(input,26,FOLLOW_26_in_ruleVisibilityKind1425); 
 
                             current = grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getVisibilityKindAccess().getPrivateEnumLiteralDeclaration_1(), null); 
@@ -1374,12 +1853,12 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:654:6: ( '#' )
+                    // ../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:654:6: ( '#' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:654:8: '#'
+                    // ../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: '#'
                     {
-                    match(input,24,FOLLOW_24_in_ruleVisibilityKind1061); 
+                    match(input,27,FOLLOW_27_in_ruleVisibilityKind1440); 
 
                             current = grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getVisibilityKindAccess().getProtectedEnumLiteralDeclaration_2(), null); 
@@ -1391,12 +1870,12 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:660:6: ( '~' )
+                    // ../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:660:6: ( '~' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:660:8: '~'
+                    // ../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: '~'
                     {
-                    match(input,25,FOLLOW_25_in_ruleVisibilityKind1076); 
+                    match(input,28,FOLLOW_28_in_ruleVisibilityKind1455); 
 
                             current = grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getVisibilityKindAccess().getPackageEnumLiteralDeclaration_3(), null); 
@@ -1430,53 +1909,53 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start ruleModifierKind
-    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:670:1: ruleModifierKind returns [Enumerator current=null] : ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) ) ;
+    // ../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' ) ) ;
     public final Enumerator ruleModifierKind() throws RecognitionException {
         Enumerator current = null;
 
          setCurrentLookahead(); resetLookahead(); 
         try {
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:674:6: ( ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) ) )
-            // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:675:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )
+            // ../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:675:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )
-            int alt10=4;
+            // ../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' ) )
+            int alt12=4;
             switch ( input.LA(1) ) {
-            case 26:
+            case 29:
                 {
-                alt10=1;
+                alt12=1;
                 }
                 break;
-            case 27:
+            case 30:
                 {
-                alt10=2;
+                alt12=2;
                 }
                 break;
-            case 28:
+            case 31:
                 {
-                alt10=3;
+                alt12=3;
                 }
                 break;
-            case 29:
+            case 32:
                 {
-                alt10=4;
+                alt12=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("675:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )", 10, 0, input);
+                    new NoViableAltException("882:1: ( ( 'readOnly' ) | ( 'union' ) | ( 'ordered' ) | ( 'unique' ) )", 12, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt10) {
+            switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:675:2: ( '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:675:2: ( 'readOnly' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:675:4: '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'
                     {
-                    match(input,26,FOLLOW_26_in_ruleModifierKind1119); 
+                    match(input,29,FOLLOW_29_in_ruleModifierKind1498); 
 
                             current = grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getModifierKindAccess().getReadOnlyEnumLiteralDeclaration_0(), null); 
@@ -1488,12 +1967,12 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:681:6: ( '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:681:6: ( 'union' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:681:8: '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'
                     {
-                    match(input,27,FOLLOW_27_in_ruleModifierKind1134); 
+                    match(input,30,FOLLOW_30_in_ruleModifierKind1513); 
 
                             current = grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getModifierKindAccess().getUnionEnumLiteralDeclaration_1(), null); 
@@ -1505,12 +1984,12 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:687:6: ( '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:687:6: ( 'ordered' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:687:8: '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'
                     {
-                    match(input,28,FOLLOW_28_in_ruleModifierKind1149); 
+                    match(input,31,FOLLOW_31_in_ruleModifierKind1528); 
 
                             current = grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getModifierKindAccess().getOrderedEnumLiteralDeclaration_2(), null); 
@@ -1522,12 +2001,12 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:693:6: ( '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:693:6: ( 'unique' )
-                    // ../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g:693:8: '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'
                     {
-                    match(input,29,FOLLOW_29_in_ruleModifierKind1164); 
+                    match(input,32,FOLLOW_32_in_ruleModifierKind1543); 
 
                             current = grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
                             createLeafNode(grammarAccess.getModifierKindAccess().getUniqueEnumLiteralDeclaration_3(), null); 
@@ -1568,46 +2047,61 @@ public class InternalUmlPropertyParser extends AbstractInternalAntlrParser {
     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[]{0x0000000000090002L});
-    public static final BitSet FOLLOW_14_in_rulePropertyRule233 = new BitSet(new long[]{0x0000000000090002L});
-    public static final BitSet FOLLOW_ruleMultiplicityRule_in_rulePropertyRule255 = new BitSet(new long[]{0x0000000000080002L});
-    public static final BitSet FOLLOW_ruleModifiersRule_in_rulePropertyRule277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeRule_in_entryRuleTypeRule314 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeRule324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleTypeRule370 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRule389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName425 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName478 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleQualifiedName488 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedName509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicityRule_in_entryRuleMultiplicityRule546 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityRule556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleMultiplicityRule591 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule612 = new BitSet(new long[]{0x0000000000060000L});
-    public static final BitSet FOLLOW_17_in_ruleMultiplicityRule623 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleBoundSpecification_in_ruleMultiplicityRule644 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleMultiplicityRule656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBoundSpecification_in_entryRuleBoundSpecification692 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBoundSpecification702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_UNLIMITEDLITERAL_in_ruleBoundSpecification743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifiersRule_in_entryRuleModifiersRule783 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModifiersRule793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleModifiersRule828 = new BitSet(new long[]{0x000000003C000000L});
-    public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule849 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleModifiersRule860 = new BitSet(new long[]{0x000000003C000000L});
-    public static final BitSet FOLLOW_ruleModifierSpecification_in_ruleModifiersRule881 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleModifiersRule893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifierSpecification_in_entryRuleModifierSpecification929 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModifierSpecification939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleModifierKind_in_ruleModifierSpecification984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleVisibilityKind1031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleVisibilityKind1046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleVisibilityKind1061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleVisibilityKind1076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleModifierKind1119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleModifierKind1134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleModifierKind1149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleModifierKind1164 = new BitSet(new long[]{0x0000000000000002L});
+    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});
 
 }
 \ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty__.g b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty__.g
index d450589451f..e45c3f62994 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty__.g
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty__.g
@@ -17,37 +17,40 @@ T18 : ']' ;
 T19 : '{' ;
 T20 : ',' ;
 T21 : '}' ;
-T22 : '+' ;
-T23 : '-' ;
-T24 : '#' ;
-T25 : '~' ;
-T26 : 'readOnly' ;
-T27 : 'union' ;
-T28 : 'ordered' ;
-T29 : 'unique' ;
-
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 702
+T22 : 'redefines' ;
+T23 : 'subsets' ;
+T24 : '=' ;
+T25 : '+' ;
+T26 : '-' ;
+T27 : '#' ;
+T28 : '~' ;
+T29 : 'readOnly' ;
+T30 : 'union' ;
+T31 : 'ordered' ;
+T32 : 'unique' ;
+
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 909
 RULE_UNLIMITEDLITERAL : ('0'..'9' ('0'..'9')*|'*');
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 704
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 911
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 706
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 913
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 708
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 915
 RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 710
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 917
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 712
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 919
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 714
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 921
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
-// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 716
+// $ANTLR src "../org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/parser/antlr/internal/InternalUmlProperty.g" 923
 RULE_ANY_OTHER : .;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java
index d6c5fc47f47..07e9787ed48 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/services/UmlPropertyGrammarAccess.java
@@ -35,14 +35,16 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 		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 cDefaultAssignment_7 = (Assignment)cGroup.eContents().get(7);
+		private final RuleCall cDefaultDefaultValueRuleParserRuleCall_7_0 = (RuleCall)cDefaultAssignment_7.eContents().get(0);
 		
 		//PropertyRule:
 		//	visibility=VisibilityKind isDerived="/"? name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
-		//	modifiers=ModifiersRule?;
+		//	modifiers=ModifiersRule? default=DefaultValueRule?;
 		public ParserRule getRule() { return rule; }
 
 		//visibility=VisibilityKind isDerived="/"? name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
-		//modifiers=ModifiersRule?
+		//modifiers=ModifiersRule? default=DefaultValueRule?
 		public Group getGroup() { return cGroup; }
 
 		//visibility=VisibilityKind
@@ -89,6 +91,12 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 
 		//ModifiersRule
 		public RuleCall getModifiersModifiersRuleParserRuleCall_6_0() { return cModifiersModifiersRuleParserRuleCall_6_0; }
+
+		//default=DefaultValueRule?
+		public Assignment getDefaultAssignment_7() { return cDefaultAssignment_7; }
+
+		//DefaultValueRule
+		public RuleCall getDefaultDefaultValueRuleParserRuleCall_7_0() { return cDefaultDefaultValueRuleParserRuleCall_7_0; }
 	}
 
 	public class TypeRuleElements extends AbstractParserRuleElementFinder {
@@ -265,18 +273,118 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 
 	public class ModifierSpecificationElements extends AbstractParserRuleElementFinder {
 		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);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final Assignment cValueAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
+		private final RuleCall cValueModifierKindEnumRuleCall_0_0 = (RuleCall)cValueAssignment_0.eContents().get(0);
+		private final Assignment cRedefinesAssignment_1 = (Assignment)cAlternatives.eContents().get(1);
+		private final RuleCall cRedefinesRedefinesRuleParserRuleCall_1_0 = (RuleCall)cRedefinesAssignment_1.eContents().get(0);
+		private final Assignment cSubsetsAssignment_2 = (Assignment)cAlternatives.eContents().get(2);
+		private final RuleCall cSubsetsSubsetsRuleParserRuleCall_2_0 = (RuleCall)cSubsetsAssignment_2.eContents().get(0);
 		
 		//ModifierSpecification:
-		//	value=ModifierKind;
+		//	value=ModifierKind | redefines=RedefinesRule | subsets=SubsetsRule;
 		public ParserRule getRule() { return rule; }
 
+		//value=ModifierKind | redefines=RedefinesRule | subsets=SubsetsRule
+		public Alternatives getAlternatives() { return cAlternatives; }
+
 		//value=ModifierKind
-		public Assignment getValueAssignment() { return cValueAssignment; }
+		public Assignment getValueAssignment_0() { return cValueAssignment_0; }
 
 		//ModifierKind
-		public RuleCall getValueModifierKindEnumRuleCall_0() { return cValueModifierKindEnumRuleCall_0; }
+		public RuleCall getValueModifierKindEnumRuleCall_0_0() { return cValueModifierKindEnumRuleCall_0_0; }
+
+		//redefines=RedefinesRule
+		public Assignment getRedefinesAssignment_1() { return cRedefinesAssignment_1; }
+
+		//RedefinesRule
+		public RuleCall getRedefinesRedefinesRuleParserRuleCall_1_0() { return cRedefinesRedefinesRuleParserRuleCall_1_0; }
+
+		//subsets=SubsetsRule
+		public Assignment getSubsetsAssignment_2() { return cSubsetsAssignment_2; }
+
+		//SubsetsRule
+		public RuleCall getSubsetsSubsetsRuleParserRuleCall_2_0() { return cSubsetsSubsetsRuleParserRuleCall_2_0; }
+	}
+
+	public class RedefinesRuleElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RedefinesRule");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cRedefinesKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cPropertyAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference cPropertyPropertyCrossReference_1_0 = (CrossReference)cPropertyAssignment_1.eContents().get(0);
+		private final RuleCall cPropertyPropertyIDTerminalRuleCall_1_0_1 = (RuleCall)cPropertyPropertyCrossReference_1_0.eContents().get(1);
+		
+		//RedefinesRule:
+		//	"redefines" property=[uml::Property];
+		public ParserRule getRule() { return rule; }
+
+		//"redefines" property=[uml::Property]
+		public Group getGroup() { return cGroup; }
+
+		//"redefines"
+		public Keyword getRedefinesKeyword_0() { return cRedefinesKeyword_0; }
+
+		//property=[uml::Property]
+		public Assignment getPropertyAssignment_1() { return cPropertyAssignment_1; }
+
+		//[uml::Property]
+		public CrossReference getPropertyPropertyCrossReference_1_0() { return cPropertyPropertyCrossReference_1_0; }
+
+		//ID
+		public RuleCall getPropertyPropertyIDTerminalRuleCall_1_0_1() { return cPropertyPropertyIDTerminalRuleCall_1_0_1; }
+	}
+
+	public class SubsetsRuleElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubsetsRule");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cSubsetsKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cPropertyAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference cPropertyPropertyCrossReference_1_0 = (CrossReference)cPropertyAssignment_1.eContents().get(0);
+		private final RuleCall cPropertyPropertyIDTerminalRuleCall_1_0_1 = (RuleCall)cPropertyPropertyCrossReference_1_0.eContents().get(1);
+		
+		//SubsetsRule:
+		//	"subsets" property=[uml::Property];
+		public ParserRule getRule() { return rule; }
+
+		//"subsets" property=[uml::Property]
+		public Group getGroup() { return cGroup; }
+
+		//"subsets"
+		public Keyword getSubsetsKeyword_0() { return cSubsetsKeyword_0; }
+
+		//property=[uml::Property]
+		public Assignment getPropertyAssignment_1() { return cPropertyAssignment_1; }
+
+		//[uml::Property]
+		public CrossReference getPropertyPropertyCrossReference_1_0() { return cPropertyPropertyCrossReference_1_0; }
+
+		//ID
+		public RuleCall getPropertyPropertyIDTerminalRuleCall_1_0_1() { return cPropertyPropertyIDTerminalRuleCall_1_0_1; }
+	}
+
+	public class DefaultValueRuleElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DefaultValueRule");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cEqualsSignKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cDefaultAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cDefaultSTRINGTerminalRuleCall_1_0 = (RuleCall)cDefaultAssignment_1.eContents().get(0);
+		
+		//DefaultValueRule:
+		//	"=" default=STRING;
+		public ParserRule getRule() { return rule; }
+
+		//"=" default=STRING
+		public Group getGroup() { return cGroup; }
+
+		//"="
+		public Keyword getEqualsSignKeyword_0() { return cEqualsSignKeyword_0; }
+
+		//default=STRING
+		public Assignment getDefaultAssignment_1() { return cDefaultAssignment_1; }
+
+		//STRING
+		public RuleCall getDefaultSTRINGTerminalRuleCall_1_0() { return cDefaultSTRINGTerminalRuleCall_1_0; }
 	}
 	
 	
@@ -378,6 +486,9 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 	private ModifiersRuleElements pModifiersRule;
 	private ModifierSpecificationElements pModifierSpecification;
 	private ModifierKindElements unknownRuleModifierKind;
+	private RedefinesRuleElements pRedefinesRule;
+	private SubsetsRuleElements pSubsetsRule;
+	private DefaultValueRuleElements pDefaultValueRule;
 	
 	private final GrammarProvider grammarProvider;
 
@@ -402,7 +513,7 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 	
 	//PropertyRule:
 	//	visibility=VisibilityKind isDerived="/"? name=ID ":" (type=TypeRule | "<Undefined>") multiplicity=MultiplicityRule?
-	//	modifiers=ModifiersRule?;
+	//	modifiers=ModifiersRule? default=DefaultValueRule?;
 	public PropertyRuleElements getPropertyRuleAccess() {
 		return (pPropertyRule != null) ? pPropertyRule : (pPropertyRule = new PropertyRuleElements());
 	}
@@ -478,7 +589,7 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//ModifierSpecification:
-	//	value=ModifierKind;
+	//	value=ModifierKind | redefines=RedefinesRule | subsets=SubsetsRule;
 	public ModifierSpecificationElements getModifierSpecificationAccess() {
 		return (pModifierSpecification != null) ? pModifierSpecification : (pModifierSpecification = new ModifierSpecificationElements());
 	}
@@ -497,6 +608,36 @@ public class UmlPropertyGrammarAccess extends AbstractGrammarElementFinder {
 		return getModifierKindAccess().getRule();
 	}
 
+	//RedefinesRule:
+	//	"redefines" property=[uml::Property];
+	public RedefinesRuleElements getRedefinesRuleAccess() {
+		return (pRedefinesRule != null) ? pRedefinesRule : (pRedefinesRule = new RedefinesRuleElements());
+	}
+	
+	public ParserRule getRedefinesRuleRule() {
+		return getRedefinesRuleAccess().getRule();
+	}
+
+	//SubsetsRule:
+	//	"subsets" property=[uml::Property];
+	public SubsetsRuleElements getSubsetsRuleAccess() {
+		return (pSubsetsRule != null) ? pSubsetsRule : (pSubsetsRule = new SubsetsRuleElements());
+	}
+	
+	public ParserRule getSubsetsRuleRule() {
+		return getSubsetsRuleAccess().getRule();
+	}
+
+	//DefaultValueRule:
+	//	"=" default=STRING;
+	public DefaultValueRuleElements getDefaultValueRuleAccess() {
+		return (pDefaultValueRule != null) ? pDefaultValueRule : (pDefaultValueRule = new DefaultValueRuleElements());
+	}
+	
+	public ParserRule getDefaultValueRuleRule() {
+		return getDefaultValueRuleAccess().getRule();
+	}
+
 	//terminal ID:
 	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
 	public TerminalRule getIDRule() {
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/DefaultValueRule.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/DefaultValueRule.java
new file mode 100644
index 00000000000..a70cafc2bcf
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/DefaultValueRule.java
@@ -0,0 +1,55 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+
+ */
+package org.eclipse.papyrus.property.editor.xtext.umlProperty;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Default Value Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule#getDefault <em>Default</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getDefaultValueRule()
+ * @model
+ * @generated
+ */
+public interface DefaultValueRule extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Default</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Default</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Default</em>' attribute.
+   * @see #setDefault(String)
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getDefaultValueRule_Default()
+   * @model
+   * @generated
+   */
+  String getDefault();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule#getDefault <em>Default</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Default</em>' attribute.
+   * @see #getDefault()
+   * @generated
+   */
+  void setDefault(String value);
+
+} // DefaultValueRule
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/ModifierSpecification.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/ModifierSpecification.java
index ac35e95bd71..110adcfc418 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/ModifierSpecification.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/ModifierSpecification.java
@@ -17,6 +17,8 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getRedefines <em>Redefines</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getSubsets <em>Subsets</em>}</li>
  * </ul>
  * </p>
  *
@@ -55,4 +57,56 @@ public interface ModifierSpecification extends EObject
    */
   void setValue(ModifierKind value);
 
+  /**
+   * Returns the value of the '<em><b>Redefines</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Redefines</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Redefines</em>' containment reference.
+   * @see #setRedefines(RedefinesRule)
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getModifierSpecification_Redefines()
+   * @model containment="true"
+   * @generated
+   */
+  RedefinesRule getRedefines();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getRedefines <em>Redefines</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Redefines</em>' containment reference.
+   * @see #getRedefines()
+   * @generated
+   */
+  void setRedefines(RedefinesRule value);
+
+  /**
+   * Returns the value of the '<em><b>Subsets</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Subsets</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Subsets</em>' containment reference.
+   * @see #setSubsets(SubsetsRule)
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getModifierSpecification_Subsets()
+   * @model containment="true"
+   * @generated
+   */
+  SubsetsRule getSubsets();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getSubsets <em>Subsets</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Subsets</em>' containment reference.
+   * @see #getSubsets()
+   * @generated
+   */
+  void setSubsets(SubsetsRule value);
+
 } // ModifierSpecification
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/PropertyRule.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/PropertyRule.java
index 99b761d1490..6fc9d0edf89 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/PropertyRule.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/PropertyRule.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getMultiplicity <em>Multiplicity</em>}</li>
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getModifiers <em>Modifiers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getDefault <em>Default</em>}</li>
  * </ul>
  * </p>
  *
@@ -190,4 +191,30 @@ public interface PropertyRule extends EObject
    */
   void setModifiers(ModifiersRule value);
 
+  /**
+   * Returns the value of the '<em><b>Default</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Default</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Default</em>' containment reference.
+   * @see #setDefault(DefaultValueRule)
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getPropertyRule_Default()
+   * @model containment="true"
+   * @generated
+   */
+  DefaultValueRule getDefault();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getDefault <em>Default</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Default</em>' containment reference.
+   * @see #getDefault()
+   * @generated
+   */
+  void setDefault(DefaultValueRule value);
+
 } // PropertyRule
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/RedefinesRule.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/RedefinesRule.java
new file mode 100644
index 00000000000..aa455be3e6f
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/RedefinesRule.java
@@ -0,0 +1,57 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+
+ */
+package org.eclipse.papyrus.property.editor.xtext.umlProperty;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Redefines Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule#getProperty <em>Property</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getRedefinesRule()
+ * @model
+ * @generated
+ */
+public interface RedefinesRule extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Property</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Property</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Property</em>' reference.
+   * @see #setProperty(Property)
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getRedefinesRule_Property()
+   * @model
+   * @generated
+   */
+  Property getProperty();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule#getProperty <em>Property</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Property</em>' reference.
+   * @see #getProperty()
+   * @generated
+   */
+  void setProperty(Property value);
+
+} // RedefinesRule
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/SubsetsRule.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/SubsetsRule.java
new file mode 100644
index 00000000000..3ab1a9080ad
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/SubsetsRule.java
@@ -0,0 +1,57 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+
+ */
+package org.eclipse.papyrus.property.editor.xtext.umlProperty;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Subsets Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule#getProperty <em>Property</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getSubsetsRule()
+ * @model
+ * @generated
+ */
+public interface SubsetsRule extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Property</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Property</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Property</em>' reference.
+   * @see #setProperty(Property)
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage#getSubsetsRule_Property()
+   * @model
+   * @generated
+   */
+  Property getProperty();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule#getProperty <em>Property</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Property</em>' reference.
+   * @see #getProperty()
+   * @generated
+   */
+  void setProperty(Property value);
+
+} // SubsetsRule
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyFactory.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyFactory.java
index b315e055a73..0fb759f8e40 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyFactory.java
@@ -90,6 +90,33 @@ public interface UmlPropertyFactory extends EFactory
   ModifierSpecification createModifierSpecification();
 
   /**
+   * Returns a new object of class '<em>Redefines Rule</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Redefines Rule</em>'.
+   * @generated
+   */
+  RedefinesRule createRedefinesRule();
+
+  /**
+   * Returns a new object of class '<em>Subsets Rule</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Subsets Rule</em>'.
+   * @generated
+   */
+  SubsetsRule createSubsetsRule();
+
+  /**
+   * Returns a new object of class '<em>Default Value Rule</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Default Value Rule</em>'.
+   * @generated
+   */
+  DefaultValueRule createDefaultValueRule();
+
+  /**
    * Returns the package supported by this factory.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyPackage.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyPackage.java
index 9460f5dab79..8c99706fcba 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/UmlPropertyPackage.java
@@ -126,13 +126,22 @@ public interface UmlPropertyPackage extends EPackage
   int PROPERTY_RULE__MODIFIERS = 5;
 
   /**
+   * The feature id for the '<em><b>Default</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTY_RULE__DEFAULT = 6;
+
+  /**
    * The number of structural features of the '<em>Property Rule</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int PROPERTY_RULE_FEATURE_COUNT = 6;
+  int PROPERTY_RULE_FEATURE_COUNT = 7;
 
   /**
    * The meta object id for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.TypeRuleImpl <em>Type Rule</em>}' class.
@@ -312,13 +321,115 @@ public interface UmlPropertyPackage extends EPackage
   int MODIFIER_SPECIFICATION__VALUE = 0;
 
   /**
+   * The feature id for the '<em><b>Redefines</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MODIFIER_SPECIFICATION__REDEFINES = 1;
+
+  /**
+   * The feature id for the '<em><b>Subsets</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MODIFIER_SPECIFICATION__SUBSETS = 2;
+
+  /**
    * The number of structural features of the '<em>Modifier Specification</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int MODIFIER_SPECIFICATION_FEATURE_COUNT = 1;
+  int MODIFIER_SPECIFICATION_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.RedefinesRuleImpl <em>Redefines Rule</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.RedefinesRuleImpl
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getRedefinesRule()
+   * @generated
+   */
+  int REDEFINES_RULE = 7;
+
+  /**
+   * The feature id for the '<em><b>Property</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REDEFINES_RULE__PROPERTY = 0;
+
+  /**
+   * The number of structural features of the '<em>Redefines Rule</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REDEFINES_RULE_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.SubsetsRuleImpl <em>Subsets Rule</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.SubsetsRuleImpl
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getSubsetsRule()
+   * @generated
+   */
+  int SUBSETS_RULE = 8;
+
+  /**
+   * The feature id for the '<em><b>Property</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SUBSETS_RULE__PROPERTY = 0;
+
+  /**
+   * The number of structural features of the '<em>Subsets Rule</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SUBSETS_RULE_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.DefaultValueRuleImpl <em>Default Value Rule</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.DefaultValueRuleImpl
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getDefaultValueRule()
+   * @generated
+   */
+  int DEFAULT_VALUE_RULE = 9;
+
+  /**
+   * The feature id for the '<em><b>Default</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_VALUE_RULE__DEFAULT = 0;
+
+  /**
+   * The number of structural features of the '<em>Default Value Rule</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_VALUE_RULE_FEATURE_COUNT = 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.VisibilityKind <em>Visibility Kind</em>}' enum.
@@ -328,7 +439,7 @@ public interface UmlPropertyPackage extends EPackage
    * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getVisibilityKind()
    * @generated
    */
-  int VISIBILITY_KIND = 7;
+  int VISIBILITY_KIND = 10;
 
   /**
    * The meta object id for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierKind <em>Modifier Kind</em>}' enum.
@@ -338,7 +449,7 @@ public interface UmlPropertyPackage extends EPackage
    * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getModifierKind()
    * @generated
    */
-  int MODIFIER_KIND = 8;
+  int MODIFIER_KIND = 11;
 
 
   /**
@@ -418,6 +529,17 @@ public interface UmlPropertyPackage extends EPackage
   EReference getPropertyRule_Modifiers();
 
   /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getDefault <em>Default</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Default</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule#getDefault()
+   * @see #getPropertyRule()
+   * @generated
+   */
+  EReference getPropertyRule_Default();
+
+  /**
    * Returns the meta object for class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.TypeRule <em>Type Rule</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -566,6 +688,91 @@ public interface UmlPropertyPackage extends EPackage
   EAttribute getModifierSpecification_Value();
 
   /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getRedefines <em>Redefines</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Redefines</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getRedefines()
+   * @see #getModifierSpecification()
+   * @generated
+   */
+  EReference getModifierSpecification_Redefines();
+
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getSubsets <em>Subsets</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Subsets</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification#getSubsets()
+   * @see #getModifierSpecification()
+   * @generated
+   */
+  EReference getModifierSpecification_Subsets();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule <em>Redefines Rule</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Redefines Rule</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule
+   * @generated
+   */
+  EClass getRedefinesRule();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule#getProperty <em>Property</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Property</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule#getProperty()
+   * @see #getRedefinesRule()
+   * @generated
+   */
+  EReference getRedefinesRule_Property();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule <em>Subsets Rule</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Subsets Rule</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule
+   * @generated
+   */
+  EClass getSubsetsRule();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule#getProperty <em>Property</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Property</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule#getProperty()
+   * @see #getSubsetsRule()
+   * @generated
+   */
+  EReference getSubsetsRule_Property();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule <em>Default Value Rule</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Default Value Rule</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule
+   * @generated
+   */
+  EClass getDefaultValueRule();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule#getDefault <em>Default</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Default</em>'.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule#getDefault()
+   * @see #getDefaultValueRule()
+   * @generated
+   */
+  EAttribute getDefaultValueRule_Default();
+
+  /**
    * Returns the meta object for enum '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.VisibilityKind <em>Visibility Kind</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -667,6 +874,14 @@ public interface UmlPropertyPackage extends EPackage
     EReference PROPERTY_RULE__MODIFIERS = eINSTANCE.getPropertyRule_Modifiers();
 
     /**
+     * The meta object literal for the '<em><b>Default</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference PROPERTY_RULE__DEFAULT = eINSTANCE.getPropertyRule_Default();
+
+    /**
      * The meta object literal for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.TypeRuleImpl <em>Type Rule</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -791,6 +1006,76 @@ public interface UmlPropertyPackage extends EPackage
     EAttribute MODIFIER_SPECIFICATION__VALUE = eINSTANCE.getModifierSpecification_Value();
 
     /**
+     * The meta object literal for the '<em><b>Redefines</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference MODIFIER_SPECIFICATION__REDEFINES = eINSTANCE.getModifierSpecification_Redefines();
+
+    /**
+     * The meta object literal for the '<em><b>Subsets</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference MODIFIER_SPECIFICATION__SUBSETS = eINSTANCE.getModifierSpecification_Subsets();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.RedefinesRuleImpl <em>Redefines Rule</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.RedefinesRuleImpl
+     * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getRedefinesRule()
+     * @generated
+     */
+    EClass REDEFINES_RULE = eINSTANCE.getRedefinesRule();
+
+    /**
+     * The meta object literal for the '<em><b>Property</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference REDEFINES_RULE__PROPERTY = eINSTANCE.getRedefinesRule_Property();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.SubsetsRuleImpl <em>Subsets Rule</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.SubsetsRuleImpl
+     * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getSubsetsRule()
+     * @generated
+     */
+    EClass SUBSETS_RULE = eINSTANCE.getSubsetsRule();
+
+    /**
+     * The meta object literal for the '<em><b>Property</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference SUBSETS_RULE__PROPERTY = eINSTANCE.getSubsetsRule_Property();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.DefaultValueRuleImpl <em>Default Value Rule</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.DefaultValueRuleImpl
+     * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.UmlPropertyPackageImpl#getDefaultValueRule()
+     * @generated
+     */
+    EClass DEFAULT_VALUE_RULE = eINSTANCE.getDefaultValueRule();
+
+    /**
+     * The meta object literal for the '<em><b>Default</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute DEFAULT_VALUE_RULE__DEFAULT = eINSTANCE.getDefaultValueRule_Default();
+
+    /**
      * The meta object literal for the '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.VisibilityKind <em>Visibility Kind</em>}' enum.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/DefaultValueRuleImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/DefaultValueRuleImpl.java
new file mode 100644
index 00000000000..2c2e0cd5f40
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/DefaultValueRuleImpl.java
@@ -0,0 +1,181 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+
+ */
+package org.eclipse.papyrus.property.editor.xtext.umlProperty.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.property.editor.xtext.umlProperty.DefaultValueRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Default Value Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.DefaultValueRuleImpl#getDefault <em>Default</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DefaultValueRuleImpl extends MinimalEObjectImpl.Container implements DefaultValueRule
+{
+  /**
+   * The default value of the '{@link #getDefault() <em>Default</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDefault()
+   * @generated
+   * @ordered
+   */
+  protected static final String DEFAULT_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getDefault() <em>Default</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDefault()
+   * @generated
+   * @ordered
+   */
+  protected String default_ = DEFAULT_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DefaultValueRuleImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return UmlPropertyPackage.Literals.DEFAULT_VALUE_RULE;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getDefault()
+  {
+    return default_;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDefault(String newDefault)
+  {
+    String oldDefault = default_;
+    default_ = newDefault;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.DEFAULT_VALUE_RULE__DEFAULT, oldDefault, default_));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.DEFAULT_VALUE_RULE__DEFAULT:
+        return getDefault();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.DEFAULT_VALUE_RULE__DEFAULT:
+        setDefault((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.DEFAULT_VALUE_RULE__DEFAULT:
+        setDefault(DEFAULT_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.DEFAULT_VALUE_RULE__DEFAULT:
+        return DEFAULT_EDEFAULT == null ? default_ != null : !DEFAULT_EDEFAULT.equals(default_);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (default: ");
+    result.append(default_);
+    result.append(')');
+    return result.toString();
+  }
+
+} //DefaultValueRuleImpl
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/ModifierSpecificationImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/ModifierSpecificationImpl.java
index 7861feff356..6223819d488 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/ModifierSpecificationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/ModifierSpecificationImpl.java
@@ -7,14 +7,18 @@
 package org.eclipse.papyrus.property.editor.xtext.umlProperty.impl;
 
 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.property.editor.xtext.umlProperty.ModifierKind;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
 
 /**
@@ -25,6 +29,8 @@ import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.ModifierSpecificationImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.ModifierSpecificationImpl#getRedefines <em>Redefines</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.ModifierSpecificationImpl#getSubsets <em>Subsets</em>}</li>
  * </ul>
  * </p>
  *
@@ -53,6 +59,26 @@ public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container impl
   protected ModifierKind value = VALUE_EDEFAULT;
 
   /**
+   * The cached value of the '{@link #getRedefines() <em>Redefines</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getRedefines()
+   * @generated
+   * @ordered
+   */
+  protected RedefinesRule redefines;
+
+  /**
+   * The cached value of the '{@link #getSubsets() <em>Subsets</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getSubsets()
+   * @generated
+   * @ordered
+   */
+  protected SubsetsRule subsets;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -101,6 +127,120 @@ public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container impl
    * <!-- end-user-doc -->
    * @generated
    */
+  public RedefinesRule getRedefines()
+  {
+    return redefines;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetRedefines(RedefinesRule newRedefines, NotificationChain msgs)
+  {
+    RedefinesRule oldRedefines = redefines;
+    redefines = newRedefines;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES, oldRedefines, newRedefines);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setRedefines(RedefinesRule newRedefines)
+  {
+    if (newRedefines != redefines)
+    {
+      NotificationChain msgs = null;
+      if (redefines != null)
+        msgs = ((InternalEObject)redefines).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES, null, msgs);
+      if (newRedefines != null)
+        msgs = ((InternalEObject)newRedefines).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES, null, msgs);
+      msgs = basicSetRedefines(newRedefines, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES, newRedefines, newRedefines));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public SubsetsRule getSubsets()
+  {
+    return subsets;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetSubsets(SubsetsRule newSubsets, NotificationChain msgs)
+  {
+    SubsetsRule oldSubsets = subsets;
+    subsets = newSubsets;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS, oldSubsets, newSubsets);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setSubsets(SubsetsRule newSubsets)
+  {
+    if (newSubsets != subsets)
+    {
+      NotificationChain msgs = null;
+      if (subsets != null)
+        msgs = ((InternalEObject)subsets).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS, null, msgs);
+      if (newSubsets != null)
+        msgs = ((InternalEObject)newSubsets).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS, null, msgs);
+      msgs = basicSetSubsets(newSubsets, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS, newSubsets, newSubsets));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES:
+        return basicSetRedefines(null, msgs);
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS:
+        return basicSetSubsets(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
@@ -108,6 +248,10 @@ public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container impl
     {
       case UmlPropertyPackage.MODIFIER_SPECIFICATION__VALUE:
         return getValue();
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES:
+        return getRedefines();
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS:
+        return getSubsets();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -125,6 +269,12 @@ public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container impl
       case UmlPropertyPackage.MODIFIER_SPECIFICATION__VALUE:
         setValue((ModifierKind)newValue);
         return;
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES:
+        setRedefines((RedefinesRule)newValue);
+        return;
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS:
+        setSubsets((SubsetsRule)newValue);
+        return;
     }
     super.eSet(featureID, newValue);
   }
@@ -142,6 +292,12 @@ public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container impl
       case UmlPropertyPackage.MODIFIER_SPECIFICATION__VALUE:
         setValue(VALUE_EDEFAULT);
         return;
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES:
+        setRedefines((RedefinesRule)null);
+        return;
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS:
+        setSubsets((SubsetsRule)null);
+        return;
     }
     super.eUnset(featureID);
   }
@@ -158,6 +314,10 @@ public class ModifierSpecificationImpl extends MinimalEObjectImpl.Container impl
     {
       case UmlPropertyPackage.MODIFIER_SPECIFICATION__VALUE:
         return value != VALUE_EDEFAULT;
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__REDEFINES:
+        return redefines != null;
+      case UmlPropertyPackage.MODIFIER_SPECIFICATION__SUBSETS:
+        return subsets != null;
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/PropertyRuleImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/PropertyRuleImpl.java
index 72fcae15be9..dfcc7def425 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/PropertyRuleImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/PropertyRuleImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifiersRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.MultiplicityRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule;
@@ -35,6 +36,7 @@ import org.eclipse.papyrus.property.editor.xtext.umlProperty.VisibilityKind;
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.PropertyRuleImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.PropertyRuleImpl#getMultiplicity <em>Multiplicity</em>}</li>
  *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.PropertyRuleImpl#getModifiers <em>Modifiers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.PropertyRuleImpl#getDefault <em>Default</em>}</li>
  * </ul>
  * </p>
  *
@@ -133,6 +135,16 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
   protected ModifiersRule modifiers;
 
   /**
+   * The cached value of the '{@link #getDefault() <em>Default</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDefault()
+   * @generated
+   * @ordered
+   */
+  protected DefaultValueRule default_;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -371,6 +383,54 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
    * <!-- end-user-doc -->
    * @generated
    */
+  public DefaultValueRule getDefault()
+  {
+    return default_;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetDefault(DefaultValueRule newDefault, NotificationChain msgs)
+  {
+    DefaultValueRule oldDefault = default_;
+    default_ = newDefault;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.PROPERTY_RULE__DEFAULT, oldDefault, newDefault);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDefault(DefaultValueRule newDefault)
+  {
+    if (newDefault != default_)
+    {
+      NotificationChain msgs = null;
+      if (default_ != null)
+        msgs = ((InternalEObject)default_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UmlPropertyPackage.PROPERTY_RULE__DEFAULT, null, msgs);
+      if (newDefault != null)
+        msgs = ((InternalEObject)newDefault).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UmlPropertyPackage.PROPERTY_RULE__DEFAULT, null, msgs);
+      msgs = basicSetDefault(newDefault, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.PROPERTY_RULE__DEFAULT, newDefault, newDefault));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   @Override
   public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
@@ -382,6 +442,8 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
         return basicSetMultiplicity(null, msgs);
       case UmlPropertyPackage.PROPERTY_RULE__MODIFIERS:
         return basicSetModifiers(null, msgs);
+      case UmlPropertyPackage.PROPERTY_RULE__DEFAULT:
+        return basicSetDefault(null, msgs);
     }
     return super.eInverseRemove(otherEnd, featureID, msgs);
   }
@@ -408,6 +470,8 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
         return getMultiplicity();
       case UmlPropertyPackage.PROPERTY_RULE__MODIFIERS:
         return getModifiers();
+      case UmlPropertyPackage.PROPERTY_RULE__DEFAULT:
+        return getDefault();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -440,6 +504,9 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
       case UmlPropertyPackage.PROPERTY_RULE__MODIFIERS:
         setModifiers((ModifiersRule)newValue);
         return;
+      case UmlPropertyPackage.PROPERTY_RULE__DEFAULT:
+        setDefault((DefaultValueRule)newValue);
+        return;
     }
     super.eSet(featureID, newValue);
   }
@@ -472,6 +539,9 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
       case UmlPropertyPackage.PROPERTY_RULE__MODIFIERS:
         setModifiers((ModifiersRule)null);
         return;
+      case UmlPropertyPackage.PROPERTY_RULE__DEFAULT:
+        setDefault((DefaultValueRule)null);
+        return;
     }
     super.eUnset(featureID);
   }
@@ -498,6 +568,8 @@ public class PropertyRuleImpl extends MinimalEObjectImpl.Container implements Pr
         return multiplicity != null;
       case UmlPropertyPackage.PROPERTY_RULE__MODIFIERS:
         return modifiers != null;
+      case UmlPropertyPackage.PROPERTY_RULE__DEFAULT:
+        return default_ != null;
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/RedefinesRuleImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/RedefinesRuleImpl.java
new file mode 100644
index 00000000000..00808b04c09
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/RedefinesRuleImpl.java
@@ -0,0 +1,178 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+
+ */
+package org.eclipse.papyrus.property.editor.xtext.umlProperty.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+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.property.editor.xtext.umlProperty.RedefinesRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
+
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Redefines Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.RedefinesRuleImpl#getProperty <em>Property</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RedefinesRuleImpl extends MinimalEObjectImpl.Container implements RedefinesRule
+{
+  /**
+   * The cached value of the '{@link #getProperty() <em>Property</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getProperty()
+   * @generated
+   * @ordered
+   */
+  protected Property property;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected RedefinesRuleImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return UmlPropertyPackage.Literals.REDEFINES_RULE;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Property getProperty()
+  {
+    if (property != null && property.eIsProxy())
+    {
+      InternalEObject oldProperty = (InternalEObject)property;
+      property = (Property)eResolveProxy(oldProperty);
+      if (property != oldProperty)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlPropertyPackage.REDEFINES_RULE__PROPERTY, oldProperty, property));
+      }
+    }
+    return property;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Property basicGetProperty()
+  {
+    return property;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setProperty(Property newProperty)
+  {
+    Property oldProperty = property;
+    property = newProperty;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.REDEFINES_RULE__PROPERTY, oldProperty, property));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.REDEFINES_RULE__PROPERTY:
+        if (resolve) return getProperty();
+        return basicGetProperty();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.REDEFINES_RULE__PROPERTY:
+        setProperty((Property)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.REDEFINES_RULE__PROPERTY:
+        setProperty((Property)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.REDEFINES_RULE__PROPERTY:
+        return property != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} //RedefinesRuleImpl
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/SubsetsRuleImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/SubsetsRuleImpl.java
new file mode 100644
index 00000000000..7c74f3d8ce2
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/SubsetsRuleImpl.java
@@ -0,0 +1,178 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+
+ */
+package org.eclipse.papyrus.property.editor.xtext.umlProperty.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+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.property.editor.xtext.umlProperty.SubsetsRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
+
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Subsets Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.impl.SubsetsRuleImpl#getProperty <em>Property</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SubsetsRuleImpl extends MinimalEObjectImpl.Container implements SubsetsRule
+{
+  /**
+   * The cached value of the '{@link #getProperty() <em>Property</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getProperty()
+   * @generated
+   * @ordered
+   */
+  protected Property property;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected SubsetsRuleImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return UmlPropertyPackage.Literals.SUBSETS_RULE;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Property getProperty()
+  {
+    if (property != null && property.eIsProxy())
+    {
+      InternalEObject oldProperty = (InternalEObject)property;
+      property = (Property)eResolveProxy(oldProperty);
+      if (property != oldProperty)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, UmlPropertyPackage.SUBSETS_RULE__PROPERTY, oldProperty, property));
+      }
+    }
+    return property;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Property basicGetProperty()
+  {
+    return property;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setProperty(Property newProperty)
+  {
+    Property oldProperty = property;
+    property = newProperty;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UmlPropertyPackage.SUBSETS_RULE__PROPERTY, oldProperty, property));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.SUBSETS_RULE__PROPERTY:
+        if (resolve) return getProperty();
+        return basicGetProperty();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.SUBSETS_RULE__PROPERTY:
+        setProperty((Property)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.SUBSETS_RULE__PROPERTY:
+        setProperty((Property)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case UmlPropertyPackage.SUBSETS_RULE__PROPERTY:
+        return property != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} //SubsetsRuleImpl
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyFactoryImpl.java
index fd6c22576fd..8ad1be43452 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyFactoryImpl.java
@@ -76,6 +76,9 @@ public class UmlPropertyFactoryImpl extends EFactoryImpl implements UmlPropertyF
       case UmlPropertyPackage.BOUND_SPECIFICATION: return createBoundSpecification();
       case UmlPropertyPackage.MODIFIERS_RULE: return createModifiersRule();
       case UmlPropertyPackage.MODIFIER_SPECIFICATION: return createModifierSpecification();
+      case UmlPropertyPackage.REDEFINES_RULE: return createRedefinesRule();
+      case UmlPropertyPackage.SUBSETS_RULE: return createSubsetsRule();
+      case UmlPropertyPackage.DEFAULT_VALUE_RULE: return createDefaultValueRule();
       default:
         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -201,6 +204,39 @@ public class UmlPropertyFactoryImpl extends EFactoryImpl implements UmlPropertyF
    * <!-- end-user-doc -->
    * @generated
    */
+  public RedefinesRule createRedefinesRule()
+  {
+    RedefinesRuleImpl redefinesRule = new RedefinesRuleImpl();
+    return redefinesRule;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public SubsetsRule createSubsetsRule()
+  {
+    SubsetsRuleImpl subsetsRule = new SubsetsRuleImpl();
+    return subsetsRule;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DefaultValueRule createDefaultValueRule()
+  {
+    DefaultValueRuleImpl defaultValueRule = new DefaultValueRuleImpl();
+    return defaultValueRule;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue)
   {
     VisibilityKind result = VisibilityKind.get(initialValue);
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyPackageImpl.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyPackageImpl.java
index 6d1156f7205..4bb9abdf44b 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/impl/UmlPropertyPackageImpl.java
@@ -15,12 +15,15 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.BoundSpecification;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierKind;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifierSpecification;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.ModifiersRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.MultiplicityRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.QualifiedName;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.TypeRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyFactory;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
@@ -90,6 +93,27 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
    * <!-- end-user-doc -->
    * @generated
    */
+  private EClass redefinesRuleEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass subsetsRuleEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass defaultValueRuleEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   private EEnum visibilityKindEEnum = null;
 
   /**
@@ -240,6 +264,16 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
    * <!-- end-user-doc -->
    * @generated
    */
+  public EReference getPropertyRule_Default()
+  {
+    return (EReference)propertyRuleEClass.getEStructuralFeatures().get(6);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EClass getTypeRule()
   {
     return typeRuleEClass;
@@ -380,6 +414,86 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
    * <!-- end-user-doc -->
    * @generated
    */
+  public EReference getModifierSpecification_Redefines()
+  {
+    return (EReference)modifierSpecificationEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getModifierSpecification_Subsets()
+  {
+    return (EReference)modifierSpecificationEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getRedefinesRule()
+  {
+    return redefinesRuleEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getRedefinesRule_Property()
+  {
+    return (EReference)redefinesRuleEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getSubsetsRule()
+  {
+    return subsetsRuleEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getSubsetsRule_Property()
+  {
+    return (EReference)subsetsRuleEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getDefaultValueRule()
+  {
+    return defaultValueRuleEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getDefaultValueRule_Default()
+  {
+    return (EAttribute)defaultValueRuleEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EEnum getVisibilityKind()
   {
     return visibilityKindEEnum;
@@ -432,6 +546,7 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
     createEReference(propertyRuleEClass, PROPERTY_RULE__TYPE);
     createEReference(propertyRuleEClass, PROPERTY_RULE__MULTIPLICITY);
     createEReference(propertyRuleEClass, PROPERTY_RULE__MODIFIERS);
+    createEReference(propertyRuleEClass, PROPERTY_RULE__DEFAULT);
 
     typeRuleEClass = createEClass(TYPE_RULE);
     createEReference(typeRuleEClass, TYPE_RULE__PATH);
@@ -452,6 +567,17 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
 
     modifierSpecificationEClass = createEClass(MODIFIER_SPECIFICATION);
     createEAttribute(modifierSpecificationEClass, MODIFIER_SPECIFICATION__VALUE);
+    createEReference(modifierSpecificationEClass, MODIFIER_SPECIFICATION__REDEFINES);
+    createEReference(modifierSpecificationEClass, MODIFIER_SPECIFICATION__SUBSETS);
+
+    redefinesRuleEClass = createEClass(REDEFINES_RULE);
+    createEReference(redefinesRuleEClass, REDEFINES_RULE__PROPERTY);
+
+    subsetsRuleEClass = createEClass(SUBSETS_RULE);
+    createEReference(subsetsRuleEClass, SUBSETS_RULE__PROPERTY);
+
+    defaultValueRuleEClass = createEClass(DEFAULT_VALUE_RULE);
+    createEAttribute(defaultValueRuleEClass, DEFAULT_VALUE_RULE__DEFAULT);
 
     // Create enums
     visibilityKindEEnum = createEEnum(VISIBILITY_KIND);
@@ -499,6 +625,7 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
     initEReference(getPropertyRule_Type(), this.getTypeRule(), null, "type", null, 0, 1, PropertyRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getPropertyRule_Multiplicity(), this.getMultiplicityRule(), null, "multiplicity", null, 0, 1, PropertyRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getPropertyRule_Modifiers(), this.getModifiersRule(), null, "modifiers", null, 0, 1, PropertyRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPropertyRule_Default(), this.getDefaultValueRule(), null, "default", null, 0, 1, PropertyRule.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);
@@ -519,6 +646,17 @@ public class UmlPropertyPackageImpl extends EPackageImpl implements UmlPropertyP
 
     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);
+    initEReference(getModifierSpecification_Redefines(), this.getRedefinesRule(), null, "redefines", null, 0, 1, ModifierSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getModifierSpecification_Subsets(), this.getSubsetsRule(), null, "subsets", null, 0, 1, ModifierSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(redefinesRuleEClass, RedefinesRule.class, "RedefinesRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRedefinesRule_Property(), theUMLPackage.getProperty(), null, "property", null, 0, 1, RedefinesRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(subsetsRuleEClass, SubsetsRule.class, "SubsetsRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getSubsetsRule_Property(), theUMLPackage.getProperty(), null, "property", null, 0, 1, SubsetsRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(defaultValueRuleEClass, DefaultValueRule.class, "DefaultValueRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getDefaultValueRule_Default(), ecorePackage.getEString(), "default", null, 0, 1, DefaultValueRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(visibilityKindEEnum, VisibilityKind.class, "VisibilityKind");
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertyAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertyAdapterFactory.java
index 9f594082d44..009e4e20ad8 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertyAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertyAdapterFactory.java
@@ -114,6 +114,21 @@ public class UmlPropertyAdapterFactory extends AdapterFactoryImpl
         return createModifierSpecificationAdapter();
       }
       @Override
+      public Adapter caseRedefinesRule(RedefinesRule object)
+      {
+        return createRedefinesRuleAdapter();
+      }
+      @Override
+      public Adapter caseSubsetsRule(SubsetsRule object)
+      {
+        return createSubsetsRuleAdapter();
+      }
+      @Override
+      public Adapter caseDefaultValueRule(DefaultValueRule object)
+      {
+        return createDefaultValueRuleAdapter();
+      }
+      @Override
       public Adapter defaultCase(EObject object)
       {
         return createEObjectAdapter();
@@ -241,6 +256,51 @@ public class UmlPropertyAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule <em>Redefines Rule</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule
+   * @generated
+   */
+  public Adapter createRedefinesRuleAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule <em>Subsets Rule</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule
+   * @generated
+   */
+  public Adapter createSubsetsRuleAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule <em>Default Value Rule</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.papyrus.property.editor.xtext.umlProperty.DefaultValueRule
+   * @generated
+   */
+  public Adapter createDefaultValueRuleAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for the default case.
    * <!-- begin-user-doc -->
    * This default implementation returns null.
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java
index 525aef61a53..7273ff09d1f 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src-gen/org/eclipse/papyrus/property/editor/xtext/umlProperty/util/UmlPropertySwitch.java
@@ -145,6 +145,27 @@ public class UmlPropertySwitch<T>
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
+      case UmlPropertyPackage.REDEFINES_RULE:
+      {
+        RedefinesRule redefinesRule = (RedefinesRule)theEObject;
+        T result = caseRedefinesRule(redefinesRule);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case UmlPropertyPackage.SUBSETS_RULE:
+      {
+        SubsetsRule subsetsRule = (SubsetsRule)theEObject;
+        T result = caseSubsetsRule(subsetsRule);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case UmlPropertyPackage.DEFAULT_VALUE_RULE:
+      {
+        DefaultValueRule defaultValueRule = (DefaultValueRule)theEObject;
+        T result = caseDefaultValueRule(defaultValueRule);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
       default: return defaultCase(theEObject);
     }
   }
@@ -262,6 +283,54 @@ public class UmlPropertySwitch<T>
   }
 
   /**
+   * Returns the result of interpreting the object as an instance of '<em>Redefines Rule</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Redefines Rule</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseRedefinesRule(RedefinesRule object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Subsets Rule</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Subsets Rule</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseSubsetsRule(SubsetsRule object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Default Value Rule</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Default Value Rule</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseDefaultValueRule(DefaultValueRule object)
+  {
+    return null;
+  }
+
+  /**
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xtext b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xtext
index bd9ab2a7873..c4129157e06 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xtext
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/UmlProperty.xtext
@@ -23,7 +23,8 @@ PropertyRule:
 	(isDerived = "/")? 
 	name=ID ':' ((type=TypeRule) | "<Undefined>")
 	(multiplicity = MultiplicityRule) ? 
-	(modifiers = ModifiersRule) ? ;
+	(modifiers = ModifiersRule) ? 
+	(default = DefaultValueRule) ? ;
 
 enum VisibilityKind:
 	public = "+"
@@ -50,11 +51,21 @@ ModifiersRule:
 	'{' values += ModifierSpecification (',' values += ModifierSpecification)* '}';
 
 ModifierSpecification:
-	value = ModifierKind ;
+	value = ModifierKind 
+	| redefines = RedefinesRule 
+	| subsets = SubsetsRule ;
 
 enum ModifierKind:
 	readOnly = "readOnly" 
 	| union = "union" 
 	| ordered = "ordered" 
 	| unique = "unique" ;
-	
-\ No newline at end of file
+
+RedefinesRule :
+	'redefines' property = [uml::Property] ;
+
+SubsetsRule :
+	'subsets' property = [uml::Property] ;
+
+DefaultValueRule :
+	'=' default = STRING ;
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/scoping/UmlPropertyScopeProvider.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/scoping/UmlPropertyScopeProvider.java
index 0415b283610..e33baa4b902 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/scoping/UmlPropertyScopeProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/scoping/UmlPropertyScopeProvider.java
@@ -20,6 +20,8 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.QualifiedName;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.TypeRule;
 import org.eclipse.papyrus.property.editor.xtext.validation.UmlPropertyJavaValidator;
 import org.eclipse.uml2.uml.Classifier;
@@ -28,6 +30,7 @@ import org.eclipse.uml2.uml.ElementImport;
 import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Namespace;
 import org.eclipse.uml2.uml.PackageImport;
+import org.eclipse.uml2.uml.Property;
 import org.eclipse.xtext.gmf.glue.edit.part.PopupXtextEditorHelper;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.scoping.IScope;
@@ -63,8 +66,8 @@ public class UmlPropertyScopeProvider extends AbstractDeclarativeScopeProvider {
 				if (object instanceof Classifier)
 					allContent.add(object) ;
 			}
-			Iterable<IEObjectDescription> visibleParameterBoxes = Scopes.scopedElementsFor(allContent) ;
-			return new SimpleScope(visibleParameterBoxes) ;
+			Iterable<IEObjectDescription> visibleClassifiers = Scopes.scopedElementsFor(allContent) ;
+			return new SimpleScope(visibleClassifiers) ;
 		}
 		else {
 			// In the case where a path (qualified name prefix) has been specified,
@@ -170,4 +173,40 @@ public class UmlPropertyScopeProvider extends AbstractDeclarativeScopeProvider {
 		
 	}
 
+	/**
+	 * Rule for computing the scope of PropertyRule
+	 * @param ctx
+	 * @param ref
+	 * @return
+	 */
+	public IScope scope_RedefinesRule_property(RedefinesRule ctx, EReference ref) {
+		Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(retrieveInheritedProperties()) ;		
+		return new SimpleScope(iterableIEobjectDescription) ;
+	}
+	
+	/**
+	 * Rule for computing the scope of PropertyRule
+	 * @param ctx
+	 * @param ref
+	 * @return
+	 */
+	public IScope scope_SubsetsRule_property(SubsetsRule ctx, EReference ref) {
+		Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(retrieveInheritedProperties()) ;		
+		return new SimpleScope(iterableIEobjectDescription) ;
+	}
+	
+	public static List<Property> retrieveInheritedProperties() {
+		Property editedProperty = (Property)PopupXtextEditorHelper.context ;
+		if (editedProperty == null)
+			return null ;
+		Classifier owner = (Classifier) editedProperty.getNamespace() ;
+		List<Property> inheritedProperties = new ArrayList<Property>() ;
+		for (Classifier parent : owner.getGenerals()) {
+			for (Property p : parent.getAllAttributes()) {
+				if (! inheritedProperties.contains(p)) ;
+					inheritedProperties.add(p) ;
+			}
+		}
+		return inheritedProperties ;
+	}
 }
diff --git a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java
index 8a0922fa21f..e69dbf520e1 100644
--- a/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java
+++ b/plugins/uml/org.eclipse.papyrus.property.editor.xtext/src/org/eclipse/papyrus/property/editor/xtext/validation/UmlPropertyJavaValidator.java
@@ -14,12 +14,17 @@
 package org.eclipse.papyrus.property.editor.xtext.validation;
 
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.MultiplicityRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.RedefinesRule;
+import org.eclipse.papyrus.property.editor.xtext.umlProperty.SubsetsRule;
 import org.eclipse.papyrus.property.editor.xtext.umlProperty.UmlPropertyPackage;
+import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Namespace;
 import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Property;
 import org.eclipse.xtext.validation.Check;
  
 
@@ -34,6 +39,8 @@ public class UmlPropertyJavaValidator extends AbstractUmlPropertyJavaValidator {
 	
 	// private variables for semantic error management (See IXtextSemanticValidator from org.eclipse.xtext.gmf.glue)
 	private static boolean valid_MultiplicityRule = true ;
+	private static boolean valid_RedefinesRule = true ;
+	private static boolean valid_SubsetsRule = true ;
 	
 	public static void init(Element _contextElement) {
 		contextElement = _contextElement ;
@@ -55,7 +62,7 @@ public class UmlPropertyJavaValidator extends AbstractUmlPropertyJavaValidator {
 	}
 	
 	public static boolean validate() {
-		return valid_MultiplicityRule ;
+		return valid_MultiplicityRule && valid_RedefinesRule && valid_SubsetsRule ;
 	}
 	
 	/**
@@ -87,4 +94,141 @@ public class UmlPropertyJavaValidator extends AbstractUmlPropertyJavaValidator {
 		}
 	}
 	
+	@Check
+	public void checkRedefinesRule (RedefinesRule rule) {
+		try {
+			Property redefinedProperty = rule.getProperty() ;
+
+			String typeErrorMessage = "The type of the redefining property must conform to the type of the redefined property" ;
+			String multiplicityErrorMessage = "The multiplicity of the redefining property must be contained in the multiplicity of the redefined property" ;
+			String isDerivedErrorMessage = "Since the redefined property is derived, the redefining property must be derived" ;
+
+			EObject container = rule.eContainer() ;
+
+			while (container != null && !(container instanceof PropertyRule)) {
+				container = container.eContainer() ;
+			}
+
+			if (container == null)
+				return ;
+
+			PropertyRule propertyRule = (PropertyRule)container ;
+			Classifier typeOfRedefiningProperty = propertyRule.getType().getType() ;
+			boolean isRedefiningPropertyDerived = propertyRule.getIsDerived() != null && propertyRule.getIsDerived().equals("/") ;
+
+			valid_RedefinesRule = typeOfRedefiningProperty.conformsTo(redefinedProperty.getType()) ;
+			if (! valid_RedefinesRule) {
+				error(typeErrorMessage, rule, UmlPropertyPackage.REDEFINES_RULE__PROPERTY) ;
+				return ;
+			}
+
+			int lowerBoundOfRedefinedProperty = redefinedProperty.getLower() ;
+			int upperBoundOfRedefinedProperty = redefinedProperty.getUpper() ;
+
+			int lowerBound = 1 ;
+			int upperBound = 1 ;
+
+			if (propertyRule.getMultiplicity() != null) {
+				if (propertyRule.getMultiplicity().getBounds().size() == 1) {
+					lowerBound = propertyRule.getMultiplicity().getBounds().get(0).getValue().equals("*") ? -1 : Integer.valueOf(propertyRule.getMultiplicity().getBounds().get(0).getValue()) ;
+					upperBound = lowerBound ;
+				}
+				else if (propertyRule.getMultiplicity().getBounds().size() == 2) {
+					lowerBound = propertyRule.getMultiplicity().getBounds().get(0).getValue().equals("*") ? -1 : Integer.valueOf(propertyRule.getMultiplicity().getBounds().get(0).getValue()) ;
+					upperBound = propertyRule.getMultiplicity().getBounds().get(1).getValue().equals("*") ? -1 : Integer.valueOf(propertyRule.getMultiplicity().getBounds().get(1).getValue()) ;
+				}
+			}
+
+			valid_RedefinesRule = lowerBound >= lowerBoundOfRedefinedProperty ;
+			switch (upperBoundOfRedefinedProperty) {
+			case -1:
+				break ;
+			default:
+				valid_RedefinesRule = valid_RedefinesRule && upperBound <= upperBoundOfRedefinedProperty;
+				break;
+			}
+
+			if (! valid_RedefinesRule) {
+				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) ;
+				return ;
+			}
+
+		}
+		catch (Exception e) {
+			// An exception may be raised only in the case where the syntax for subsets is not respected.
+			// No error needs to be generated (the syntax error is automatically handled by XText)
+		}
+	}
+	
+	@Check
+	public void checkSubsetsRule (SubsetsRule rule) {
+		try {
+			Property subsettedProperty = rule.getProperty() ;
+
+			String typeErrorMessage = "The type of the subsetting property must conform to the type of the subsetted property" ;
+			String multiplicityErrorMessage = "The multiplicity of the subsetting property must be contained in the multiplicity of the subsetted property" ;
+
+			EObject container = rule.eContainer() ;
+
+			while (container != null && !(container instanceof PropertyRule)) {
+				container = container.eContainer() ;
+			}
+
+			if (container == null)
+				return ;
+
+			PropertyRule propertyRule = (PropertyRule)container ;
+			Classifier typeOfSubsettingProperty = propertyRule.getType().getType() ;
+
+			valid_SubsetsRule = typeOfSubsettingProperty.conformsTo(subsettedProperty.getType()) ;
+			if (! valid_SubsetsRule) {
+				error(typeErrorMessage, rule, UmlPropertyPackage.SUBSETS_RULE__PROPERTY) ;
+				return ;
+			}
+
+			int lowerBoundOfRedefinedProperty = subsettedProperty.getLower() ;
+			int upperBoundOfRedefinedProperty = subsettedProperty.getUpper() ;
+
+			int lowerBound = 1 ;
+			int upperBound = 1 ;
+
+			if (propertyRule.getMultiplicity() != null) {
+				if (propertyRule.getMultiplicity().getBounds().size() == 1) {
+					lowerBound = propertyRule.getMultiplicity().getBounds().get(0).getValue().equals("*") ? -1 : Integer.valueOf(propertyRule.getMultiplicity().getBounds().get(0).getValue()) ;
+					upperBound = lowerBound ;
+				}
+				else if (propertyRule.getMultiplicity().getBounds().size() == 2) {
+					lowerBound = propertyRule.getMultiplicity().getBounds().get(0).getValue().equals("*") ? -1 : Integer.valueOf(propertyRule.getMultiplicity().getBounds().get(0).getValue()) ;
+					upperBound = propertyRule.getMultiplicity().getBounds().get(1).getValue().equals("*") ? -1 : Integer.valueOf(propertyRule.getMultiplicity().getBounds().get(1).getValue()) ;
+				}
+			}
+
+			valid_SubsetsRule = lowerBound >= lowerBoundOfRedefinedProperty ;
+			switch (upperBoundOfRedefinedProperty) {
+			case -1:
+				break ;
+			default:
+				valid_SubsetsRule = valid_SubsetsRule && upperBound <= upperBoundOfRedefinedProperty;
+				break;
+			}
+
+			if (! valid_SubsetsRule) {
+				error(multiplicityErrorMessage, rule, UmlPropertyPackage.SUBSETS_RULE__PROPERTY) ;
+				return ;
+			}
+			
+
+		}
+		catch (Exception e) {
+			// An exception may be raised only in the case where the syntax for subsets is not respected.
+			// No error needs to be generated (the syntax error is automatically handled by XText)
+		}
+	}
 }
author	vlorenzo	2011-01-27 10:51:40 +0000
committer	vlorenzo	2011-01-27 10:51:40 +0000
commit	fae425850d7ac2c339e782a58e6869a3af03c096 (patch)
tree	2b144dac66f8bcad77f14fa125b016c510c80a4c
parent	ac1a33001813b1e2dc2c177db9c0ccf40aac0046 (diff)
download	org.eclipse.papyrus-fae425850d7ac2c339e782a58e6869a3af03c096.tar.gz org.eclipse.papyrus-fae425850d7ac2c339e782a58e6869a3af03c096.tar.xz org.eclipse.papyrus-fae425850d7ac2c339e782a58e6869a3af03c096.zip