From 5f7a614369ca4ed6a79d251de29af0ed938b1bef Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Fri, 31 Jan 2014 17:38:01 +0100 Subject: 417396: [CSS] The CSS Engine shall support label visibility & mask https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Move the OperationLabel and PropertyLabel edit policies to uml.diagram.common - Class and Profile diagram now reuse these edit policies--- .../custom/policies/OperationLabelEditPolicy.java | 364 ------------------- .../custom/policies/PropertyLabelEditPolicy.java | 255 ------------- .../model/classdiagram.gmfgen | 22 +- .../edit/parts/OperationForClassEditPart.java | 2 +- .../edit/parts/OperationForComponentEditPart.java | 2 +- .../edit/parts/OperationForDataTypeEditPart.java | 2 +- .../edit/parts/OperationForInterfaceEditpart.java | 2 +- .../parts/OperationForPrimitiveTypeEditPart.java | 2 +- .../clazz/edit/parts/PropertyForClassEditPart.java | 2 +- .../edit/parts/PropertyForComponentEditPart.java | 2 +- .../edit/parts/PropertyForInterfaceEditPart.java | 2 +- .../edit/parts/PropertyForSignalEditPart.java | 2 +- .../edit/parts/PropertyforDataTypeEditPart.java | 2 +- .../parts/PropertyforPrimitiveTypeEditPart.java | 2 +- .../editpolicies/OperationLabelEditPolicy.java | 363 +++++++++++++++++++ .../editpolicies/PropertyLabelEditPolicy.java | 254 +++++++++++++ .../custom/policies/OperationLabelEditPolicy.java | 400 --------------------- .../custom/policies/PropertyLabelEditPolicy.java | 278 -------------- .../model/profilediagram.gmfgen | 8 +- .../profile/edit/parts/ClassOperationEditPart.java | 2 +- .../profile/edit/parts/ClassPropertyEditPart.java | 2 +- .../edit/parts/DataTypeOperationEditPart.java | 2 +- .../edit/parts/DataTypePropertyEditPart.java | 2 +- .../preferences/AssociationNodePreferencePage.java | 2 +- .../preferences/AssociationPreferencePage.java | 2 +- .../profile/preferences/CommentPreferencePage.java | 2 +- .../preferences/ConstraintPreferencePage.java | 2 +- .../preferences/DataTypePreferencePage.java | 2 +- .../preferences/ElementImportPreferencePage.java | 2 +- .../EnumerationLiteralPreferencePage.java | 2 +- .../preferences/EnumerationPreferencePage.java | 2 +- .../preferences/GeneralizationPreferencePage.java | 2 +- .../preferences/MetaclassPreferencePage.java | 2 +- .../profile/preferences/ModelPreferencePage.java | 2 +- .../preferences/OperationPreferencePage.java | 2 +- .../preferences/PackageImportPreferencePage.java | 2 +- .../profile/preferences/PackagePreferencePage.java | 2 +- .../preferences/PrimitiveTypePreferencePage.java | 2 +- .../profile/preferences/ProfilePreferencePage.java | 2 +- .../preferences/PropertyPreferencePage.java | 2 +- .../preferences/ShortCutDiagramPreferencePage.java | 2 +- .../preferences/StereotypePreferencePage.java | 2 +- .../diagram/profile/providers/UMLViewProvider.java | 2 +- 43 files changed, 667 insertions(+), 1347 deletions(-) delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/OperationLabelEditPolicy.java delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/PropertyLabelEditPolicy.java create mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java create mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/OperationLabelEditPolicy.java delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/PropertyLabelEditPolicy.java diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/OperationLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/OperationLabelEditPolicy.java deleted file mode 100644 index d6b3b48aaa8..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/OperationLabelEditPolicy.java +++ /dev/null @@ -1,364 +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: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation - * Nizar GUEDIDI (CEA LIST) - Update getUMLElement() - * - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.clazz.custom.policies; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.helper.OperationLabelHelper; -import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence; -import org.eclipse.uml2.uml.Operation; -import org.eclipse.uml2.uml.Parameter; -import org.eclipse.uml2.uml.Type; -import org.eclipse.uml2.uml.UMLPackage; - -/** - * Specific edit policy for label displaying stereotypes and their properties for edges representing - * UML elements. - */ -public class OperationLabelEditPolicy extends AbstractMaskManagedEditPolicy { - - /** - * Creates a new PropertyLabelEditPolicy - */ - public OperationLabelEditPolicy() { - super(); - } - - /** - * {@inheritDoc} - */ - @Override - public void addAdditionalListeners() { - super.addAdditionalListeners(); - Operation operation = getUMLElement(); - // check host semantic element is not null - if(operation == null) { - return; - } - // adds a listener to the element itself, and to linked elements, like Type - for(Parameter parameter : operation.getOwnedParameters()) { - getDiagramEventBroker().addNotificationListener(parameter, this); - // should also add this element as a listener of parameter type - if(parameter.getType() != null) { - getDiagramEventBroker().addNotificationListener(parameter.getType(), this); - } - } - } - - /** - * {@inheritDoc} - */ - @Override - public Collection getDefaultDisplayValue() { - return ICustomAppearence.DEFAULT_UML_OPERATION; - } - - /** - * {@inheritDoc} - */ - @Override - public Map getMasks() { - return OperationLabelHelper.getInstance().getMasks(); - } - - /** - * {@inheritDoc} - */ - @Override - public String getPreferencePageID() { - return "org.eclipse.papyrus.uml.diagram.clazz.custom.preferences.OperationPreferencePage"; - } - - /** - * {@inheritDoc} - */ - @Override - public Operation getUMLElement() { - if(hostSemanticElement instanceof Operation) { - return (Operation)hostSemanticElement; - } - return null; - } - - /** - * {@inheritedDoc} - */ - @Override - public void notifyChanged(Notification notification) { - super.notifyChanged(notification); - // change the label of the figure managed by the host edit part (managed by the parent edit - // part in general...) - // it must be changed only if: - // - the annotation corresponding to the display of the stereotype changes - // - the stereotype application list has changed - Object object = notification.getNotifier(); - Operation operation = getUMLElement(); - if(object == null) { - return; - } - if(object.equals(operation)) { - notifyOperationChanged(operation, notification); - } else if(isParameter(object)) { - notifyParameterChanged(notification); - } else if(isParameterType(object)) { - notifyParameterTypeChanged(notification); - } - if(isMaskManagedAnnotation(object)) { - refreshDisplay(); - } - if(isRemovedMaskManagedLabelAnnotation(object, notification)) { - refreshDisplay(); - } - } - - /** - * Checks if the given object is one of the parameter type of the operation - * - * @param object - * the object to test - * @return true if the object corresponds to the type of a parameter of the - * operation - */ - protected boolean isParameterType(Object object) { - if(!(object instanceof Type)) { - return false; - } - for(Parameter parameter : getUMLElement().getOwnedParameters()) { - if(object.equals(parameter.getType())) { - return true; - } - } - return false; - } - - /** - * Checks if the given object is one of the parameter of the operation - * - * @param object - * the object to test - * @return true if the object is a parameter of the operation - */ - protected boolean isParameter(Object object) { - if(!(object instanceof Parameter)) { - return false; - } - return getUMLElement().getOwnedParameters().contains(object); - } - - /** - * notifies that a parameter of the operation has changed. - * - * @param parameter - * the {@link Parameter} that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyParameterChanged(Notification notification) { - switch(notification.getFeatureID(Parameter.class)) { - case UMLPackage.PARAMETER__NAME: - case UMLPackage.PARAMETER__DEFAULT_VALUE: - case UMLPackage.PARAMETER__DIRECTION: - case UMLPackage.PARAMETER__IS_STREAM: - case UMLPackage.PARAMETER__IS_ORDERED: - case UMLPackage.PARAMETER__LOWER: - case UMLPackage.PARAMETER__UPPER: - case UMLPackage.PARAMETER__LOWER_VALUE: - case UMLPackage.PARAMETER__UPPER_VALUE: - refreshDisplay(); - break; - case UMLPackage.PARAMETER__TYPE: - switch(notification.getEventType()) { - // if it is added => adds listener to the type element - case Notification.ADD: - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - refreshDisplay(); - // if it is removed => removes listener from the type element - break; - case Notification.ADD_MANY: // should never happen - if(notification.getNewValue() instanceof List) { - List addedElements = (List)notification.getNewValue(); - for(Object addedElement : addedElements) { - if(addedElement instanceof EObject) { - getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); - } - } - } - refreshDisplay(); - break; - case Notification.REMOVE: - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - refreshDisplay(); - break; - case Notification.REMOVE_MANY: // should never happen - if(notification.getOldValue() instanceof List) { - List removedElements = (List)notification.getOldValue(); - for(Object removedElement : removedElements) { - if(removedElement instanceof EObject) { - getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); - } - } - } - refreshDisplay(); - break; - // if it is set, remove the old one and adds the new one. this is the method use when - // the type is set or removed... - case Notification.SET: - if(notification.getNewValue() != null) { - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - } - if(notification.getOldValue() != null) { - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - } - refreshDisplay(); - default: - break; - } - break; - default: - // does nothing in other cases - break; - } - } - - /** - * notifies that a parameter of the operation has changed. - * - * @param parameter - * the {@link Parameter} that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyParameterTypeChanged(Notification notification) { - // should be type.class, but seems to be a bug if this is put instead. - switch(notification.getFeatureID(notification.getNotifier().getClass())) { - case UMLPackage.TYPE__NAME: - case UMLPackage.TYPE__TEMPLATE_PARAMETER: - case UMLPackage.TYPE__VISIBILITY: - refreshDisplay(); - break; - default: - // does nothing in other cases - break; - } - } - - /** - * notifies that the the property has changed. - * - * @param operation - * the operation that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyOperationChanged(Operation operation, Notification notification) { - switch(notification.getFeatureID(Operation.class)) { - case UMLPackage.OPERATION__NAME: - case UMLPackage.OPERATION__VISIBILITY: - case UMLPackage.OPERATION__IS_UNIQUE: - case UMLPackage.OPERATION__REDEFINED_OPERATION: - case UMLPackage.OPERATION__IS_ORDERED: - case UMLPackage.OPERATION__LOWER: - case UMLPackage.OPERATION__UPPER: - case UMLPackage.OPERATION__IS_STATIC: - refreshDisplay(); - break; - case UMLPackage.OPERATION__OWNED_PARAMETER: - switch(notification.getEventType()) { - // if it is added => adds listener to the type element - case Notification.ADD: - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - refreshDisplay(); - // if it is removed => removes listener from the type element - break; - case Notification.ADD_MANY: // should never happen - if(notification.getNewValue() instanceof List) { - List addedElements = (List)notification.getNewValue(); - for(Object addedElement : addedElements) { - if(addedElement instanceof EObject) { - getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); - } - } - } - refreshDisplay(); - break; - case Notification.REMOVE: - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - refreshDisplay(); - break; - case Notification.REMOVE_MANY: // should never happen - if(notification.getOldValue() instanceof List) { - List removedElements = (List)notification.getOldValue(); - for(Object removedElement : removedElements) { - if(removedElement instanceof EObject) { - getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); - } - } - } - refreshDisplay(); - break; - // if it is set, remove the old one and adds the new one. this is the method use when - // the type is set or removed... - case Notification.SET: - if(notification.getNewValue() != null) { - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - } - if(notification.getOldValue() != null) { - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - } - refreshDisplay(); - default: - break; - } - break; - default: - // does nothing in other cases - break; - } - } - - /** - * Refreshes the display of the edit part - */ - @Override - public void refreshDisplay() { - // calls the helper for this edit Part - OperationLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart)getHost()); - } - - /** - * {@inheritDoc} - */ - @Override - protected void removeAdditionalListeners() { - super.removeAdditionalListeners(); - Operation operation = getUMLElement(); - // check host semantic element is not null - if(operation == null) { - return; - } - for(Parameter parameter : operation.getOwnedParameters()) { - getDiagramEventBroker().removeNotificationListener(parameter, this); - // remove parameter type listener - if(parameter.getType() != null) { - getDiagramEventBroker().removeNotificationListener(parameter.getType(), this); - } - } - } -} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/PropertyLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/PropertyLabelEditPolicy.java deleted file mode 100644 index 209393c7b28..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/PropertyLabelEditPolicy.java +++ /dev/null @@ -1,255 +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: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation - * Nizar GUEDIDI (CEA LIST) - Update getUMLElement() - * - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.clazz.custom.policies; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.papyrus.uml.diagram.common.Activator; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper; -import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence; -import org.eclipse.uml2.uml.Property; -import org.eclipse.uml2.uml.Type; -import org.eclipse.uml2.uml.UMLPackage; - -/** - * Specific edit policy for label displaying stereotypes and their properties for edges representing - * UML elements. - */ -public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy { - - /** - * Creates a new PropertyLabelEditPolicy - */ - public PropertyLabelEditPolicy() { - super(); - } - - /** - * {@inheritDoc} - */ - @Override - public void addAdditionalListeners() { - super.addAdditionalListeners(); - Property property = getUMLElement(); - // check host semantic element is not null - if(property == null) { - Activator.log.error("No semantic element present when adding listeners in PropertyLabelEditPolicy", null); - return; - } - // adds a listener to the element itself, and to linked elements, like Type - if(property.getType() != null) { - getDiagramEventBroker().addNotificationListener(property.getType(), this); - } - getDiagramEventBroker().addNotificationListener(property.getUpperValue(), this); - getDiagramEventBroker().addNotificationListener(property.getLowerValue(), this); - } - - /** - * {@inheritDoc} - */ - @Override - public Collection getDefaultDisplayValue() { - return ICustomAppearence.DEFAULT_UML_PROPERTY; - } - - /** - * {@inheritDoc} - */ - @Override - public Map getMasks() { - return PropertyLabelHelper.getInstance().getMasks(); - } - - @Override - public String getPreferencePageID() { - return "org.eclipse.papyrus.uml.diagram.clazz.custom.preferences.PropertyPreferencePage"; - } - - /** - * {@inheritedDoc} - */ - @Override - public Property getUMLElement() { - EObject element = super.getUMLElement(); - if(element instanceof Property) { - return (Property)element; - } - return null; - } - - /** - * {@inheritedDoc} - */ - @Override - public void notifyChanged(Notification notification) { - super.notifyChanged(notification); - // change the label of the figure managed by the host edit part (managed by the parent edit - // part in general...) - // it must be changed only if: - // - the annotation corresponding to the display of the stereotype changes - // - the stereotype application list has changed - Object object = notification.getNotifier(); - Property property = getUMLElement(); - if(object == null || property == null) { - return; - } - if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralInteger_Value())) { - refreshDisplay(); - } else if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value())) { - refreshDisplay(); - } - if(object.equals(property)) { - notifyPropertyChanged(property, notification); - } else if(object.equals(property.getType())) { - notifyPropertyTypeChanged(property.getType(), notification); - } - if(isMaskManagedAnnotation(object)) { - refreshDisplay(); - } - if(isRemovedMaskManagedLabelAnnotation(object, notification)) { - refreshDisplay(); - } - } - - /** - * notifies that the the property has changed. - * - * @param property - * the property that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyPropertyChanged(Property property, Notification notification) { - switch(notification.getFeatureID(Property.class)) { - case UMLPackage.PROPERTY__NAME: - case UMLPackage.PROPERTY__VISIBILITY: - case UMLPackage.PROPERTY__IS_DERIVED: - case UMLPackage.PROPERTY__DEFAULT_VALUE: - case UMLPackage.PROPERTY__SUBSETTED_PROPERTY: - case UMLPackage.PROPERTY__REDEFINED_PROPERTY: - case UMLPackage.PROPERTY__IS_ORDERED: - case UMLPackage.PROPERTY__IS_UNIQUE: - case UMLPackage.PROPERTY__IS_READ_ONLY: - refreshDisplay(); - break; - case UMLPackage.PROPERTY__TYPE: - case UMLPackage.PROPERTY__LOWER: - case UMLPackage.PROPERTY__LOWER_VALUE: - case UMLPackage.PROPERTY__UPPER: - case UMLPackage.PROPERTY__UPPER_VALUE: - switch(notification.getEventType()) { - // if it is added => adds listener to the type element - case Notification.ADD: - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - refreshDisplay(); - // if it is removed => removes listener from the type element - break; - case Notification.ADD_MANY: // should never happen - if(notification.getNewValue() instanceof List) { - List addedElements = (List)notification.getNewValue(); - for(Object addedElement : addedElements) { - if(addedElement instanceof EObject) { - getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); - } - } - } - refreshDisplay(); - break; - case Notification.REMOVE: - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - refreshDisplay(); - break; - case Notification.REMOVE_MANY: // should never happen - if(notification.getOldValue() instanceof List) { - List removedElements = (List)notification.getOldValue(); - for(Object removedElement : removedElements) { - if(removedElement instanceof EObject) { - getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); - } - } - } - refreshDisplay(); - break; - // if it is set, remove the old one and adds the new one. this is the method use when - // the type is set or removed... - case Notification.SET: - if(notification.getOldValue() != null) { - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - } - if(notification.getNewValue() != null) { - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - } - refreshDisplay(); - default: - break; - } - break; - default: - // does nothing in other cases - break; - } - } - - /** - * notifies that the type of the property has changed. - * - * @param type - * the type of the property that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyPropertyTypeChanged(Type type, Notification notification) { - switch(notification.getFeatureID(Property.class)) { - case UMLPackage.TYPE__NAME: - refreshDisplay(); // type name has changed => refresh the property display - break; - default: - // does nothing by default - break; - } - } - - /** - * Refreshes the display of the edit part - */ - @Override - public void refreshDisplay() { - // calls the helper for this edit Part - PropertyLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart)getHost()); - } - - /** - * {@inheritDoc} - */ - @Override - protected void removeAdditionalListeners() { - super.removeAdditionalListeners(); - Property property = getUMLElement(); - if(property == null) { - // check semantic element is not null and this is really an instance of Property - return; - } - if(property.getType() != null) { - getDiagramEventBroker().removeNotificationListener(property.getType(), this); - } - getDiagramEventBroker().removeNotificationListener(property.getUpperValue(), this); - getDiagramEventBroker().removeNotificationListener(property.getLowerValue(), this); - } -} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen index 3113142307b..99e7e7ab901 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen @@ -68,7 +68,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/> @@ -124,7 +124,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/> @@ -180,7 +180,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/> @@ -248,7 +248,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/> @@ -304,7 +304,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/> @@ -360,7 +360,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/> @@ -555,7 +555,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/> @@ -611,7 +611,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/> @@ -667,7 +667,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/> @@ -723,7 +723,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/> @@ -780,7 +780,7 @@ + editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java index 600ccd484a6..83102469131 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForClassItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java index 4737c79fc70..fb3ed05bab6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java index e4921a1e6a0..0a9fa8e5fe8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForDataTypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java index 8a5cca1fd38..6b67b717f56 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForInterfaceItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java index a747db892c5..2a2ab00ca93 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForPrimitiveTypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java index 30f6687e8f1..a1debe6b106 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForClassItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java index b18b27d7421..4204c469a4e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForComponentItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java index ea2087fc80f..b8880d998a4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForInterfaceItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java index 8664e7c9893..d517aee7067 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForSignalItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java index e247053850a..39788c73774 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyforDataTypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java index a65dba82031..16409dd1ff6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java @@ -66,7 +66,6 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyforPrimitiveTypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -77,6 +76,7 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java new file mode 100644 index 00000000000..569ae4b117f --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/OperationLabelEditPolicy.java @@ -0,0 +1,363 @@ +/***************************************************************************** + * 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Nizar GUEDIDI (CEA LIST) - Update getUMLElement() + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.common.editpolicies; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.papyrus.uml.diagram.common.helper.OperationLabelHelper; +import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence; +import org.eclipse.uml2.uml.Operation; +import org.eclipse.uml2.uml.Parameter; +import org.eclipse.uml2.uml.Type; +import org.eclipse.uml2.uml.UMLPackage; + +/** + * Specific edit policy for label displaying stereotypes and their properties for edges representing + * UML elements. + */ +public class OperationLabelEditPolicy extends AbstractMaskManagedEditPolicy { + + /** + * Creates a new PropertyLabelEditPolicy + */ + public OperationLabelEditPolicy() { + super(); + } + + /** + * {@inheritDoc} + */ + @Override + public void addAdditionalListeners() { + super.addAdditionalListeners(); + Operation operation = getUMLElement(); + // check host semantic element is not null + if(operation == null) { + return; + } + // adds a listener to the element itself, and to linked elements, like Type + for(Parameter parameter : operation.getOwnedParameters()) { + getDiagramEventBroker().addNotificationListener(parameter, this); + // should also add this element as a listener of parameter type + if(parameter.getType() != null) { + getDiagramEventBroker().addNotificationListener(parameter.getType(), this); + } + } + } + + /** + * {@inheritDoc} + */ + @Override + public Collection getDefaultDisplayValue() { + return ICustomAppearence.DEFAULT_UML_OPERATION; + } + + /** + * {@inheritDoc} + */ + @Override + public Map getMasks() { + return OperationLabelHelper.getInstance().getMasks(); + } + + /** + * {@inheritDoc} + */ + @Override + public String getPreferencePageID() { + return "org.eclipse.papyrus.uml.diagram.clazz.custom.preferences.OperationPreferencePage"; + } + + /** + * {@inheritDoc} + */ + @Override + public Operation getUMLElement() { + if(hostSemanticElement instanceof Operation) { + return (Operation)hostSemanticElement; + } + return null; + } + + /** + * {@inheritedDoc} + */ + @Override + public void notifyChanged(Notification notification) { + super.notifyChanged(notification); + // change the label of the figure managed by the host edit part (managed by the parent edit + // part in general...) + // it must be changed only if: + // - the annotation corresponding to the display of the stereotype changes + // - the stereotype application list has changed + Object object = notification.getNotifier(); + Operation operation = getUMLElement(); + if(object == null) { + return; + } + if(object.equals(operation)) { + notifyOperationChanged(operation, notification); + } else if(isParameter(object)) { + notifyParameterChanged(notification); + } else if(isParameterType(object)) { + notifyParameterTypeChanged(notification); + } + if(isMaskManagedAnnotation(object)) { + refreshDisplay(); + } + if(isRemovedMaskManagedLabelAnnotation(object, notification)) { + refreshDisplay(); + } + } + + /** + * Checks if the given object is one of the parameter type of the operation + * + * @param object + * the object to test + * @return true if the object corresponds to the type of a parameter of the + * operation + */ + protected boolean isParameterType(Object object) { + if(!(object instanceof Type)) { + return false; + } + for(Parameter parameter : getUMLElement().getOwnedParameters()) { + if(object.equals(parameter.getType())) { + return true; + } + } + return false; + } + + /** + * Checks if the given object is one of the parameter of the operation + * + * @param object + * the object to test + * @return true if the object is a parameter of the operation + */ + protected boolean isParameter(Object object) { + if(!(object instanceof Parameter)) { + return false; + } + return getUMLElement().getOwnedParameters().contains(object); + } + + /** + * notifies that a parameter of the operation has changed. + * + * @param parameter + * the {@link Parameter} that has changed + * @param notification + * the notification send when the element has been changed + */ + protected void notifyParameterChanged(Notification notification) { + switch(notification.getFeatureID(Parameter.class)) { + case UMLPackage.PARAMETER__NAME: + case UMLPackage.PARAMETER__DEFAULT_VALUE: + case UMLPackage.PARAMETER__DIRECTION: + case UMLPackage.PARAMETER__IS_STREAM: + case UMLPackage.PARAMETER__IS_ORDERED: + case UMLPackage.PARAMETER__LOWER: + case UMLPackage.PARAMETER__UPPER: + case UMLPackage.PARAMETER__LOWER_VALUE: + case UMLPackage.PARAMETER__UPPER_VALUE: + refreshDisplay(); + break; + case UMLPackage.PARAMETER__TYPE: + switch(notification.getEventType()) { + // if it is added => adds listener to the type element + case Notification.ADD: + getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); + refreshDisplay(); + // if it is removed => removes listener from the type element + break; + case Notification.ADD_MANY: // should never happen + if(notification.getNewValue() instanceof List) { + List addedElements = (List)notification.getNewValue(); + for(Object addedElement : addedElements) { + if(addedElement instanceof EObject) { + getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); + } + } + } + refreshDisplay(); + break; + case Notification.REMOVE: + getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); + refreshDisplay(); + break; + case Notification.REMOVE_MANY: // should never happen + if(notification.getOldValue() instanceof List) { + List removedElements = (List)notification.getOldValue(); + for(Object removedElement : removedElements) { + if(removedElement instanceof EObject) { + getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); + } + } + } + refreshDisplay(); + break; + // if it is set, remove the old one and adds the new one. this is the method use when + // the type is set or removed... + case Notification.SET: + if(notification.getNewValue() != null) { + getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); + } + if(notification.getOldValue() != null) { + getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); + } + refreshDisplay(); + default: + break; + } + break; + default: + // does nothing in other cases + break; + } + } + + /** + * notifies that a parameter of the operation has changed. + * + * @param parameter + * the {@link Parameter} that has changed + * @param notification + * the notification send when the element has been changed + */ + protected void notifyParameterTypeChanged(Notification notification) { + // should be type.class, but seems to be a bug if this is put instead. + switch(notification.getFeatureID(notification.getNotifier().getClass())) { + case UMLPackage.TYPE__NAME: + case UMLPackage.TYPE__TEMPLATE_PARAMETER: + case UMLPackage.TYPE__VISIBILITY: + refreshDisplay(); + break; + default: + // does nothing in other cases + break; + } + } + + /** + * notifies that the the property has changed. + * + * @param operation + * the operation that has changed + * @param notification + * the notification send when the element has been changed + */ + protected void notifyOperationChanged(Operation operation, Notification notification) { + switch(notification.getFeatureID(Operation.class)) { + case UMLPackage.OPERATION__NAME: + case UMLPackage.OPERATION__VISIBILITY: + case UMLPackage.OPERATION__IS_UNIQUE: + case UMLPackage.OPERATION__REDEFINED_OPERATION: + case UMLPackage.OPERATION__IS_ORDERED: + case UMLPackage.OPERATION__LOWER: + case UMLPackage.OPERATION__UPPER: + case UMLPackage.OPERATION__IS_STATIC: + refreshDisplay(); + break; + case UMLPackage.OPERATION__OWNED_PARAMETER: + switch(notification.getEventType()) { + // if it is added => adds listener to the type element + case Notification.ADD: + getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); + refreshDisplay(); + // if it is removed => removes listener from the type element + break; + case Notification.ADD_MANY: // should never happen + if(notification.getNewValue() instanceof List) { + List addedElements = (List)notification.getNewValue(); + for(Object addedElement : addedElements) { + if(addedElement instanceof EObject) { + getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); + } + } + } + refreshDisplay(); + break; + case Notification.REMOVE: + getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); + refreshDisplay(); + break; + case Notification.REMOVE_MANY: // should never happen + if(notification.getOldValue() instanceof List) { + List removedElements = (List)notification.getOldValue(); + for(Object removedElement : removedElements) { + if(removedElement instanceof EObject) { + getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); + } + } + } + refreshDisplay(); + break; + // if it is set, remove the old one and adds the new one. this is the method use when + // the type is set or removed... + case Notification.SET: + if(notification.getNewValue() != null) { + getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); + } + if(notification.getOldValue() != null) { + getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); + } + refreshDisplay(); + default: + break; + } + break; + default: + // does nothing in other cases + break; + } + } + + /** + * Refreshes the display of the edit part + */ + @Override + public void refreshDisplay() { + // calls the helper for this edit Part + OperationLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart)getHost()); + } + + /** + * {@inheritDoc} + */ + @Override + protected void removeAdditionalListeners() { + super.removeAdditionalListeners(); + Operation operation = getUMLElement(); + // check host semantic element is not null + if(operation == null) { + return; + } + for(Parameter parameter : operation.getOwnedParameters()) { + getDiagramEventBroker().removeNotificationListener(parameter, this); + // remove parameter type listener + if(parameter.getType() != null) { + getDiagramEventBroker().removeNotificationListener(parameter.getType(), this); + } + } + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java new file mode 100644 index 00000000000..af5c3bcb230 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/PropertyLabelEditPolicy.java @@ -0,0 +1,254 @@ +/***************************************************************************** + * 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: + * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Nizar GUEDIDI (CEA LIST) - Update getUMLElement() + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.common.editpolicies; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.papyrus.uml.diagram.common.Activator; +import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper; +import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence; +import org.eclipse.uml2.uml.Property; +import org.eclipse.uml2.uml.Type; +import org.eclipse.uml2.uml.UMLPackage; + +/** + * Specific edit policy for label displaying stereotypes and their properties for edges representing + * UML elements. + */ +public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy { + + /** + * Creates a new PropertyLabelEditPolicy + */ + public PropertyLabelEditPolicy() { + super(); + } + + /** + * {@inheritDoc} + */ + @Override + public void addAdditionalListeners() { + super.addAdditionalListeners(); + Property property = getUMLElement(); + // check host semantic element is not null + if(property == null) { + Activator.log.error("No semantic element present when adding listeners in PropertyLabelEditPolicy", null); + return; + } + // adds a listener to the element itself, and to linked elements, like Type + if(property.getType() != null) { + getDiagramEventBroker().addNotificationListener(property.getType(), this); + } + getDiagramEventBroker().addNotificationListener(property.getUpperValue(), this); + getDiagramEventBroker().addNotificationListener(property.getLowerValue(), this); + } + + /** + * {@inheritDoc} + */ + @Override + public Collection getDefaultDisplayValue() { + return ICustomAppearence.DEFAULT_UML_PROPERTY; + } + + /** + * {@inheritDoc} + */ + @Override + public Map getMasks() { + return PropertyLabelHelper.getInstance().getMasks(); + } + + @Override + public String getPreferencePageID() { + return "org.eclipse.papyrus.uml.diagram.clazz.custom.preferences.PropertyPreferencePage"; + } + + /** + * {@inheritedDoc} + */ + @Override + public Property getUMLElement() { + EObject element = super.getUMLElement(); + if(element instanceof Property) { + return (Property)element; + } + return null; + } + + /** + * {@inheritedDoc} + */ + @Override + public void notifyChanged(Notification notification) { + super.notifyChanged(notification); + // change the label of the figure managed by the host edit part (managed by the parent edit + // part in general...) + // it must be changed only if: + // - the annotation corresponding to the display of the stereotype changes + // - the stereotype application list has changed + Object object = notification.getNotifier(); + Property property = getUMLElement(); + if(object == null || property == null) { + return; + } + if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralInteger_Value())) { + refreshDisplay(); + } else if(notification.getFeature().equals(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value())) { + refreshDisplay(); + } + if(object.equals(property)) { + notifyPropertyChanged(property, notification); + } else if(object.equals(property.getType())) { + notifyPropertyTypeChanged(property.getType(), notification); + } + if(isMaskManagedAnnotation(object)) { + refreshDisplay(); + } + if(isRemovedMaskManagedLabelAnnotation(object, notification)) { + refreshDisplay(); + } + } + + /** + * notifies that the the property has changed. + * + * @param property + * the property that has changed + * @param notification + * the notification send when the element has been changed + */ + protected void notifyPropertyChanged(Property property, Notification notification) { + switch(notification.getFeatureID(Property.class)) { + case UMLPackage.PROPERTY__NAME: + case UMLPackage.PROPERTY__VISIBILITY: + case UMLPackage.PROPERTY__IS_DERIVED: + case UMLPackage.PROPERTY__DEFAULT_VALUE: + case UMLPackage.PROPERTY__SUBSETTED_PROPERTY: + case UMLPackage.PROPERTY__REDEFINED_PROPERTY: + case UMLPackage.PROPERTY__IS_ORDERED: + case UMLPackage.PROPERTY__IS_UNIQUE: + case UMLPackage.PROPERTY__IS_READ_ONLY: + refreshDisplay(); + break; + case UMLPackage.PROPERTY__TYPE: + case UMLPackage.PROPERTY__LOWER: + case UMLPackage.PROPERTY__LOWER_VALUE: + case UMLPackage.PROPERTY__UPPER: + case UMLPackage.PROPERTY__UPPER_VALUE: + switch(notification.getEventType()) { + // if it is added => adds listener to the type element + case Notification.ADD: + getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); + refreshDisplay(); + // if it is removed => removes listener from the type element + break; + case Notification.ADD_MANY: // should never happen + if(notification.getNewValue() instanceof List) { + List addedElements = (List)notification.getNewValue(); + for(Object addedElement : addedElements) { + if(addedElement instanceof EObject) { + getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); + } + } + } + refreshDisplay(); + break; + case Notification.REMOVE: + getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); + refreshDisplay(); + break; + case Notification.REMOVE_MANY: // should never happen + if(notification.getOldValue() instanceof List) { + List removedElements = (List)notification.getOldValue(); + for(Object removedElement : removedElements) { + if(removedElement instanceof EObject) { + getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); + } + } + } + refreshDisplay(); + break; + // if it is set, remove the old one and adds the new one. this is the method use when + // the type is set or removed... + case Notification.SET: + if(notification.getOldValue() != null) { + getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); + } + if(notification.getNewValue() != null) { + getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); + } + refreshDisplay(); + default: + break; + } + break; + default: + // does nothing in other cases + break; + } + } + + /** + * notifies that the type of the property has changed. + * + * @param type + * the type of the property that has changed + * @param notification + * the notification send when the element has been changed + */ + protected void notifyPropertyTypeChanged(Type type, Notification notification) { + switch(notification.getFeatureID(Property.class)) { + case UMLPackage.TYPE__NAME: + refreshDisplay(); // type name has changed => refresh the property display + break; + default: + // does nothing by default + break; + } + } + + /** + * Refreshes the display of the edit part + */ + @Override + public void refreshDisplay() { + // calls the helper for this edit Part + PropertyLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart)getHost()); + } + + /** + * {@inheritDoc} + */ + @Override + protected void removeAdditionalListeners() { + super.removeAdditionalListeners(); + Property property = getUMLElement(); + if(property == null) { + // check semantic element is not null and this is really an instance of Property + return; + } + if(property.getType() != null) { + getDiagramEventBroker().removeNotificationListener(property.getType(), this); + } + getDiagramEventBroker().removeNotificationListener(property.getUpperValue(), this); + getDiagramEventBroker().removeNotificationListener(property.getLowerValue(), this); + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/OperationLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/OperationLabelEditPolicy.java deleted file mode 100644 index 090de3c0fc9..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/OperationLabelEditPolicy.java +++ /dev/null @@ -1,400 +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: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.profile.custom.policies; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.helper.OperationLabelHelper; -import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence; -import org.eclipse.uml2.uml.Operation; -import org.eclipse.uml2.uml.Parameter; -import org.eclipse.uml2.uml.Type; -import org.eclipse.uml2.uml.UMLPackage; - -/** - * Specific edit policy for label displaying stereotypes and their properties for edges representing - * UML elements. - */ -public class OperationLabelEditPolicy extends AbstractMaskManagedEditPolicy { - - /** - * Creates a new PropertyLabelEditPolicy - */ - public OperationLabelEditPolicy() { - super(); - } - - /** - * {@inheritDoc} - */ - @Override - public void addAdditionalListeners() { - super.addAdditionalListeners(); - Operation operation = getUMLElement(); - // check host semantic element is not null - if(operation == null) { - return; - } - - // adds a listener to the element itself, and to linked elements, like Type - for(Parameter parameter : operation.getOwnedParameters()) { - getDiagramEventBroker().addNotificationListener(parameter, this); - - // should also add this element as a listener of parameter type - if(parameter.getType() != null) { - getDiagramEventBroker().addNotificationListener(parameter.getType(), this); - } - } - } - - /** - * {@inheritDoc} - */ - public int getDefaultDisplayValue() { - return ICustomAppearence.DEFAULT_UML_OPERATION; - } - - /** - * {@inheritDoc} - */ - public String getMaskLabel(int value) { - return OperationLabelHelper.getInstance().getMaskLabel(value); - } - - /** - * {@inheritDoc} - */ - public Collection getMaskLabels() { - return OperationLabelHelper.getInstance().getMaskLabels(); - } - - /** - * {@inheritDoc} - */ - public Map getMasks() { - return OperationLabelHelper.getInstance().getMasks(); - } - - /** - * {@inheritDoc} - */ - public Collection getMaskValues() { - return OperationLabelHelper.getInstance().getMaskValues(); - } - - /** - * {@inheritDoc} - */ - public String getPreferencePageID() { - return "org.eclipse.papyrus.uml.diagram.profile.custom.preferences.OperationPreferencePage"; //$NON-NLS-1$ - } - - /** - * Returns the {@link Operation} managed by this edit part. - * - * @return the {@link Operation} managed by this edit part. - */ - @Override - public Operation getUMLElement() { - return (Operation)super.getUMLElement(); - } - - /** - * {@inheritedDoc} - */ - @Override - public void notifyChanged(Notification notification) { - super.notifyChanged(notification); - // change the label of the figure managed by the host edit part (managed by the parent edit - // part in general...) - // it must be changed only if: - // - the annotation corresponding to the display of the stereotype changes - // - the stereotype application list has changed - Object object = notification.getNotifier(); - Operation operation = getUMLElement(); - - if(object == null) { - return; - } - - if(object.equals(operation)) { - notifyOperationChanged(operation, notification); - } else if(isParameter(object)) { - notifyParameterChanged(notification); - } else if(isParameterType(object)) { - notifyParameterTypeChanged(notification); - } - - if(isMaskManagedAnnotation(object)) { - refreshDisplay(); - } - - if(isRemovedMaskManagedLabelAnnotation(object, notification)) { - refreshDisplay(); - } - } - - /** - * Checks if the given object is one of the parameter type of the operation - * - * @param object - * the object to test - * @return true if the object corresponds to the type of a parameter of the - * operation - */ - protected boolean isParameterType(Object object) { - if(!(object instanceof Type)) { - return false; - } - - for(Parameter parameter : getUMLElement().getOwnedParameters()) { - if(object.equals(parameter.getType())) { - return true; - } - } - return false; - } - - /** - * Checks if the given object is one of the parameter of the operation - * - * @param object - * the object to test - * @return true if the object is a parameter of the operation - */ - protected boolean isParameter(Object object) { - if(!(object instanceof Parameter)) { - return false; - } - - return getUMLElement().getOwnedParameters().contains(object); - } - - /** - * notifies that a parameter of the operation has changed. - * - * @param parameter - * the {@link Parameter} that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyParameterChanged(Notification notification) { - switch(notification.getFeatureID(Parameter.class)) { - case UMLPackage.PARAMETER__NAME: - case UMLPackage.PARAMETER__DEFAULT_VALUE: - case UMLPackage.PARAMETER__DIRECTION: - case UMLPackage.PARAMETER__IS_STREAM: - case UMLPackage.PARAMETER__IS_ORDERED: - case UMLPackage.PARAMETER__LOWER: - case UMLPackage.PARAMETER__UPPER: - case UMLPackage.PARAMETER__LOWER_VALUE: - case UMLPackage.PARAMETER__UPPER_VALUE: - refreshDisplay(); - break; - case UMLPackage.PARAMETER__TYPE: - - switch(notification.getEventType()) { - // if it is added => adds listener to the type element - case Notification.ADD: - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - refreshDisplay(); - // if it is removed => removes listener from the type element - break; - case Notification.ADD_MANY: // should never happen - if(notification.getNewValue() instanceof List) { - List addedElements = (List)notification.getNewValue(); - for(Object addedElement : addedElements) { - if(addedElement instanceof EObject) { - getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); - } - } - } - refreshDisplay(); - break; - case Notification.REMOVE: - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - refreshDisplay(); - break; - case Notification.REMOVE_MANY: // should never happen - if(notification.getOldValue() instanceof List) { - List removedElements = (List)notification.getOldValue(); - for(Object removedElement : removedElements) { - if(removedElement instanceof EObject) { - getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); - } - } - } - refreshDisplay(); - break; - // if it is set, remove the old one and adds the new one. this is the method use when - // the type is set or removed... - case Notification.SET: - if(notification.getNewValue() != null) { - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - } - if(notification.getOldValue() != null) { - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - } - refreshDisplay(); - - default: - break; - - } - - break; - default: - // does nothing in other cases - break; - } - } - - /** - * notifies that a parameter of the operation has changed. - * - * @param parameter - * the {@link Parameter} that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyParameterTypeChanged(Notification notification) { - // should be type.class, but seems to be a bug if this is put instead. - switch(notification.getFeatureID(notification.getNotifier().getClass())) { - case UMLPackage.TYPE__NAME: - case UMLPackage.TYPE__TEMPLATE_PARAMETER: - case UMLPackage.TYPE__VISIBILITY: - refreshDisplay(); - break; - default: - // does nothing in other cases - break; - } - } - - /** - * notifies that the the property has changed. - * - * @param operation - * the operation that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyOperationChanged(Operation operation, Notification notification) { - switch(notification.getFeatureID(Operation.class)) { - case UMLPackage.OPERATION__NAME: - case UMLPackage.OPERATION__VISIBILITY: - case UMLPackage.OPERATION__IS_UNIQUE: - case UMLPackage.OPERATION__REDEFINED_OPERATION: - case UMLPackage.OPERATION__IS_ORDERED: - case UMLPackage.OPERATION__LOWER: - case UMLPackage.OPERATION__UPPER: - case UMLPackage.OPERATION__IS_STATIC: - refreshDisplay(); - break; - case UMLPackage.OPERATION__OWNED_PARAMETER: - - switch(notification.getEventType()) { - // if it is added => adds listener to the type element - case Notification.ADD: - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - refreshDisplay(); - // if it is removed => removes listener from the type element - break; - case Notification.ADD_MANY: // should never happen - if(notification.getNewValue() instanceof List) { - List addedElements = (List)notification.getNewValue(); - for(Object addedElement : addedElements) { - if(addedElement instanceof EObject) { - getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); - } - } - } - refreshDisplay(); - break; - case Notification.REMOVE: - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - refreshDisplay(); - break; - case Notification.REMOVE_MANY: // should never happen - if(notification.getOldValue() instanceof List) { - List removedElements = (List)notification.getOldValue(); - for(Object removedElement : removedElements) { - if(removedElement instanceof EObject) { - getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); - } - } - } - refreshDisplay(); - break; - // if it is set, remove the old one and adds the new one. this is the method use when - // the type is set or removed... - case Notification.SET: - if(notification.getNewValue() != null) { - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - } - if(notification.getOldValue() != null) { - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - } - refreshDisplay(); - - default: - break; - - } - - break; - default: - // does nothing in other cases - break; - } - } - - /** - * Refreshes the display of the edit part - */ - @Override - public void refreshDisplay() { - // calls the helper for this edit Part - OperationLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart)getHost()); - } - - /** - * {@inheritDoc} - */ - @Override - protected void removeAdditionalListeners() { - super.removeAdditionalListeners(); - Operation operation = getUMLElement(); - // check host semantic element is not null - if(operation == null) { - return; - } - - for(Parameter parameter : operation.getOwnedParameters()) { - getDiagramEventBroker().removeNotificationListener(parameter, this); - - // remove parameter type listener - if(parameter.getType() != null) { - getDiagramEventBroker().removeNotificationListener(parameter.getType(), this); - } - - } - } - -} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/PropertyLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/PropertyLabelEditPolicy.java deleted file mode 100644 index 4cbfe8dd9c3..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/PropertyLabelEditPolicy.java +++ /dev/null @@ -1,278 +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: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.profile.custom.policies; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper; -import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence; -import org.eclipse.uml2.uml.Property; -import org.eclipse.uml2.uml.Type; -import org.eclipse.uml2.uml.UMLPackage; - -/** - * Specific edit policy for label displaying stereotypes and their properties for edges representing - * UML elements. - */ -public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy { - - /** - * Creates a new PropertyLabelEditPolicy - */ - public PropertyLabelEditPolicy() { - super(); - } - - /** - * {@inheritDoc} - */ - @Override - public void addAdditionalListeners() { - super.addAdditionalListeners(); - Property property = getUMLElement(); - // check host semantic element is not null - if(property == null) { - return; - } - // adds a listener to the element itself, and to linked elements, like Type - if(property.getType() != null) { - getDiagramEventBroker().addNotificationListener(property.getType(), this); - - } - getDiagramEventBroker().addNotificationListener(property.getUpperValue(), this); - getDiagramEventBroker().addNotificationListener(property.getLowerValue(), this); - } - - /** - * {@inheritDoc} - */ - public int getDefaultDisplayValue() { - return ICustomAppearence.DEFAULT_UML_PROPERTY; - } - - /** - * {@inheritDoc} - */ - public String getMaskLabel(int value) { - return PropertyLabelHelper.getInstance().getMaskLabel(value); - } - - /** - * {@inheritDoc} - */ - public Collection getMaskLabels() { - return PropertyLabelHelper.getInstance().getMaskLabels(); - } - - /** - * {@inheritDoc} - */ - public Map getMasks() { - return PropertyLabelHelper.getInstance().getMasks(); - } - - /** - * {@inheritDoc} - */ - public Collection getMaskValues() { - return PropertyLabelHelper.getInstance().getMaskValues(); - } - - public String getPreferencePageID() { - return "org.eclipse.papyrus.uml.diagram.profile.custom.preferences.PropertyPreferencePage"; //$NON-NLS-1$ - } - - /** - * {@inheritDoc} - */ - @Override - public Property getUMLElement() { - return (Property)super.getUMLElement(); - } - - /** - * {@inheritedDoc} - */ - @Override - public void notifyChanged(Notification notification) { - super.notifyChanged(notification); - // change the label of the figure managed by the host edit part (managed by the parent edit - // part in general...) - // it must be changed only if: - // - the annotation corresponding to the display of the stereotype changes - // - the stereotype application list has changed - Object object = notification.getNotifier(); - Property property = getUMLElement(); - - if(object == null || property == null) { - return; - } - - if(UMLPackage.eINSTANCE.getLiteralInteger_Value().equals(notification.getFeature())) { - refreshDisplay(); - } else if(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value().equals(notification.getFeature())) { - refreshDisplay(); - } - if(object.equals(property)) { - notifyPropertyChanged(property, notification); - } else if(object.equals(property.getType())) { - notifyPropertyTypeChanged(property.getType(), notification); - } - - if(isMaskManagedAnnotation(object)) { - refreshDisplay(); - } - - if(isRemovedMaskManagedLabelAnnotation(object, notification)) { - refreshDisplay(); - } - - } - - /** - * notifies that the the property has changed. - * - * @param property - * the property that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyPropertyChanged(Property property, Notification notification) { - switch(notification.getFeatureID(Property.class)) { - case UMLPackage.PROPERTY__NAME: - case UMLPackage.PROPERTY__VISIBILITY: - case UMLPackage.PROPERTY__IS_DERIVED: - case UMLPackage.PROPERTY__DEFAULT_VALUE: - case UMLPackage.PROPERTY__SUBSETTED_PROPERTY: - case UMLPackage.PROPERTY__REDEFINED_PROPERTY: - case UMLPackage.PROPERTY__IS_ORDERED: - case UMLPackage.PROPERTY__IS_UNIQUE: - case UMLPackage.PROPERTY__IS_READ_ONLY: - refreshDisplay(); - break; - case UMLPackage.PROPERTY__TYPE: - case UMLPackage.PROPERTY__LOWER: - case UMLPackage.PROPERTY__LOWER_VALUE: - case UMLPackage.PROPERTY__UPPER: - case UMLPackage.PROPERTY__UPPER_VALUE: - - switch(notification.getEventType()) { - // if it is added => adds listener to the type element - case Notification.ADD: - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - refreshDisplay(); - // if it is removed => removes listener from the type element - break; - case Notification.ADD_MANY: // should never happen - if(notification.getNewValue() instanceof List) { - List addedElements = (List)notification.getNewValue(); - for(Object addedElement : addedElements) { - if(addedElement instanceof EObject) { - getDiagramEventBroker().addNotificationListener((EObject)addedElement, this); - } - } - } - refreshDisplay(); - break; - case Notification.REMOVE: - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - refreshDisplay(); - break; - case Notification.REMOVE_MANY: // should never happen - if(notification.getOldValue() instanceof List) { - List removedElements = (List)notification.getOldValue(); - for(Object removedElement : removedElements) { - if(removedElement instanceof EObject) { - getDiagramEventBroker().removeNotificationListener((EObject)removedElement, this); - } - } - } - refreshDisplay(); - break; - // if it is set, remove the old one and adds the new one. this is the method use when - // the type is set or removed... - case Notification.SET: - if(notification.getOldValue() != null) { - getDiagramEventBroker().removeNotificationListener((EObject)notification.getOldValue(), this); - } - if(notification.getNewValue() != null) { - getDiagramEventBroker().addNotificationListener((EObject)notification.getNewValue(), this); - } - refreshDisplay(); - - default: - break; - - } - - break; - default: - // does nothing in other cases - break; - } - } - - /** - * notifies that the type of the property has changed. - * - * @param type - * the type of the property that has changed - * @param notification - * the notification send when the element has been changed - */ - protected void notifyPropertyTypeChanged(Type type, Notification notification) { - switch(notification.getFeatureID(Property.class)) { - case UMLPackage.TYPE__NAME: - refreshDisplay(); // type name has changed => refresh the property display - break; - default: - // does nothing by default - break; - } - } - - /** - * Refreshes the display of the edit part - */ - @Override - public void refreshDisplay() { - // calls the helper for this edit Part - PropertyLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart)getHost()); - } - - /** - * {@inheritDoc} - */ - @Override - protected void removeAdditionalListeners() { - super.removeAdditionalListeners(); - Property property = getUMLElement(); - if(property == null) { - // check semantic element is not null and this is really an instance of Property - return; - } - - if(property.getType() != null) { - getDiagramEventBroker().removeNotificationListener(property.getType(), this); - } - - getDiagramEventBroker().removeNotificationListener(property.getUpperValue(), this); - getDiagramEventBroker().removeNotificationListener(property.getLowerValue(), this); - } -} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen index da01edb1e46..97ba2a29b47 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen @@ -47,7 +47,7 @@ org.eclipse.gmf.runtime.draw2d.ui - + @@ -90,7 +90,7 @@ org.eclipse.gmf.runtime.draw2d.ui - + @@ -113,7 +113,7 @@ org.eclipse.gmf.runtime.draw2d.ui - + @@ -136,7 +136,7 @@ org.eclipse.gmf.runtime.draw2d.ui - + diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java index 350ca5a70e7..9408476ba78 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java @@ -69,9 +69,9 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEd import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ClassOperationItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java index 3852046f1d4..24223f8ab05 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java @@ -69,9 +69,9 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEd import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ClassPropertyItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java index 98ad42fa002..9dcf74a0a58 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java @@ -69,9 +69,9 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEd import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.custom.policies.OperationLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeOperationItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java index 1800ff95e43..e43582aff0d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java @@ -69,9 +69,9 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEd import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.custom.policies.PropertyLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypePropertyItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java index 6ec6bf9f3be..78af4dc7c1f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java index bda477bc5f1..9bc4a0583b4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.uml.diagram.common.util.StringComparator; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java index c1c0bd044d8..d56aaaa09c3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java index 93b930c3151..584fface1bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; 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 f7db6f1a29e..a82263a49eb 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 @@ -17,8 +17,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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java index b50d9cc6449..a92c3d07c3e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.uml.diagram.common.util.StringComparator; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java index be97162762c..72c84ec14c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; 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 77a046dbbe3..d3b74d490a0 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 @@ -17,8 +17,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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java index 80cac82d3cc..f7bc05e3ef3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.uml.diagram.common.util.StringComparator; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java index 5c7cc642b47..bb8bd7d1aeb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; 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 dcbea2a56f0..8fa36cbf148 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 @@ -17,8 +17,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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java index 50359273f78..425b51f6d38 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java index 4c64710984f..2fabbc5d07a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; import org.eclipse.papyrus.uml.diagram.common.util.StringComparator; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; 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 44589333faf..f606e3cd061 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 @@ -17,8 +17,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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java index ec91d7935c7..77d1e315ada 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; 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 140cf32a388..2235c58640e 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 @@ -17,8 +17,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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java index 326d4870ab3..4f1d88e3f48 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; 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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java index 6020c9443b4..acfb941d57c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java @@ -17,8 +17,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.common.util.StringComparator; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; 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 565249c4435..20d469d2dd2 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 @@ -17,8 +17,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.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java index e14d0a5566c..b1c25bbe549 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java @@ -54,8 +54,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.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart; -- cgit v1.2.3