Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-11 12:10:15 -0500
committerCamille Letavernier2014-02-11 12:10:15 -0500
commit942b1c18bed4b674cc8913fa1d936e7699729a0a (patch)
tree046cfc15bd428c2892ab1f46e4bbca279dd45aa8
parent695a8a252f521ec7b3ddbd86879832907a70a60f (diff)
downloadorg.eclipse.papyrus-942b1c18bed4b674cc8913fa1d936e7699729a0a.tar.gz
org.eclipse.papyrus-942b1c18bed4b674cc8913fa1d936e7699729a0a.tar.xz
org.eclipse.papyrus-942b1c18bed4b674cc8913fa1d936e7699729a0a.zip
417396: [CSS] The CSS Engine shall support label visibility & mask
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Regenerate profile diagram
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java42
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java47
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java96
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java23
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java64
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java10
14 files changed, 107 insertions, 215 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java
deleted file mode 100644
index 49fc4d7b069..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.profile.custom.policies;
-
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndEditPolicy;
-import org.eclipse.papyrus.uml.diagram.profile.custom.helper.AssociationEndSourceLabelHelper;
-
-/**
- * Mask Managed label edit policy for association ends (source role)
- */
-public class DisplayAssociationEndSourceEditPolicy extends DisplayAssociationEndEditPolicy {
-
- @Override
- public void addAdditionalListeners() {
- super.addAdditionalListeners();
- // adds a listener to the element itself, and to linked elements, like Type
- if(getView().eContainer() != null) {
- getDiagramEventBroker().addNotificationListener(getView().eContainer(), this);
-
- }
- }
-
- /**
- * Instantiates a new display association end source edit policy.
- */
- public DisplayAssociationEndSourceEditPolicy() {
- super();
- propertyLabelHelper = AssociationEndSourceLabelHelper.getInstance();
- }
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java
deleted file mode 100644
index 3f9dbe384c5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.profile.custom.policies;
-
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndEditPolicy;
-import org.eclipse.papyrus.uml.diagram.profile.custom.helper.AssociationEndTargetLabelHelper;
-
-/**
- * Mask Managed label edit policy for association ends (target role)
- */
-public class DisplayAssociationEndTargetEditPolicy extends DisplayAssociationEndEditPolicy {
-
- /**
- *
- * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndEditPolicy#addAdditionalListeners()
- *
- */
- @Override
- public void addAdditionalListeners() {
- super.addAdditionalListeners();
- // adds a listener to the element itself, and to linked elements, like Type
- if(getView().eContainer() != null) {
- getDiagramEventBroker().addNotificationListener(getView().eContainer(), this);
-
- }
- }
-
- /**
- * Instantiates a new display association end target edit policy.
- */
- public DisplayAssociationEndTargetEditPolicy() {
- super();
- propertyLabelHelper = AssociationEndTargetLabelHelper.getInstance();
- }
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
index 4861e4556fd..1caa8c7ca02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
@@ -63,9 +63,9 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
index 47436ffcdb6..698077e47bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
@@ -64,9 +64,9 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndSourceEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndSourceEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
index 3fddc984d26..97e58f1da27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
@@ -64,9 +64,9 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java
index 97d3ef9e825..91c2d31cf19 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java
@@ -144,8 +144,8 @@ public class UMLDiagramContentInitializer {
private void createStereotype_1026Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getStereotype_1026OutgoingLinks(view));
- createStereotypeAttributeCompartment_1071Children(getCompartment(view, StereotypeAttributeCompartmentEditPart.VISUAL_ID));
- createStereotypeOperationCompartment_1019Children(getCompartment(view, StereotypeOperationCompartmentEditPart.VISUAL_ID));
+ createStereotypeAttributes_1071Children(getCompartment(view, StereotypeAttributeCompartmentEditPart.VISUAL_ID));
+ createStereotypeOperations_1019Children(getCompartment(view, StereotypeOperationCompartmentEditPart.VISUAL_ID));
}
/**
@@ -178,7 +178,7 @@ public class UMLDiagramContentInitializer {
private void createModel_2005Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getModel_2005OutgoingLinks(view));
- createModelModelElementCompartment_1057Children(getCompartment(view, ModelPackageableElementCompartmentEditPartTN.VISUAL_ID));
+ createModelPackagedelements_1057Children(getCompartment(view, ModelPackageableElementCompartmentEditPartTN.VISUAL_ID));
}
/**
@@ -187,7 +187,7 @@ public class UMLDiagramContentInitializer {
private void createProfile_1030Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getProfile_1030OutgoingLinks(view));
- createProfileProfilePackageableElementCompartment_1042Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID));
+ createProfilePackagedelements_1042Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID));
}
/**
@@ -196,7 +196,7 @@ public class UMLDiagramContentInitializer {
private void createPackage_2007Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getPackage_2007OutgoingLinks(view));
- createPackagePackageableElementCompartment_1005Children(getCompartment(view, PackagePackageableElementCompartmentEditPart.VISUAL_ID));
+ createPackagePackagedelements_1005Children(getCompartment(view, PackagePackageableElementCompartmentEditPart.VISUAL_ID));
}
/**
@@ -205,7 +205,7 @@ public class UMLDiagramContentInitializer {
private void createEnumeration_2006Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumeration_2006OutgoingLinks(view));
- createEnumerationEnumerationEnumerationLiteral_1063Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));
+ createEnumerationLiterals_1063Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));
}
/**
@@ -222,8 +222,8 @@ public class UMLDiagramContentInitializer {
private void createDataType_2010Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getDataType_2010OutgoingLinks(view));
- createDataTypeDataTypeAttributeCompartment_1067Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));
- createDataTypeDataTypeOperationCompartment_1068Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));
+ createDataTypeAttributes_1067Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));
+ createDataTypeOperations_1068Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));
}
/**
@@ -288,8 +288,8 @@ public class UMLDiagramContentInitializer {
private void createStereotype_1023Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getStereotype_1023OutgoingLinks(view));
- createStereotypeAttributeCompartment_1052Children(getCompartment(view, StereotypeAttributeCompartmentEditPartCN.VISUAL_ID));
- createStereotypeOperationCompartment_1053Children(getCompartment(view, StereotypeOperationCompartmentEditPartCN.VISUAL_ID));
+ createStereotypeAttributes_1052Children(getCompartment(view, StereotypeAttributeCompartmentEditPartCN.VISUAL_ID));
+ createStereotypeOperations_1053Children(getCompartment(view, StereotypeOperationCompartmentEditPartCN.VISUAL_ID));
}
/**
@@ -314,7 +314,7 @@ public class UMLDiagramContentInitializer {
private void createModel_1027Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getModel_1027OutgoingLinks(view));
- createModelModelElementCompartment_1058Children(getCompartment(view, ModelPackageableElementCompartmentEditPartCN.VISUAL_ID));
+ createModelPackagedelements_1058Children(getCompartment(view, ModelPackageableElementCompartmentEditPartCN.VISUAL_ID));
}
/**
@@ -323,7 +323,7 @@ public class UMLDiagramContentInitializer {
private void createProfile_1024Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getProfile_1024OutgoingLinks(view));
- createProfileProfilePackageableElementCompartment_1051Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID));
+ createProfilePackagedelements_1051Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID));
}
/**
@@ -336,7 +336,7 @@ public class UMLDiagramContentInitializer {
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
- createPackagePackageableElementCompartment_11Children(getCompartment(view, PackagePackageableElementCompartmentEditPartCN.VISUAL_ID));
+ createPackagePackagedelements_11Children(getCompartment(view, PackagePackageableElementCompartmentEditPartCN.VISUAL_ID));
}
/**
@@ -353,7 +353,7 @@ public class UMLDiagramContentInitializer {
private void createEnumeration_3025Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumeration_3025OutgoingLinks(view));
- createEnumerationEnumerationEnumerationLiteral_1062Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));
+ createEnumerationLiterals_1062Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));
}
/**
@@ -362,15 +362,15 @@ public class UMLDiagramContentInitializer {
private void createDataType_3027Children(View view) {
myDomain2NotationMap.put(view.getElement(), view);
myLinkDescriptors.addAll(UMLDiagramUpdater.getDataType_3027OutgoingLinks(view));
- createDataTypeDataTypeAttributeCompartment_1069Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));
- createDataTypeDataTypeOperationCompartment_1070Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));
+ createDataTypeAttributes_1069Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));
+ createDataTypeOperations_1070Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));
}
/**
* @generated
*/
- private void createPackagePackageableElementCompartment_1005Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getPackagePackageableElementCompartment_1005SemanticChildren(view);
+ private void createPackagePackagedelements_1005Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getPackagePackagedelements_1005SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -379,8 +379,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createPackagePackageableElementCompartment_11Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getPackagePackageableElementCompartment_11SemanticChildren(view);
+ private void createPackagePackagedelements_11Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getPackagePackagedelements_11SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -389,8 +389,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createProfileProfilePackageableElementCompartment_1042Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getProfileProfilePackageableElementCompartment_1042SemanticChildren(view);
+ private void createProfilePackagedelements_1042Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getProfilePackagedelements_1042SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -399,8 +399,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createProfileProfilePackageableElementCompartment_1051Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getProfileProfilePackageableElementCompartment_1051SemanticChildren(view);
+ private void createProfilePackagedelements_1051Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getProfilePackagedelements_1051SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -409,8 +409,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createStereotypeAttributeCompartment_1071Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeAttributeCompartment_1071SemanticChildren(view);
+ private void createStereotypeAttributes_1071Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeAttributes_1071SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -419,8 +419,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createStereotypeAttributeCompartment_1052Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeAttributeCompartment_1052SemanticChildren(view);
+ private void createStereotypeAttributes_1052Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeAttributes_1052SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -429,8 +429,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createStereotypeOperationCompartment_1019Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeOperationCompartment_1019SemanticChildren(view);
+ private void createStereotypeOperations_1019Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeOperations_1019SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -439,8 +439,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createStereotypeOperationCompartment_1053Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeOperationCompartment_1053SemanticChildren(view);
+ private void createStereotypeOperations_1053Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeOperations_1053SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -449,8 +449,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createModelModelElementCompartment_1057Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getModelModelElementCompartment_1057SemanticChildren(view);
+ private void createModelPackagedelements_1057Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getModelPackagedelements_1057SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -459,8 +459,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createModelModelElementCompartment_1058Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getModelModelElementCompartment_1058SemanticChildren(view);
+ private void createModelPackagedelements_1058Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getModelPackagedelements_1058SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -469,8 +469,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createEnumerationEnumerationEnumerationLiteral_1062Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationEnumerationEnumerationLiteral_1062SemanticChildren(view);
+ private void createEnumerationLiterals_1062Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationLiterals_1062SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -479,8 +479,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createEnumerationEnumerationEnumerationLiteral_1063Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationEnumerationEnumerationLiteral_1063SemanticChildren(view);
+ private void createEnumerationLiterals_1063Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationLiterals_1063SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -489,8 +489,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createDataTypeDataTypeAttributeCompartment_1067Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeDataTypeAttributeCompartment_1067SemanticChildren(view);
+ private void createDataTypeAttributes_1067Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeAttributes_1067SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -499,8 +499,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createDataTypeDataTypeAttributeCompartment_1069Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeDataTypeAttributeCompartment_1069SemanticChildren(view);
+ private void createDataTypeAttributes_1069Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeAttributes_1069SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -509,8 +509,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createDataTypeDataTypeOperationCompartment_1068Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeDataTypeOperationCompartment_1068SemanticChildren(view);
+ private void createDataTypeOperations_1068Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeOperations_1068SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
@@ -519,8 +519,8 @@ public class UMLDiagramContentInitializer {
/**
* @generated
*/
- private void createDataTypeDataTypeOperationCompartment_1070Children(View view) {
- Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeDataTypeOperationCompartment_1070SemanticChildren(view);
+ private void createDataTypeOperations_1070Children(View view) {
+ Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeOperations_1070SemanticChildren(view);
for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
createNode(view, (UMLNodeDescriptor)it.next());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java
index 1a290ec21ee..84b55bb28ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java
@@ -53,6 +53,7 @@ import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
@@ -111,27 +112,7 @@ public class UMLDiagramEditorUtil {
* @generated
*/
public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {
- if(containerFullPath == null) {
- containerFullPath = new Path(""); //$NON-NLS-1$
- }
- if(fileName == null || fileName.trim().length() == 0) {
- fileName = "default"; //$NON-NLS-1$
- }
- IPath filePath = containerFullPath.append(fileName);
- if(extension != null && !extension.equals(filePath.getFileExtension())) {
- filePath = filePath.addFileExtension(extension);
- }
- extension = filePath.getFileExtension();
- fileName = filePath.removeFileExtension().lastSegment();
- int i = 1;
- while(ResourcesPlugin.getWorkspace().getRoot().exists(filePath)) {
- i++;
- filePath = containerFullPath.append(fileName + i);
- if(extension != null) {
- filePath = filePath.addFileExtension(extension);
- }
- }
- return filePath.lastSegment();
+ return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java
index f6f1fa89c81..b4e33a6c30d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java
@@ -127,37 +127,37 @@ public class UMLDiagramUpdater {
case PackageEditPartCN.VISUAL_ID:
return getPackage_1012SemanticChildren(view);
case PackagePackageableElementCompartmentEditPart.VISUAL_ID:
- return getPackagePackageableElementCompartment_1005SemanticChildren(view);
+ return getPackagePackagedelements_1005SemanticChildren(view);
case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID:
- return getPackagePackageableElementCompartment_11SemanticChildren(view);
+ return getPackagePackagedelements_11SemanticChildren(view);
case ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID:
- return getProfileProfilePackageableElementCompartment_1042SemanticChildren(view);
+ return getProfilePackagedelements_1042SemanticChildren(view);
case ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID:
- return getProfileProfilePackageableElementCompartment_1051SemanticChildren(view);
+ return getProfilePackagedelements_1051SemanticChildren(view);
case StereotypeAttributeCompartmentEditPart.VISUAL_ID:
- return getStereotypeAttributeCompartment_1071SemanticChildren(view);
+ return getStereotypeAttributes_1071SemanticChildren(view);
case StereotypeAttributeCompartmentEditPartCN.VISUAL_ID:
- return getStereotypeAttributeCompartment_1052SemanticChildren(view);
+ return getStereotypeAttributes_1052SemanticChildren(view);
case StereotypeOperationCompartmentEditPart.VISUAL_ID:
- return getStereotypeOperationCompartment_1019SemanticChildren(view);
+ return getStereotypeOperations_1019SemanticChildren(view);
case StereotypeOperationCompartmentEditPartCN.VISUAL_ID:
- return getStereotypeOperationCompartment_1053SemanticChildren(view);
+ return getStereotypeOperations_1053SemanticChildren(view);
case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID:
- return getModelModelElementCompartment_1057SemanticChildren(view);
+ return getModelPackagedelements_1057SemanticChildren(view);
case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:
- return getModelModelElementCompartment_1058SemanticChildren(view);
+ return getModelPackagedelements_1058SemanticChildren(view);
case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:
- return getEnumerationEnumerationEnumerationLiteral_1062SemanticChildren(view);
+ return getEnumerationLiterals_1062SemanticChildren(view);
case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:
- return getEnumerationEnumerationEnumerationLiteral_1063SemanticChildren(view);
+ return getEnumerationLiterals_1063SemanticChildren(view);
case DataTypeAttributeCompartmentEditPart.VISUAL_ID:
- return getDataTypeDataTypeAttributeCompartment_1067SemanticChildren(view);
+ return getDataTypeAttributes_1067SemanticChildren(view);
case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:
- return getDataTypeDataTypeAttributeCompartment_1069SemanticChildren(view);
+ return getDataTypeAttributes_1069SemanticChildren(view);
case DataTypeOperationCompartmentEditPart.VISUAL_ID:
- return getDataTypeDataTypeOperationCompartment_1068SemanticChildren(view);
+ return getDataTypeOperations_1068SemanticChildren(view);
case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:
- return getDataTypeDataTypeOperationCompartment_1070SemanticChildren(view);
+ return getDataTypeOperations_1070SemanticChildren(view);
}
return Collections.emptyList();
}
@@ -268,7 +268,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getPackagePackageableElementCompartment_1005SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getPackagePackagedelements_1005SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -324,7 +324,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getPackagePackageableElementCompartment_11SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getPackagePackagedelements_11SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -380,7 +380,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getProfileProfilePackageableElementCompartment_1042SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getProfilePackagedelements_1042SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -448,7 +448,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getProfileProfilePackageableElementCompartment_1051SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getProfilePackagedelements_1051SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -516,7 +516,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getStereotypeAttributeCompartment_1071SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getStereotypeAttributes_1071SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -540,7 +540,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getStereotypeAttributeCompartment_1052SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getStereotypeAttributes_1052SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -564,7 +564,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getStereotypeOperationCompartment_1019SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getStereotypeOperations_1019SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -588,7 +588,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getStereotypeOperationCompartment_1053SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getStereotypeOperations_1053SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -612,7 +612,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getModelModelElementCompartment_1057SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getModelPackagedelements_1057SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -668,7 +668,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getModelModelElementCompartment_1058SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getModelPackagedelements_1058SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -724,7 +724,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getEnumerationEnumerationEnumerationLiteral_1062SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getEnumerationLiterals_1062SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -748,7 +748,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getEnumerationEnumerationEnumerationLiteral_1063SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getEnumerationLiterals_1063SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -772,7 +772,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getDataTypeDataTypeAttributeCompartment_1067SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getDataTypeAttributes_1067SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -796,7 +796,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getDataTypeDataTypeAttributeCompartment_1069SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getDataTypeAttributes_1069SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -820,7 +820,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getDataTypeDataTypeOperationCompartment_1068SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getDataTypeOperations_1068SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
@@ -844,7 +844,7 @@ public class UMLDiagramUpdater {
/**
* @generated
*/
- public static List<UMLNodeDescriptor> getDataTypeDataTypeOperationCompartment_1070SemanticChildren(View view) {
+ public static List<UMLNodeDescriptor> getDataTypeOperations_1070SemanticChildren(View view) {
if(false == view.eContainer() instanceof View) {
return Collections.emptyList();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
index a82263a49eb..28ad8f2af7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
@@ -30,7 +30,7 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
/**
* @generated
*/
- public static final String compartments[] = { "DataTypeAttributeCompartment", "DataTypeOperationCompartment" };
+ public static final String compartments[] = { "attributes", "operations" };
/**
* @generated
@@ -90,8 +90,8 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
*/
private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("DataTypeAttributeCompartment", Boolean.TRUE);
- map.put("DataTypeOperationCompartment", Boolean.FALSE);
+ map.put("attributes", Boolean.TRUE);
+ map.put("operations", Boolean.FALSE);
return map;
}
@@ -100,8 +100,8 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
*/
private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("DataTypeAttributeCompartment", Boolean.FALSE);
- map.put("DataTypeOperationCompartment", 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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
index d3b74d490a0..847c1fb5288 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
@@ -30,7 +30,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
/**
* @generated
*/
- public static final String compartments[] = { "EnumerationEnumerationLiteral" };
+ public static final String compartments[] = { "literals" };
/**
* @generated
@@ -90,7 +90,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
*/
private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("EnumerationEnumerationLiteral", Boolean.TRUE);
+ map.put("literals", Boolean.TRUE);
return map;
}
@@ -99,7 +99,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
*/
private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("EnumerationEnumerationLiteral", Boolean.FALSE);
+ map.put("literals", Boolean.FALSE);
return map;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
index 8fa36cbf148..a793df6180d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
@@ -30,7 +30,7 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
/**
* @generated
*/
- public static final String compartments[] = { "ModelElementCompartment" };
+ public static final String compartments[] = { "packaged elements" };
/**
* @generated
@@ -90,7 +90,7 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
*/
private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("ModelElementCompartment", Boolean.TRUE);
+ map.put("packaged elements", Boolean.TRUE);
return map;
}
@@ -99,7 +99,7 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
*/
private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("ModelElementCompartment", Boolean.FALSE);
+ map.put("packaged elements", Boolean.FALSE);
return map;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
index f606e3cd061..0d43037cf52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
@@ -30,7 +30,7 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
/**
* @generated
*/
- public static final String compartments[] = { "PackageableElementCompartment" };
+ public static final String compartments[] = { "packaged elements" };
/**
* @generated
@@ -90,7 +90,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;
}
@@ -99,7 +99,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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
index 2235c58640e..0ef7ed8b12a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
@@ -30,7 +30,7 @@ public class ProfilePreferencePage extends AbstractPapyrusNodePreferencePage {
/**
* @generated
*/
- public static final String compartments[] = { "ProfilePackageableElementCompartment" };
+ public static final String compartments[] = { "packaged elements" };
/**
* @generated
@@ -90,7 +90,7 @@ public class ProfilePreferencePage extends AbstractPapyrusNodePreferencePage {
*/
private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("ProfilePackageableElementCompartment", Boolean.TRUE);
+ map.put("packaged elements", Boolean.TRUE);
return map;
}
@@ -99,7 +99,7 @@ public class ProfilePreferencePage extends AbstractPapyrusNodePreferencePage {
*/
private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("ProfilePackageableElementCompartment", Boolean.FALSE);
+ map.put("packaged elements", Boolean.FALSE);
return map;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
index 20d469d2dd2..359d26804c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
@@ -30,7 +30,7 @@ public class StereotypePreferencePage extends AbstractPapyrusNodePreferencePage
/**
* @generated
*/
- public static final String compartments[] = { "AttributeCompartment", "OperationCompartment" };
+ public static final String compartments[] = { "attributes", "operations" };
/**
* @generated
@@ -90,8 +90,8 @@ public class StereotypePreferencePage 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.FALSE);
+ map.put("attributes", Boolean.TRUE);
+ map.put("operations", Boolean.FALSE);
return map;
}
@@ -100,8 +100,8 @@ public class StereotypePreferencePage 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;
}

Back to the top