417396: [CSS] The CSS Engine shall support label visibility & mask

https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396

- Bypass preferences initialization for Labels and Compartments when CSS
are installed
- Regenerate Class diagram to properly initialize preferences for
renamed compartments
- Update the templates to avoid forcing the "showTitle" attribute of new
compartments
- Fix bug in the CSSListCompartment, which didn't properly support
"showTitle"

55 files changed, 256 insertions, 220 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt
index fd570b7ccf5..ca7aefa4505 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt
@@ -282,7 +282,6 @@ public class «notationViewProviderClassName»«EXPAND xpt::providers::ViewProvi
 		

 		if (hasTitle) {

 			org.eclipse.gmf.runtime.notation.TitleStyle ts = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createTitleStyle();

-			ts.setShowTitle(true);

 			rv.getStyles().add(ts);

 		}

 		if (canSort) {

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
index dd49653d898..0440760a294 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/resources/base.css
@@ -17,7 +17,7 @@ unwished behaviors, related to the base implementation (GMF, Papyrus...)
 

 */

 

-Compartment[type="compartment_shape_display"]{

+Compartment[kind=symbol]{

 	visible:false;

 }

 

@@ -26,6 +26,7 @@ Compartment[type="compartment_shape_display"]{
  	fontName:"Segoe UI"; /* Default font used in Papyrus. It is different from the GMF default */

  	fontColor:black;

  	transparency:0; /* Default transparency in GMF Notation is -1. -1 is recognized as "Unchanged" by the GMF NodeFigure. e.g. changing from 50 to -1 ("reset") does nothing */

+ 	showTitle:false;

 }

 

 /* For most Activity diagram nodes (e.g. initial, final, fork, decision, ...), 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
index 26205225212..4bbe2844839 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
@@ -20,16 +20,20 @@ import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
 import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
 import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
 import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSTitleStyle;
 import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
 import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSTitleStyleDelegate;
 import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;
 
-public class CSSListCompartmentImpl extends ListCompartmentImpl implements CSSDrawerStyle {
+public class CSSListCompartmentImpl extends ListCompartmentImpl implements CSSDrawerStyle, CSSTitleStyle {
 
 	protected ExtendedCSSEngine engine;
 
 	private CSSDrawerStyle drawerStyle;
 
+	private CSSTitleStyle titleStyle;
+
 	private CSSView cssView;
 
 	protected CSSDrawerStyle getDrawerStyle() {
@@ -39,6 +43,13 @@ public class CSSListCompartmentImpl extends ListCompartmentImpl implements CSSDr
 		return drawerStyle;
 	}
 
+	protected CSSTitleStyle getTitleStyle() {
+		if(titleStyle == null) {
+			titleStyle = new CSSTitleStyleDelegate(this, getEngine());
+		}
+		return titleStyle;
+	}
+
 	protected ExtendedCSSEngine getEngine() {
 		if(engine == null) {
 			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
@@ -72,10 +83,24 @@ public class CSSListCompartmentImpl extends ListCompartmentImpl implements CSSDr
 
 	@Override
 	public boolean isCollapsed() {
-		//return super.isCollapsed();
 		return isCSSCollapsed();
 	}
 
+	public boolean isCSSShowTitle() {
+		boolean value = super.isShowTitle();
+
+		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getTitleStyle_ShowTitle(), value)) {
+			return value;
+		} else {
+			return getTitleStyle().isCSSShowTitle();
+		}
+	}
+
+	@Override
+	public boolean isShowTitle() {
+		return isCSSShowTitle();
+	}
+
 	@Override
 	public boolean isVisible() {
 		return isCSSVisible();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
index f99e36a3ab5..1d4870661b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
@@ -103,6 +103,11 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart implements ITe
 	private List<?> parserElements;

 

 	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

 	 * 

 	 * @generated

@@ -204,6 +209,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart implements ITe
 	public void setLabel(WrappingLabel figure) {

 		unregisterVisuals();

 		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

 		registerVisuals();

 		refreshVisuals();

 	}

@@ -253,8 +259,8 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart implements ITe
 		if(parserElement != null && getParser() != null) {

 			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if(text == null) {

-			text = "";

+		if(text == null || text.length() == 0) {

+			text = defaultText;

 		}

 		return text;

 	}

@@ -297,7 +303,6 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart implements ITe
 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

-			@SuppressWarnings("rawtypes")

 			public String isValid(final Object value) {

 				if(value instanceof String) {

 					final EObject element = getParserElement();

@@ -305,7 +310,6 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart implements ITe
 					try {

 						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

 

-							@SuppressWarnings("unchecked")

 							public void run() {

 								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

 							}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
index b9599675f6a..5a466431df9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class AssociationClassAttributeCompartmentCanonicalEditPolicy extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassAttributeCompartment_7034SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassAttributes_7034SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class AssociationClassAttributeCompartmentCanonicalEditPolicy extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassAttributeCompartment_7034SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassAttributes_7034SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
index 04bb1bc7fb4..cfaa4d597be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class AssociationClassNestedClassifierCompartmentCanonicalEditPolicy exte
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassNestedClassifierCompartment_7037SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassNestedclassifiers_7037SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class AssociationClassNestedClassifierCompartmentCanonicalEditPolicy exte
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassNestedClassifierCompartment_7037SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassNestedclassifiers_7037SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
index 1c7cf2d98ea..8feec1ab225 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class AssociationClassOperationCompartmentCanonicalEditPolicy extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassOperationCompartment_7036SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassOperations_7036SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class AssociationClassOperationCompartmentCanonicalEditPolicy extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassOperationCompartment_7036SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getAssociationClassOperations_7036SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
index dc62dfcc70b..61ea7da11a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class ClassAttributeCompartmentCanonicalEditPolicy extends CanonicalEditP
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributeCompartment_7017SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributes_7017SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class ClassAttributeCompartmentCanonicalEditPolicy extends CanonicalEditP
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributeCompartment_7017SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributes_7017SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
index fe8f84eec44..bc5d1999954 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class ClassAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEdi
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributeCompartment_7011SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributes_7011SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class ClassAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEdi
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributeCompartment_7011SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassAttributes_7011SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
index 46302795cd4..21543c0dce8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -74,7 +74,7 @@ public class ClassNestedClassifierCompartmentCanonicalEditPolicy extends Canonic
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedClassifierCompartment_7019SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedclassifiers_7019SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -113,7 +113,7 @@ public class ClassNestedClassifierCompartmentCanonicalEditPolicy extends Canonic
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedClassifierCompartment_7019SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedclassifiers_7019SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
index 8cf5f8f00fb..bf8486fb50a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
@@ -74,7 +74,7 @@ public class ClassNestedClassifierCompartmentCanonicalEditPolicyCN extends Canon
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedClassifierCompartment_7013SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedclassifiers_7013SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -113,7 +113,7 @@ public class ClassNestedClassifierCompartmentCanonicalEditPolicyCN extends Canon
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedClassifierCompartment_7013SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassNestedclassifiers_7013SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
index 1dfd48bec11..f43ce70d6db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
@@ -82,7 +82,7 @@ public class ClassOperationCompartmentCanonicalEditPolicy extends CanonicalEditP
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperationCompartment_7018SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperations_7018SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -112,7 +112,7 @@ public class ClassOperationCompartmentCanonicalEditPolicy extends CanonicalEditP
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperationCompartment_7018SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperations_7018SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
index fe35d781ecf..57c503c60d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
@@ -82,7 +82,7 @@ public class ClassOperationCompartmentCanonicalEditPolicyCN extends CanonicalEdi
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperationCompartment_7012SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperations_7012SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -112,7 +112,7 @@ public class ClassOperationCompartmentCanonicalEditPolicyCN extends CanonicalEdi
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperationCompartment_7012SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassOperations_7012SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
index 1196f958c0d..842cba5ba4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class ComponentAttributeCompartmentCanonicalEditPolicy extends CanonicalE
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributeCompartment_7002SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributes_7002SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class ComponentAttributeCompartmentCanonicalEditPolicy extends CanonicalE
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributeCompartment_7002SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributes_7002SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
index 9407b49ca00..7f31ea87912 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class ComponentAttributeCompartmentCanonicalEditPolicyCN extends Canonica
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributeCompartment_7023SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributes_7023SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class ComponentAttributeCompartmentCanonicalEditPolicyCN extends Canonica
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributeCompartment_7023SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentAttributes_7023SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
index c8d2dd2ec08..adbabf93cb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -74,7 +74,7 @@ public class ComponentNestedClassifierCompartmentCanonicalEditPolicy extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedClassifierCompartment_7004SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedclassifiers_7004SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -113,7 +113,7 @@ public class ComponentNestedClassifierCompartmentCanonicalEditPolicy extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedClassifierCompartment_7004SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedclassifiers_7004SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
index 5c3a7243605..677bf5ccba0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
@@ -74,7 +74,7 @@ public class ComponentNestedClassifierCompartmentCanonicalEditPolicyCN extends C
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedClassifierCompartment_7025SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedclassifiers_7025SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -113,7 +113,7 @@ public class ComponentNestedClassifierCompartmentCanonicalEditPolicyCN extends C
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedClassifierCompartment_7025SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentNestedclassifiers_7025SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
index f681d712190..de8be226671 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
@@ -82,7 +82,7 @@ public class ComponentOperationCompartmentCanonicalEditPolicy extends CanonicalE
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperationCompartment_7003SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperations_7003SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -112,7 +112,7 @@ public class ComponentOperationCompartmentCanonicalEditPolicy extends CanonicalE
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperationCompartment_7003SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperations_7003SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
index 2c0ced6cd38..312e846af33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
@@ -82,7 +82,7 @@ public class ComponentOperationCompartmentCanonicalEditPolicyCN extends Canonica
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperationCompartment_7024SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperations_7024SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -112,7 +112,7 @@ public class ComponentOperationCompartmentCanonicalEditPolicyCN extends Canonica
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperationCompartment_7024SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getComponentOperations_7024SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
index 5a28f87623d..b8e8ebef9a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class DataTypeAttributeCompartmentCanonicalEditPolicy extends CanonicalEd
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributeCompartment_7020SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7020SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class DataTypeAttributeCompartmentCanonicalEditPolicy extends CanonicalEd
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributeCompartment_7020SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7020SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
index fd00a7f3760..da55d277ab7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class DataTypeAttributeCompartmentCanonicalEditPolicyCN extends Canonical
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributeCompartment_7032SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7032SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class DataTypeAttributeCompartmentCanonicalEditPolicyCN extends Canonical
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributeCompartment_7032SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7032SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
index 24416de1ecd..3331baae1f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class DataTypeOperationCompartmentCanonicalEditPolicy extends CanonicalEd
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperationCompartment_7021SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperations_7021SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class DataTypeOperationCompartmentCanonicalEditPolicy extends CanonicalEd
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperationCompartment_7021SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperations_7021SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
index 50781b2ea0c..4eef0d9c2c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class DataTypeOperationCompartmentCanonicalEditPolicyCN extends Canonical
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperationCompartment_7033SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperations_7033SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class DataTypeOperationCompartmentCanonicalEditPolicyCN extends Canonical
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperationCompartment_7033SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getDataTypeOperations_7033SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
index e30eb905ac0..f94cdea9414 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class InstanceSpecificationSlotCompartmentCanonicalEditPolicy extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlotCompartment_7001SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlots_7001SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class InstanceSpecificationSlotCompartmentCanonicalEditPolicy extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlotCompartment_7001SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlots_7001SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
index 8f807177762..1a46fbdac9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN extends C
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlotCompartment_7035SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlots_7035SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN extends C
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlotCompartment_7035SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInstanceSpecificationSlots_7035SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
index 721718118b4..2a3862dc431 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class InterfaceAttributeCompartmentCanonicalEditPolicy extends CanonicalE
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributeCompartment_7006SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributes_7006SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class InterfaceAttributeCompartmentCanonicalEditPolicy extends CanonicalE
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributeCompartment_7006SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributes_7006SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
index 9c59ed158b9..3c937cefa7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class InterfaceAttributeCompartmentCanonicalEditPolicyCN extends Canonica
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributeCompartment_7027SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributes_7027SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class InterfaceAttributeCompartmentCanonicalEditPolicyCN extends Canonica
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributeCompartment_7027SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceAttributes_7027SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
index 74a9003692c..627daa3a495 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -74,7 +74,7 @@ public class InterfaceNestedClassifierCompartmentCanonicalEditPolicy extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedClassifierCompartment_7008SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedclassifiers_7008SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -113,7 +113,7 @@ public class InterfaceNestedClassifierCompartmentCanonicalEditPolicy extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedClassifierCompartment_7008SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedclassifiers_7008SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
index 2bbb3a68b47..8398edfbc68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
@@ -74,7 +74,7 @@ public class InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN extends C
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedClassifierCompartment_7029SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedclassifiers_7029SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -113,7 +113,7 @@ public class InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN extends C
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedClassifierCompartment_7029SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceNestedclassifiers_7029SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
index b188808452d..3248b150c8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
@@ -82,7 +82,7 @@ public class InterfaceOperationCompartmentCanonicalEditPolicy extends CanonicalE
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperationCompartment_7007SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperations_7007SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -112,7 +112,7 @@ public class InterfaceOperationCompartmentCanonicalEditPolicy extends CanonicalE
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperationCompartment_7007SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperations_7007SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
index c214e4ba1e6..cbe6e2fc1cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
@@ -82,7 +82,7 @@ public class InterfaceOperationCompartmentCanonicalEditPolicyCN extends Canonica
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperationCompartment_7028SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperations_7028SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -112,7 +112,7 @@ public class InterfaceOperationCompartmentCanonicalEditPolicyCN extends Canonica
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperationCompartment_7028SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceOperations_7028SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
index 28994950125..8c044e7640c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
@@ -93,7 +93,7 @@ public class ModelPackageableElementCompartmentCanonicalEditPolicyCN extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackageableElementCompartment_7030SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackagedelements_7030SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -139,7 +139,7 @@ public class ModelPackageableElementCompartmentCanonicalEditPolicyCN extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackageableElementCompartment_7030SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackagedelements_7030SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
index fa726df41b2..23d4cce03f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
@@ -93,7 +93,7 @@ public class ModelPackageableElementCompartmentCanonicalEditPolicyTN extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackageableElementCompartment_7009SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackagedelements_7009SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -139,7 +139,7 @@ public class ModelPackageableElementCompartmentCanonicalEditPolicyTN extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackageableElementCompartment_7009SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getModelPackagedelements_7009SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
index e7b053ac850..e58562a4def 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
@@ -93,7 +93,7 @@ public class PackagePackageableElementCompartmentCanonicalEditPolicy extends Can
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackageableElementCompartment_7016SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackagedelements_7016SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -139,7 +139,7 @@ public class PackagePackageableElementCompartmentCanonicalEditPolicy extends Can
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackageableElementCompartment_7016SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackagedelements_7016SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
index ecb45078a74..6385d859756 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
@@ -93,7 +93,7 @@ public class PackagePackageableElementCompartmentCanonicalEditPolicyCN extends C
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackageableElementCompartment_7010SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackagedelements_7010SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -139,7 +139,7 @@ public class PackagePackageableElementCompartmentCanonicalEditPolicyCN extends C
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackageableElementCompartment_7010SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPackagePackagedelements_7010SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java
index 0f37497b3f7..e543fb5ab64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class PrimitiveTypeAttributeCompartmentCanonicalEditPolicy extends Canoni
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributeCompartment_7039SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributes_7039SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class PrimitiveTypeAttributeCompartmentCanonicalEditPolicy extends Canoni
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributeCompartment_7039SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributes_7039SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java
index ee6be77dfc3..cb9b6d7b7a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN extends Cano
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributeCompartment_7041SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributes_7041SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN extends Cano
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributeCompartment_7041SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeAttributes_7041SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java
index b4218fb28d1..31ee2341ac2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class PrimitiveTypeOperationCompartmentCanonicalEditPolicy extends Canoni
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperationCompartment_7040SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperations_7040SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class PrimitiveTypeOperationCompartmentCanonicalEditPolicy extends Canoni
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperationCompartment_7040SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperations_7040SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java
index 11729084b6e..d30e1a4a8c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN extends Cano
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperationCompartment_7042SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperations_7042SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN extends Cano
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperationCompartment_7042SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getPrimitiveTypeOperations_7042SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
index a66a89f5ef2..38fff31e68b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
@@ -69,7 +69,7 @@ public class SignalAttributeCompartmentCanonicalEditPolicy extends CanonicalEdit
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributeCompartment_7005SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributes_7005SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class SignalAttributeCompartmentCanonicalEditPolicy extends CanonicalEdit
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributeCompartment_7005SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributes_7005SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
index c190d88111d..395a35329d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
@@ -69,7 +69,7 @@ public class SignalAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEd
 	protected List getSemanticChildrenList() {

 		View viewObject = (View)getHost().getModel();

 		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributeCompartment_7026SemanticChildren(viewObject);

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributes_7026SemanticChildren(viewObject);

 		for(UMLNodeDescriptor d : childDescriptors) {

 			result.add(d.getModelElement());

 		}

@@ -98,7 +98,7 @@ public class SignalAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEd
 			return;

 		}

 		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributeCompartment_7026SemanticChildren((View)getHost().getModel());

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getSignalAttributes_7026SemanticChildren((View)getHost().getModel());

 		LinkedList<View> orphaned = new LinkedList<View>();

 		// we care to check only views we recognize as ours

 		LinkedList<View> knownViewChildren = new LinkedList<View>();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
index 312763f7b64..f73a43e5cda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
@@ -118,83 +118,83 @@ public class UMLDiagramUpdater {
 		case DataTypeEditPartCN.VISUAL_ID:

 			return getDataType_3027SemanticChildren(view);

 		case ClassAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getClassAttributeCompartment_7011SemanticChildren(view);

+			return getClassAttributes_7011SemanticChildren(view);

 		case ClassOperationCompartmentEditPartCN.VISUAL_ID:

-			return getClassOperationCompartment_7012SemanticChildren(view);

+			return getClassOperations_7012SemanticChildren(view);

 		case ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			return getClassNestedClassifierCompartment_7013SemanticChildren(view);

+			return getClassNestedclassifiers_7013SemanticChildren(view);

 		case ComponentAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getComponentAttributeCompartment_7023SemanticChildren(view);

+			return getComponentAttributes_7023SemanticChildren(view);

 		case ComponentOperationCompartmentEditPartCN.VISUAL_ID:

-			return getComponentOperationCompartment_7024SemanticChildren(view);

+			return getComponentOperations_7024SemanticChildren(view);

 		case ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			return getComponentNestedClassifierCompartment_7025SemanticChildren(view);

+			return getComponentNestedclassifiers_7025SemanticChildren(view);

 		case SignalAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getSignalAttributeCompartment_7026SemanticChildren(view);

+			return getSignalAttributes_7026SemanticChildren(view);

 		case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getInterfaceAttributeCompartment_7027SemanticChildren(view);

+			return getInterfaceAttributes_7027SemanticChildren(view);

 		case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-			return getInterfaceOperationCompartment_7028SemanticChildren(view);

+			return getInterfaceOperations_7028SemanticChildren(view);

 		case InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID:

-			return getInterfaceNestedClassifierCompartment_7029SemanticChildren(view);

+			return getInterfaceNestedclassifiers_7029SemanticChildren(view);

 		case PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getPrimitiveTypeAttributeCompartment_7041SemanticChildren(view);

+			return getPrimitiveTypeAttributes_7041SemanticChildren(view);

 		case PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			return getPrimitiveTypeOperationCompartment_7042SemanticChildren(view);

+			return getPrimitiveTypeOperations_7042SemanticChildren(view);

 		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			return getDataTypeAttributeCompartment_7032SemanticChildren(view);

+			return getDataTypeAttributes_7032SemanticChildren(view);

 		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			return getDataTypeOperationCompartment_7033SemanticChildren(view);

+			return getDataTypeOperations_7033SemanticChildren(view);

 		case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-			return getModelPackageableElementCompartment_7030SemanticChildren(view);

+			return getModelPackagedelements_7030SemanticChildren(view);

 		case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:

-			return getPackagePackageableElementCompartment_7010SemanticChildren(view);

+			return getPackagePackagedelements_7010SemanticChildren(view);

 		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

 			return getEnumerationEnumerationLiteralCompartment_7031SemanticChildren(view);

 		case InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID:

-			return getInstanceSpecificationSlotCompartment_7035SemanticChildren(view);

+			return getInstanceSpecificationSlots_7035SemanticChildren(view);

 		case ClassAttributeCompartmentEditPart.VISUAL_ID:

-			return getClassAttributeCompartment_7017SemanticChildren(view);

+			return getClassAttributes_7017SemanticChildren(view);

 		case ClassOperationCompartmentEditPart.VISUAL_ID:

-			return getClassOperationCompartment_7018SemanticChildren(view);

+			return getClassOperations_7018SemanticChildren(view);

 		case ClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getClassNestedClassifierCompartment_7019SemanticChildren(view);

+			return getClassNestedclassifiers_7019SemanticChildren(view);

 		case ComponentAttributeCompartmentEditPart.VISUAL_ID:

-			return getComponentAttributeCompartment_7002SemanticChildren(view);

+			return getComponentAttributes_7002SemanticChildren(view);

 		case ComponentOperationCompartmentEditPart.VISUAL_ID:

-			return getComponentOperationCompartment_7003SemanticChildren(view);

+			return getComponentOperations_7003SemanticChildren(view);

 		case ComponentNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getComponentNestedClassifierCompartment_7004SemanticChildren(view);

+			return getComponentNestedclassifiers_7004SemanticChildren(view);

 		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-			return getInterfaceAttributeCompartment_7006SemanticChildren(view);

+			return getInterfaceAttributes_7006SemanticChildren(view);

 		case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-			return getInterfaceOperationCompartment_7007SemanticChildren(view);

+			return getInterfaceOperations_7007SemanticChildren(view);

 		case InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getInterfaceNestedClassifierCompartment_7008SemanticChildren(view);

+			return getInterfaceNestedclassifiers_7008SemanticChildren(view);

 		case PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID:

-			return getPrimitiveTypeAttributeCompartment_7039SemanticChildren(view);

+			return getPrimitiveTypeAttributes_7039SemanticChildren(view);

 		case PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID:

-			return getPrimitiveTypeOperationCompartment_7040SemanticChildren(view);

+			return getPrimitiveTypeOperations_7040SemanticChildren(view);

 		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-			return getDataTypeAttributeCompartment_7020SemanticChildren(view);

+			return getDataTypeAttributes_7020SemanticChildren(view);

 		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-			return getDataTypeOperationCompartment_7021SemanticChildren(view);

+			return getDataTypeOperations_7021SemanticChildren(view);

 		case AssociationClassAttributeCompartmentEditPart.VISUAL_ID:

-			return getAssociationClassAttributeCompartment_7034SemanticChildren(view);

+			return getAssociationClassAttributes_7034SemanticChildren(view);

 		case InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID:

-			return getInstanceSpecificationSlotCompartment_7001SemanticChildren(view);

+			return getInstanceSpecificationSlots_7001SemanticChildren(view);

 		case SignalAttributeCompartmentEditPart.VISUAL_ID:

-			return getSignalAttributeCompartment_7005SemanticChildren(view);

+			return getSignalAttributes_7005SemanticChildren(view);

 		case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:

-			return getModelPackageableElementCompartment_7009SemanticChildren(view);

+			return getModelPackagedelements_7009SemanticChildren(view);

 		case PackagePackageableElementCompartmentEditPart.VISUAL_ID:

-			return getPackagePackageableElementCompartment_7016SemanticChildren(view);

+			return getPackagePackagedelements_7016SemanticChildren(view);

 		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

 			return getEnumerationEnumerationLiteralCompartment_7015SemanticChildren(view);

 		case AssociationClassOperationCompartmentEditPart.VISUAL_ID:

-			return getAssociationClassOperationCompartment_7036SemanticChildren(view);

+			return getAssociationClassOperations_7036SemanticChildren(view);

 		case AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID:

-			return getAssociationClassNestedClassifierCompartment_7037SemanticChildren(view);

+			return getAssociationClassNestedclassifiers_7037SemanticChildren(view);

 		case RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

 			return getRedefinableTemplateSignatureTemplateParameterCompartment_7014SemanticChildren(view);

 		case TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID:

@@ -595,7 +595,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getClassAttributeCompartment_7011SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getClassAttributes_7011SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -619,7 +619,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getClassOperationCompartment_7012SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getClassOperations_7012SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -651,7 +651,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getClassNestedClassifierCompartment_7013SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getClassNestedclassifiers_7013SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -695,7 +695,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getComponentAttributeCompartment_7023SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getComponentAttributes_7023SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -719,7 +719,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getComponentOperationCompartment_7024SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getComponentOperations_7024SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -751,7 +751,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getComponentNestedClassifierCompartment_7025SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getComponentNestedclassifiers_7025SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -795,7 +795,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getSignalAttributeCompartment_7026SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getSignalAttributes_7026SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -819,7 +819,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInterfaceAttributeCompartment_7027SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInterfaceAttributes_7027SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -843,7 +843,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInterfaceOperationCompartment_7028SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInterfaceOperations_7028SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -875,7 +875,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInterfaceNestedClassifierCompartment_7029SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInterfaceNestedclassifiers_7029SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -919,7 +919,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeAttributeCompartment_7041SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getPrimitiveTypeAttributes_7041SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -943,7 +943,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeOperationCompartment_7042SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getPrimitiveTypeOperations_7042SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -967,7 +967,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getDataTypeAttributeCompartment_7032SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getDataTypeAttributes_7032SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -991,7 +991,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getDataTypeOperationCompartment_7033SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getDataTypeOperations_7033SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1015,7 +1015,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getModelPackageableElementCompartment_7030SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getModelPackagedelements_7030SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1091,7 +1091,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getPackagePackageableElementCompartment_7010SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getPackagePackagedelements_7010SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1191,7 +1191,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInstanceSpecificationSlotCompartment_7035SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInstanceSpecificationSlots_7035SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1215,7 +1215,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getClassAttributeCompartment_7017SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getClassAttributes_7017SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1239,7 +1239,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getClassOperationCompartment_7018SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getClassOperations_7018SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1271,7 +1271,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getClassNestedClassifierCompartment_7019SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getClassNestedclassifiers_7019SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1315,7 +1315,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getComponentAttributeCompartment_7002SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getComponentAttributes_7002SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1339,7 +1339,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getComponentOperationCompartment_7003SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getComponentOperations_7003SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1371,7 +1371,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getComponentNestedClassifierCompartment_7004SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getComponentNestedclassifiers_7004SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1415,7 +1415,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInterfaceAttributeCompartment_7006SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInterfaceAttributes_7006SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1439,7 +1439,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInterfaceOperationCompartment_7007SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInterfaceOperations_7007SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1471,7 +1471,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInterfaceNestedClassifierCompartment_7008SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInterfaceNestedclassifiers_7008SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1515,7 +1515,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeAttributeCompartment_7039SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getPrimitiveTypeAttributes_7039SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1539,7 +1539,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getPrimitiveTypeOperationCompartment_7040SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getPrimitiveTypeOperations_7040SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1563,7 +1563,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getDataTypeAttributeCompartment_7020SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getDataTypeAttributes_7020SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1587,7 +1587,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getDataTypeOperationCompartment_7021SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getDataTypeOperations_7021SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1611,7 +1611,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getAssociationClassAttributeCompartment_7034SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getAssociationClassAttributes_7034SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1635,7 +1635,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getInstanceSpecificationSlotCompartment_7001SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getInstanceSpecificationSlots_7001SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1659,7 +1659,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getSignalAttributeCompartment_7005SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getSignalAttributes_7005SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1683,7 +1683,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getModelPackageableElementCompartment_7009SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getModelPackagedelements_7009SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1759,7 +1759,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getPackagePackageableElementCompartment_7016SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getPackagePackagedelements_7016SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1859,7 +1859,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getAssociationClassOperationCompartment_7036SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getAssociationClassOperations_7036SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

@@ -1883,7 +1883,7 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

-	public static List<UMLNodeDescriptor> getAssociationClassNestedClassifierCompartment_7037SemanticChildren(View view) {

+	public static List<UMLNodeDescriptor> getAssociationClassNestedclassifiers_7037SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
index a32f32ffb53..0ca9990ab22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class AssociationClassPreferencePage extends AbstractPapyrusNodePreferenc
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment", "NestedClassifierCompartment" };

+	public static final String compartments[] = { "attributes", "operations", "nested classifiers" };

 

 	/**

 	 * @generated

@@ -89,9 +89,9 @@ public class AssociationClassPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

-		map.put("OperationCompartment", Boolean.TRUE);

-		map.put("NestedClassifierCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

+		map.put("operations", Boolean.TRUE);

+		map.put("nested classifiers", Boolean.TRUE);

 		return map;

 	}

 

@@ -100,9 +100,9 @@ public class AssociationClassPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

-		map.put("OperationCompartment", Boolean.FALSE);

-		map.put("NestedClassifierCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

+		map.put("operations", Boolean.FALSE);

+		map.put("nested classifiers", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
index dc5905080cf..8806165dc4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class ClassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment", "NestedClassifierCompartment" };

+	public static final String compartments[] = { "attributes", "operations", "nested classifiers" };

 

 	/**

 	 * @generated

@@ -89,9 +89,9 @@ public class ClassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

-		map.put("OperationCompartment", Boolean.TRUE);

-		map.put("NestedClassifierCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

+		map.put("operations", Boolean.TRUE);

+		map.put("nested classifiers", Boolean.TRUE);

 		return map;

 	}

 

@@ -100,9 +100,9 @@ public class ClassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

-		map.put("OperationCompartment", Boolean.FALSE);

-		map.put("NestedClassifierCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

+		map.put("operations", Boolean.FALSE);

+		map.put("nested classifiers", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
index 2739b2b43f2..a208b429e8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment", "NestedClassifierCompartment" };

+	public static final String compartments[] = { "attributes", "operations", "nested classifiers" };

 

 	/**

 	 * @generated

@@ -89,9 +89,9 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

-		map.put("OperationCompartment", Boolean.TRUE);

-		map.put("NestedClassifierCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

+		map.put("operations", Boolean.TRUE);

+		map.put("nested classifiers", Boolean.TRUE);

 		return map;

 	}

 

@@ -100,9 +100,9 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

-		map.put("OperationCompartment", Boolean.FALSE);

-		map.put("NestedClassifierCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

+		map.put("operations", Boolean.FALSE);

+		map.put("nested classifiers", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
index 234e5e3a147..56173dbc468 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment" };

+	public static final String compartments[] = { "attributes", "operations" };

 

 	/**

 	 * @generated

@@ -89,8 +89,8 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

-		map.put("OperationCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

+		map.put("operations", Boolean.TRUE);

 		return map;

 	}

 

@@ -99,8 +99,8 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

-		map.put("OperationCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

+		map.put("operations", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
index 0fa0c0bfa2a..79e281d4684 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
index 5f19b969893..8f8edf5fb5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class InstanceSpecificationPreferencePage extends AbstractPapyrusNodePref
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "SlotCompartment" };

+	public static final String compartments[] = { "slots" };

 

 	/**

 	 * @generated

@@ -89,7 +89,7 @@ public class InstanceSpecificationPreferencePage extends AbstractPapyrusNodePref
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("SlotCompartment", Boolean.TRUE);

+		map.put("slots", Boolean.TRUE);

 		return map;

 	}

 

@@ -98,7 +98,7 @@ public class InstanceSpecificationPreferencePage extends AbstractPapyrusNodePref
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("SlotCompartment", Boolean.FALSE);

+		map.put("slots", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
index a89c1544eb8..75ca2ad52ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment", "NestedClassifierCompartment" };

+	public static final String compartments[] = { "attributes", "operations", "nested classifiers" };

 

 	/**

 	 * @generated

@@ -89,9 +89,9 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

-		map.put("OperationCompartment", Boolean.TRUE);

-		map.put("NestedClassifierCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

+		map.put("operations", Boolean.TRUE);

+		map.put("nested classifiers", Boolean.TRUE);

 		return map;

 	}

 

@@ -100,9 +100,9 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

-		map.put("OperationCompartment", Boolean.FALSE);

-		map.put("NestedClassifierCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

+		map.put("operations", Boolean.FALSE);

+		map.put("nested classifiers", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
index 9a6cf5113ff..c3008dfda14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "PackageableElementCompartment" };

+	public static final String compartments[] = { "packaged elements" };

 

 	/**

 	 * @generated

@@ -89,7 +89,7 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("PackageableElementCompartment", Boolean.TRUE);

+		map.put("packaged elements", Boolean.TRUE);

 		return map;

 	}

 

@@ -98,7 +98,7 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("PackageableElementCompartment", Boolean.FALSE);

+		map.put("packaged elements", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
index ecc431bc00f..7e80571aa67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "PackageableElementCompartment" };

+	public static final String compartments[] = { "packaged elements" };

 

 	/**

 	 * @generated

@@ -89,7 +89,7 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("PackageableElementCompartment", Boolean.TRUE);

+		map.put("packaged elements", Boolean.TRUE);

 		return map;

 	}

 

@@ -98,7 +98,7 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("PackageableElementCompartment", Boolean.FALSE);

+		map.put("packaged elements", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
index 21b84b66183..b852ad6d37d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment" };

+	public static final String compartments[] = { "attributes", "operations" };

 

 	/**

 	 * @generated

@@ -89,8 +89,8 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

-		map.put("OperationCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

+		map.put("operations", Boolean.TRUE);

 		return map;

 	}

 

@@ -99,8 +99,8 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

-		map.put("OperationCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

+		map.put("operations", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
index 249729a5382..8888d5d4ecc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
@@ -16,8 +16,8 @@ import java.util.Map;
 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -29,7 +29,7 @@ public class SignalPreferencePage extends AbstractPapyrusNodePreferencePage {
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "AttributeCompartment" };

+	public static final String compartments[] = { "attributes" };

 

 	/**

 	 * @generated

@@ -89,7 +89,7 @@ public class SignalPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.TRUE);

+		map.put("attributes", Boolean.TRUE);

 		return map;

 	}

 

@@ -98,7 +98,7 @@ public class SignalPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("AttributeCompartment", Boolean.FALSE);

+		map.put("attributes", Boolean.FALSE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
index 11d6f2879b8..a5e1abb5eec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
@@ -53,8 +53,8 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -2831,7 +2831,6 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

 		if(hasTitle) {

 			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

-			ts.setShowTitle(true);

 			rv.getStyles().add(ts);

 		}

 		if(canSort) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java
index 873da5338e4..6db4bcc3baf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java
@@ -43,9 +43,9 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.FontData;
@@ -246,6 +246,10 @@ public class PreferenceInitializerForElementHelper {
 	 *        the name to the element
 	 */
 	public static void initCompartmentsStatusFromPrefs(View view, final IPreferenceStore store, String elementName) {
+		if(!ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
+			return;
+		}
+
 		EList<?> children = view.getPersistedChildren();
 		if(children != null) {
 			for(Object object : children) {
@@ -294,6 +298,10 @@ public class PreferenceInitializerForElementHelper {
 	 *        the name to the element
 	 */
 	public static void initLabelVisibilityFromPrefs(View view, final IPreferenceStore store, String elementName) {
+		if(!ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
+			return;
+		}
+
 		EList<?> children = view.getPersistedChildren();
 		if(children != null) {
 			for(Object object : children) {