diff options
Diffstat (limited to 'extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus')
9 files changed, 210 insertions, 397 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java index c268714ae9f..8ad06d0bf72 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java @@ -25,13 +25,16 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin; * This is the central singleton for the UMLDI edit plugin. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public final class UMLDIEditPlugin extends EMFPlugin { + /** * Keep track of the singleton. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public static final UMLDIEditPlugin INSTANCE = new UMLDIEditPlugin(); @@ -40,6 +43,7 @@ public final class UMLDIEditPlugin extends EMFPlugin { * Keep track of the singleton. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ private static Implementation plugin; @@ -48,21 +52,18 @@ public final class UMLDIEditPlugin extends EMFPlugin { * Create the instance. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UMLDIEditPlugin() { - super - (new ResourceLocator [] { - DDEditPlugin.INSTANCE, - EcoreEditPlugin.INSTANCE, - UMLEditPlugin.INSTANCE, - }); + super(new ResourceLocator[]{ DDEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, }); } /** * Returns the singleton instance of the Eclipse plugin. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @return the singleton instance. * @generated */ @@ -75,6 +76,7 @@ public final class UMLDIEditPlugin extends EMFPlugin { * Returns the singleton instance of the Eclipse plugin. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @return the singleton instance. * @generated */ @@ -86,22 +88,23 @@ public final class UMLDIEditPlugin extends EMFPlugin { * The actual implementation of the Eclipse <b>Plugin</b>. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public static class Implementation extends EclipsePlugin { + /** * Creates an instance. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public Implementation() { super(); - // Remember the static instance. // plugin = this; } } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java index 58d359579e1..33bf30489f4 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java @@ -41,13 +41,16 @@ import org.eclipse.papyrus.umldi.util.UMLDIAdapterFactory; * Note that most of the adapters are shared among multiple instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { + /** * This keeps track of the root adapter factory that delegates to this adapter factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected ComposedAdapterFactory parentAdapterFactory; @@ -56,6 +59,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected IChangeNotifier changeNotifier = new ChangeNotifier(); @@ -64,6 +68,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected Collection<Object> supportedTypes = new ArrayList<Object>(); @@ -72,6 +77,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This constructs an instance. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UMLDIItemProviderAdapterFactory() { @@ -88,6 +94,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlDiagram} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected UmlDiagramItemProvider umlDiagramItemProvider; @@ -96,14 +103,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagram}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Adapter createUmlDiagramAdapter() { - if (umlDiagramItemProvider == null) { + if(umlDiagramItemProvider == null) { umlDiagramItemProvider = new UmlDiagramItemProvider(this); } - return umlDiagramItemProvider; } @@ -111,6 +118,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlShape} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected UmlShapeItemProvider umlShapeItemProvider; @@ -119,14 +127,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlShape}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Adapter createUmlShapeAdapter() { - if (umlShapeItemProvider == null) { + if(umlShapeItemProvider == null) { umlShapeItemProvider = new UmlShapeItemProvider(this); } - return umlShapeItemProvider; } @@ -134,6 +142,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlStyle} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected UmlStyleItemProvider umlStyleItemProvider; @@ -142,14 +151,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlStyle}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Adapter createUmlStyleAdapter() { - if (umlStyleItemProvider == null) { + if(umlStyleItemProvider == null) { umlStyleItemProvider = new UmlStyleItemProvider(this); } - return umlStyleItemProvider; } @@ -157,6 +166,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlEdge} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected UmlEdgeItemProvider umlEdgeItemProvider; @@ -165,14 +175,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlEdge}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Adapter createUmlEdgeAdapter() { - if (umlEdgeItemProvider == null) { + if(umlEdgeItemProvider == null) { umlEdgeItemProvider = new UmlEdgeItemProvider(this); } - return umlEdgeItemProvider; } @@ -180,6 +190,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlCompartment} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected UmlCompartmentItemProvider umlCompartmentItemProvider; @@ -188,14 +199,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlCompartment}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Adapter createUmlCompartmentAdapter() { - if (umlCompartmentItemProvider == null) { + if(umlCompartmentItemProvider == null) { umlCompartmentItemProvider = new UmlCompartmentItemProvider(this); } - return umlCompartmentItemProvider; } @@ -203,6 +214,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlLabel} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected UmlLabelItemProvider umlLabelItemProvider; @@ -211,14 +223,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlLabel}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Adapter createUmlLabelAdapter() { - if (umlLabelItemProvider == null) { + if(umlLabelItemProvider == null) { umlLabelItemProvider = new UmlLabelItemProvider(this); } - return umlLabelItemProvider; } @@ -226,6 +238,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This returns the root adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public ComposeableAdapterFactory getRootAdapterFactory() { @@ -236,6 +249,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This sets the composed adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { @@ -245,6 +259,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -256,6 +271,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This implementation substitutes the factory itself as the key for the adapter. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -266,17 +282,17 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Object adapt(Object object, Object type) { - if (isFactoryForType(type)) { + if(isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) { + if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) { return adapter; } } - return null; } @@ -284,6 +300,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This adds a listener. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public void addListener(INotifyChangedListener notifyChangedListener) { @@ -294,6 +311,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This removes a listener. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public void removeListener(INotifyChangedListener notifyChangedListener) { @@ -304,29 +322,35 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); - - if (parentAdapterFactory != null) { + if(parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(notification); } } /** - * This disposes all of the item providers created by this factory. + * This disposes all of the item providers created by this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public void dispose() { - if (umlDiagramItemProvider != null) umlDiagramItemProvider.dispose(); - if (umlShapeItemProvider != null) umlShapeItemProvider.dispose(); - if (umlStyleItemProvider != null) umlStyleItemProvider.dispose(); - if (umlEdgeItemProvider != null) umlEdgeItemProvider.dispose(); - if (umlCompartmentItemProvider != null) umlCompartmentItemProvider.dispose(); - if (umlLabelItemProvider != null) umlLabelItemProvider.dispose(); + if(umlDiagramItemProvider != null) + umlDiagramItemProvider.dispose(); + if(umlShapeItemProvider != null) + umlShapeItemProvider.dispose(); + if(umlStyleItemProvider != null) + umlStyleItemProvider.dispose(); + if(umlEdgeItemProvider != null) + umlEdgeItemProvider.dispose(); + if(umlCompartmentItemProvider != null) + umlCompartmentItemProvider.dispose(); + if(umlLabelItemProvider != null) + umlLabelItemProvider.dispose(); } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java index 18da0c46f80..bd38be8f512 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -38,22 +37,16 @@ import org.eclipse.papyrus.umldi.UmlCompartmentKind; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlCompartment} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlCompartmentItemProvider - extends UmlShapeItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlCompartmentItemProvider(AdapterFactory adapterFactory) { @@ -64,13 +57,13 @@ public class UmlCompartmentItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addKindPropertyDescriptor(object); } return itemPropertyDescriptors; @@ -80,28 +73,18 @@ public class UmlCompartmentItemProvider * This adds a property descriptor for the Kind feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addKindPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlCompartment_kind_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"), - UMLDIPackage.Literals.UML_COMPARTMENT__KIND, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlCompartment_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"), UMLDIPackage.Literals.UML_COMPARTMENT__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** * This returns UmlCompartment.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -113,15 +96,14 @@ public class UmlCompartmentItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public String getText(Object object) { UmlCompartmentKind labelValue = ((UmlCompartment)object).getKind(); String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? - getString("_UI_UmlCompartment_type") : - getString("_UI_UmlCompartment_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_UmlCompartment_type") : getString("_UI_UmlCompartment_type") + " " + label; } /** @@ -129,16 +111,16 @@ public class UmlCompartmentItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlCompartment.class)) { - case UMLDIPackage.UML_COMPARTMENT__KIND: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; + switch(notification.getFeatureID(UmlCompartment.class)) { + case UMLDIPackage.UML_COMPARTMENT__KIND: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } @@ -148,11 +130,11 @@ public class UmlCompartmentItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java index 7406e236d63..b8be49dc6a5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -43,22 +42,16 @@ import org.eclipse.papyrus.umldi.UmlDiagramElement; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagramElement} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlDiagramElementItemProvider - extends DiagramElementItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlDiagramElementItemProvider extends DiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlDiagramElementItemProvider(AdapterFactory adapterFactory) { @@ -69,13 +62,13 @@ public class UmlDiagramElementItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addUmlModelElementPropertyDescriptor(object); addSharedUmlStylePropertyDescriptor(object); addTargetUmlEdgePropertyDescriptor(object); @@ -88,88 +81,44 @@ public class UmlDiagramElementItemProvider * This adds a property descriptor for the Uml Model Element feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addUmlModelElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlDiagramElement_umlModelElement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"), - UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT, - true, - false, - true, - null, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_umlModelElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT, true, false, true, null, null, null)); } /** * This adds a property descriptor for the Shared Uml Style feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addSharedUmlStylePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"), - UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, - true, - false, - true, - null, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, true, false, true, null, null, null)); } /** * This adds a property descriptor for the Target Uml Edge feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addTargetUmlEdgePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlDiagramElement_targetUmlEdge_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"), - UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, - true, - false, - true, - null, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_targetUmlEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, true, false, true, null, null, null)); } /** * This adds a property descriptor for the Source Uml Edge feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addSourceUmlEdgePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"), - UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, - true, - false, - true, - null, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, true, false, true, null, null, null)); } /** @@ -178,11 +127,12 @@ public class UmlDiagramElementItemProvider * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) { + if(childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE); childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT); @@ -193,13 +143,13 @@ public class UmlDiagramElementItemProvider /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. - return super.getChildFeature(object, child); } @@ -207,6 +157,7 @@ public class UmlDiagramElementItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -219,17 +170,17 @@ public class UmlDiagramElementItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlDiagramElement.class)) { - case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE: - case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; + switch(notification.getFeatureID(UmlDiagramElement.class)) { + case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE: + case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -239,52 +190,29 @@ public class UmlDiagramElementItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, - UMLDIFactory.eINSTANCE.createUmlStyle())); - - newChildDescriptors.add - (createChildParameter - (UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, - UMLDIFactory.eINSTANCE.createUmlShape())); - - newChildDescriptors.add - (createChildParameter - (UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, - UMLDIFactory.eINSTANCE.createUmlDiagram())); - - newChildDescriptors.add - (createChildParameter - (UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, - UMLDIFactory.eINSTANCE.createUmlEdge())); - - newChildDescriptors.add - (createChildParameter - (UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, - UMLDIFactory.eINSTANCE.createUmlCompartment())); - - newChildDescriptors.add - (createChildParameter - (UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, - UMLDIFactory.eINSTANCE.createUmlLabel())); + newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, UMLDIFactory.eINSTANCE.createUmlStyle())); + newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlShape())); + newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlDiagram())); + newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlEdge())); + newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlCompartment())); + newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlLabel())); } /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public ResourceLocator getResourceLocator() { return UMLDIEditPlugin.INSTANCE; } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java index eade00ee446..dde395ebe5e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -39,22 +38,16 @@ import org.eclipse.papyrus.umldi.UmlDiagram; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagram} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlDiagramItemProvider - extends UmlShapeItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlDiagramItemProvider(AdapterFactory adapterFactory) { @@ -65,13 +58,13 @@ public class UmlDiagramItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); addDocumentationPropertyDescriptor(object); addResolutionPropertyDescriptor(object); @@ -83,72 +76,40 @@ public class UmlDiagramItemProvider * This adds a property descriptor for the Name feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Diagram_name_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), - DIPackage.Literals.DIAGRAM__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** * This adds a property descriptor for the Documentation feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addDocumentationPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Diagram_documentation_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), - DIPackage.Literals.DIAGRAM__DOCUMENTATION, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** * This adds a property descriptor for the Resolution feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addResolutionPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Diagram_resolution_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), - DIPackage.Literals.DIAGRAM__RESOLUTION, - true, - false, - false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); } /** * This returns UmlDiagram.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -160,14 +121,13 @@ public class UmlDiagramItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public String getText(Object object) { String label = ((UmlDiagram)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_UmlDiagram_type") : - getString("_UI_UmlDiagram_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_UmlDiagram_type") : getString("_UI_UmlDiagram_type") + " " + label; } /** @@ -175,18 +135,18 @@ public class UmlDiagramItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlDiagram.class)) { - case UMLDIPackage.UML_DIAGRAM__NAME: - case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION: - case UMLDIPackage.UML_DIAGRAM__RESOLUTION: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; + switch(notification.getFeatureID(UmlDiagram.class)) { + case UMLDIPackage.UML_DIAGRAM__NAME: + case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION: + case UMLDIPackage.UML_DIAGRAM__RESOLUTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } @@ -196,11 +156,11 @@ public class UmlDiagramItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java index f2fae7e695f..8f3877cd995 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -42,22 +41,16 @@ import org.eclipse.papyrus.umldi.UmlEdge; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlEdge} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlEdgeItemProvider - extends UmlDiagramElementItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlEdgeItemProvider(AdapterFactory adapterFactory) { @@ -68,13 +61,13 @@ public class UmlEdgeItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addSourceUmlDiagramElementPropertyDescriptor(object); addTargetUmlDiagramElementPropertyDescriptor(object); } @@ -85,44 +78,22 @@ public class UmlEdgeItemProvider * This adds a property descriptor for the Source Uml Diagram Element feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addSourceUmlDiagramElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"), - UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, - true, - false, - true, - null, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null)); } /** * This adds a property descriptor for the Target Uml Diagram Element feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addTargetUmlDiagramElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlEdge_targetUmlDiagramElement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"), - UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, - true, - false, - true, - null, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_targetUmlDiagramElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null)); } /** @@ -131,11 +102,12 @@ public class UmlEdgeItemProvider * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) { + if(childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT); } @@ -145,13 +117,13 @@ public class UmlEdgeItemProvider /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. - return super.getChildFeature(object, child); } @@ -159,6 +131,7 @@ public class UmlEdgeItemProvider * This returns UmlEdge.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -170,6 +143,7 @@ public class UmlEdgeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -182,16 +156,16 @@ public class UmlEdgeItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlEdge.class)) { - case UMLDIPackage.UML_EDGE__WAYPOINT: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; + switch(notification.getFeatureID(UmlEdge.class)) { + case UMLDIPackage.UML_EDGE__WAYPOINT: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -201,16 +175,12 @@ public class UmlEdgeItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (DIPackage.Literals.EDGE__WAYPOINT, - DCFactory.eINSTANCE.createPoint())); + newChildDescriptors.add(createChildParameter(DIPackage.Literals.EDGE__WAYPOINT, DCFactory.eINSTANCE.createPoint())); } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java index fc7343fbaea..4d9e550b217 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -38,22 +37,16 @@ import org.eclipse.papyrus.umldi.UmlLabelKind; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlLabel} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlLabelItemProvider - extends UmlShapeItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlLabelItemProvider(AdapterFactory adapterFactory) { @@ -64,13 +57,13 @@ public class UmlLabelItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addKindPropertyDescriptor(object); } return itemPropertyDescriptors; @@ -80,28 +73,18 @@ public class UmlLabelItemProvider * This adds a property descriptor for the Kind feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addKindPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlLabel_kind_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"), - UMLDIPackage.Literals.UML_LABEL__KIND, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlLabel_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"), UMLDIPackage.Literals.UML_LABEL__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** * This returns UmlLabel.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -113,15 +96,14 @@ public class UmlLabelItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public String getText(Object object) { UmlLabelKind labelValue = ((UmlLabel)object).getKind(); String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? - getString("_UI_UmlLabel_type") : - getString("_UI_UmlLabel_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_UmlLabel_type") : getString("_UI_UmlLabel_type") + " " + label; } /** @@ -129,16 +111,16 @@ public class UmlLabelItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlLabel.class)) { - case UMLDIPackage.UML_LABEL__KIND: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; + switch(notification.getFeatureID(UmlLabel.class)) { + case UMLDIPackage.UML_LABEL__KIND: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } @@ -148,11 +130,11 @@ public class UmlLabelItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java index cdea1b937d4..75af186ac17 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -41,22 +40,16 @@ import org.eclipse.papyrus.umldi.UmlShape; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlShape} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlShapeItemProvider - extends UmlDiagramElementItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlShapeItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlShapeItemProvider(AdapterFactory adapterFactory) { @@ -67,13 +60,13 @@ public class UmlShapeItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - } return itemPropertyDescriptors; } @@ -84,11 +77,12 @@ public class UmlShapeItemProvider * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) { + if(childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS); } @@ -98,13 +92,13 @@ public class UmlShapeItemProvider /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected EStructuralFeature getChildFeature(Object object, Object child) { // Check the type of the specified child object and return the proper feature to use for // adding (see {@link AddCommand}) it as a child. - return super.getChildFeature(object, child); } @@ -112,6 +106,7 @@ public class UmlShapeItemProvider * This returns UmlShape.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -123,6 +118,7 @@ public class UmlShapeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -135,16 +131,16 @@ public class UmlShapeItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlShape.class)) { - case UMLDIPackage.UML_SHAPE__BOUNDS: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; + switch(notification.getFeatureID(UmlShape.class)) { + case UMLDIPackage.UML_SHAPE__BOUNDS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -154,16 +150,12 @@ public class UmlShapeItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (DIPackage.Literals.SHAPE__BOUNDS, - DCFactory.eINSTANCE.createBounds())); + newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds())); } - } diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java index 5b07392aee5..83473d1685c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java @@ -11,7 +11,6 @@ */ package org.eclipse.papyrus.umldi.provider; - import java.util.Collection; import java.util.List; @@ -41,22 +40,16 @@ import org.eclipse.papyrus.umldi.UmlStyle; * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlStyle} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ -public class UmlStyleItemProvider - extends StyleItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IItemColorProvider, - IItemFontProvider { +public class UmlStyleItemProvider extends StyleItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { + /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ public UmlStyleItemProvider(AdapterFactory adapterFactory) { @@ -67,13 +60,13 @@ public class UmlStyleItemProvider * This returns the property descriptors for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { + if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addFontNamePropertyDescriptor(object); addFontSizePropertyDescriptor(object); } @@ -84,50 +77,29 @@ public class UmlStyleItemProvider * This adds a property descriptor for the Font Name feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addFontNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlStyle_fontName_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"), - UMLDIPackage.Literals.UML_STYLE__FONT_NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** * This adds a property descriptor for the Font Size feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ protected void addFontSizePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_UmlStyle_fontSize_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"), - UMLDIPackage.Literals.UML_STYLE__FONT_SIZE, - true, - false, - false, - ItemPropertyDescriptor.REAL_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null)); } /** * This returns UmlStyle.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -139,14 +111,13 @@ public class UmlStyleItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public String getText(Object object) { String label = ((UmlStyle)object).getFontName(); - return label == null || label.length() == 0 ? - getString("_UI_UmlStyle_type") : - getString("_UI_UmlStyle_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_UmlStyle_type") : getString("_UI_UmlStyle_type") + " " + label; } /** @@ -154,17 +125,17 @@ public class UmlStyleItemProvider * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(UmlStyle.class)) { - case UMLDIPackage.UML_STYLE__FONT_NAME: - case UMLDIPackage.UML_STYLE__FONT_SIZE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; + switch(notification.getFeatureID(UmlStyle.class)) { + case UMLDIPackage.UML_STYLE__FONT_NAME: + case UMLDIPackage.UML_STYLE__FONT_SIZE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } @@ -174,6 +145,7 @@ public class UmlStyleItemProvider * that can be created under this object. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -185,11 +157,11 @@ public class UmlStyleItemProvider * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override public ResourceLocator getResourceLocator() { return UMLDIEditPlugin.INSTANCE; } - } |